Removed some code duplicating wxAppBase functions.

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 84687d9924f211c3e3071568ff013d5eba3de813..c131905de877243a9e21b8c59510e383246aecc4 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -281,7 +281,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     // wxSetKeyboardHook(TRUE);
 
 
     // wxSetKeyboardHook(TRUE);
 

-    RegisterWindowClasses(vHab);
+    RegisterWindowClasses(vHabmain);

 
     return TRUE;
 } // end of wxApp::Initialize
 
     return TRUE;
 } // end of wxApp::Initialize


@@ -452,13 +452,6 @@ void wxApp::CleanUp()
     if (wxWinHandleList)
         delete wxWinHandleList;
 
     if (wxWinHandleList)
         delete wxWinHandleList;
 

-    delete wxPendingEvents;
-#if wxUSE_THREADS
-    delete wxPendingEventsLocker;
-    // If we don't do the following, we get an apparent memory leak.
-    ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
-#endif
-

     // Delete Message queue
     if (wxTheApp->m_hMq)
         ::WinDestroyMsgQueue(wxTheApp->m_hMq);
     // Delete Message queue
     if (wxTheApp->m_hMq)
         ::WinDestroyMsgQueue(wxTheApp->m_hMq);


@@ -488,9 +481,6 @@ bool wxApp::OnInitGui()
 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-    m_topWindow = NULL;
-    wxTheApp = this;
-

     argc = 0;
     argv = NULL;
     m_nPrintMode = wxPRINT_WINDOWS;
     argc = 0;
     argv = NULL;
     m_nPrintMode = wxPRINT_WINDOWS;


@@ -774,7 +764,7 @@ void wxApp::OnIdle(
 
     gbInOnIdle = TRUE;
     
 
     gbInOnIdle = TRUE;
     

-    wxAppBase::OnIdle(event);
+    wxAppBase::OnIdle(rEvent);

 
 #if wxUSE_DC_CACHEING
     // automated DC cache management: clear the cached DCs and bitmap
 
 #if wxUSE_DC_CACHEING
     // automated DC cache management: clear the cached DCs and bitmap