diff options
| -rw-r--r-- | vcl/source/helper/lazydelete.cxx | 13 | ||||
| -rw-r--r-- | vcl/source/window/menu.cxx | 3 |
2 files changed, 1 insertions, 15 deletions
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx index 45ea7e091820..2594ad47c22a 100644 --- a/vcl/source/helper/lazydelete.cxx +++ b/vcl/source/helper/lazydelete.cxx @@ -32,9 +32,8 @@ LazyDeletorBase::~LazyDeletorBase() { } -// instantiate instance pointers for LazyDeletor<Window,Menu> +// instantiate instance pointer for LazyDeletor<Window> template<> LazyDeletor<vcl::Window>* LazyDeletor<vcl::Window>::s_pOneInstance = NULL; -template<> LazyDeletor<Menu>* LazyDeletor<Menu>::s_pOneInstance = NULL; // a list for all LazyeDeletor<T> singletons static std::vector< LazyDeletorBase* > lcl_aDeletors; @@ -60,16 +59,6 @@ template<> bool LazyDeletor<vcl::Window>::is_less( vcl::Window* left, vcl::Windo return left != right && right->IsChild( left, true ); } -#ifndef LINUX -// specialized is_less function for Menu -template<> bool LazyDeletor<Menu>::is_less( Menu* left, Menu* right ) -{ - while( left && left != right ) - left = left->ImplGetStartedFrom(); - return left != NULL; -} -#endif - DeleteOnDeinitBase::~DeleteOnDeinitBase() { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 40a254547698..3de9d8d5a0b3 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -133,9 +133,6 @@ Menu::Menu() Menu::~Menu() { - - vcl::LazyDeletor<Menu>::Undelete( this ); - ImplCallEventListeners( VCLEVENT_OBJECT_DYING, ITEMPOS_INVALID ); // at the window free the reference to the accessible component |