CVS update [cws_src680_pchfix04]: /gsl/vcl/source/window/

Tag: cws_src680_pchfix04
User: hjs     
Date: 2007/01/26 12:17:18

Modified:
   gsl/vcl/source/window/menu.cxx

Log:
 RESYNC: (1.144-1.145); FILE MERGED

File Changes:

Directory: /gsl/vcl/source/window/
==================================

File [changed]: menu.cxx
Url: 
http://gsl.openoffice.org/source/browse/gsl/vcl/source/window/menu.cxx?r1=1.144.20.1&r2=1.144.20.2
Delta lines:  +17 -3
--------------------
--- menu.cxx    12 Jan 2007 15:50:21 -0000      1.144.20.1
+++ menu.cxx    26 Jan 2007 20:17:15 -0000      1.144.20.2
@@ -153,6 +153,8 @@
 #include <configsettings.hxx>
 #endif
 
+#include "lazydelete.hxx"
+
 #include <map>
 
 namespace vcl
@@ -955,6 +957,8 @@
 {
     DBG_DTOR( Menu, NULL );
 
+    vcl::LazyDeletor<Menu>::Undelete( this );
+
     ImplCallEventListeners( VCLEVENT_OBJECT_DYING, ITEMPOS_INVALID );
 
        // at the window free the reference to the accessible component
@@ -988,6 +992,11 @@
     ImplSetSalMenu( NULL );
 }
 
+void Menu::doLazyDelete()
+{
+    vcl::LazyDeletor<Menu>::Delete( this );
+}
+
 void Menu::ImplInit()
 {
     mnHighlightedItemPos = ITEMPOS_INVALID;
@@ -1008,6 +1017,11 @@
 
     // Native-support: returns NULL if not supported
     mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu( bIsMenuBar );
+}
+
+Menu* Menu::ImplGetStartedFrom() const
+{
+    return pStartedFrom;
 }
 
 void Menu::ImplLoadRes( const ResId& rResId )