ooo-build r13649 - in trunk: . patches/dev300

[jannieuw svn gnome org]

Author: jannieuw
Date: Thu Aug 21 11:12:20 2008
New Revision: 13649
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13649&view=rev

Log:
2008-08-21  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-simple-dialogs-toolkit.diff: Import part
	of b3dd678... Always set parent after construction, fixes listbox
	dropdown.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/layout-simple-dialogs-toolkit.diff

Modified: trunk/patches/dev300/layout-simple-dialogs-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-simple-dialogs-toolkit.diff	(original)
+++ trunk/patches/dev300/layout-simple-dialogs-toolkit.diff	Thu Aug 21 11:12:20 2008
@@ -2177,7 +2177,7 @@
 index 25dbd90..36a491f 100644
 --- a/toolkit/source/vclcompat/wrapper.hxx
 +++ toolkit/source/vclcompat/wrapper.hxx
-@@ -112,15 +112,18 @@ inline WindowImpl &Window::getImpl() const
+@@ -112,15 +112,22 @@ inline WindowImpl &Window::getImpl() const
      { \
          return *(static_cast<t##Impl *>(mpImpl)); \
      }
@@ -2187,11 +2187,15 @@
          : par( new t##Impl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) ) \
      { \
 +      body\
++      if (Window *w = dynamic_cast<Window*> (pCtx))\
++          SetParent (w);\
      } \
      t::t( Window *pParent, WinBits nBits) \
          : par( new t##Impl( pParent->getContext(), Window::CreatePeer( pParent, nBits, unoName ), this ) ) \
      { \
 +      body\
++      if ( pParent )\
++          SetParent (pParent);\
      }
 +#define IMPL_CONSTRUCTORS(t,par,unoName) IMPL_CONSTRUCTORS_BODY(t, par, unoName, )
  #define IMPL_CONSTRUCTORS_2(t,win_par,other_par,unoName) \