fixed shutdown crashes after recent handlers creation changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index e70e9c409efa1abc6b68f0888f3fc678c9eafd49..e44cdbb599df573dd038159bb181a11e86f33313 100644 (file)
--- a/src/univ/themes/gtk.cpp
+++ b/src/univ/themes/gtk.cpp
@@ -588,8 +588,6 @@ private:
     wxSortedArrayString m_handlerNames;
     wxArrayHandlers m_handlers;
 
     wxSortedArrayString m_handlerNames;
     wxArrayHandlers m_handlers;
 

-    wxGTKInputHandler *m_handlerDefault;
-

     wxGTKColourScheme *m_scheme;
 
     WX_DECLARE_THEME(gtk)
     wxGTKColourScheme *m_scheme;
 
     WX_DECLARE_THEME(gtk)


@@ -609,20 +607,11 @@ wxGTKTheme::wxGTKTheme()
 {
     m_scheme = NULL;
     m_renderer = NULL;
 {
     m_scheme = NULL;
     m_renderer = NULL;

-    m_handlerDefault = NULL;

     m_artProvider = NULL;
 }
 
 wxGTKTheme::~wxGTKTheme()
 {
     m_artProvider = NULL;
 }
 
 wxGTKTheme::~wxGTKTheme()
 {

-    size_t count = m_handlers.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        if ( m_handlers[n] != m_handlerDefault )
-            delete m_handlers[n];
-    }
-
-    delete m_handlerDefault;

     delete m_renderer;
     delete m_scheme;
     wxArtProvider::RemoveProvider(m_artProvider);
     delete m_renderer;
     delete m_scheme;
     wxArtProvider::RemoveProvider(m_artProvider);