*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "plugin.h"
{
return OLEOBJ_S_INVALIDHWND;
}
+ else if( NULL == lprcPosRect )
+ {
+ SetRect(&posRect, 0, 0, 0, 0);
+ lprcPosRect = &posRect;
+ lprcClipRect = &posRect;
+ }
if( FAILED(_p_instance->onActivateInPlace(lpMsg, hwndParent, lprcPosRect, lprcClipRect)) )
{
return OLEOBJ_S_CANNOT_DOVERB_NOW;
}
- if( NULL != p_inPlaceSite )
- p_inPlaceSite->OnPosRectChange(lprcPosRect);
-
- pActiveSite->ShowObject();
- _p_instance->setVisible(TRUE);
-
if( NULL != p_inPlaceSite )
{
p_inPlaceSite->OnInPlaceActivate();
+ p_inPlaceSite->OnPosRectChange(lprcPosRect);
p_inPlaceSite->Release();
}
+ if( _p_instance->getVisible() )
+ pActiveSite->ShowObject();
+
if( NULL != lpMsg )
{
switch( lpMsg->message )
if( NULL == pSizel )
return E_POINTER;
+
if( dwDrawAspect & DVASPECT_CONTENT )
{
_p_instance->setExtent(*pSizel);