made msw wxRegion(wxRect&) constructor consistant with other wxRegion constructors

[wxWidgets.git] / src / os2 / app.cpp

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index ee11aa649bb44e1a7c23c0f31b611171c6f87910..521f05f5868b7866bc55bc28d2d586072d859a7d 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -62,7 +62,6 @@ extern wxChar*                      wxBuffer;
 extern wxChar*                      wxOsVersion;
 extern wxList*                      wxWinHandleList;
 extern wxList WXDLLEXPORT           wxPendingDelete;
-extern void wxSetKeyboardHook(bool doIt);
 extern wxCursor*                    g_globalCursor;
 
 HINSTANCE                           wxhInstance = 0;
@@ -107,7 +106,6 @@ MRESULT wxWndProc( HWND
 // wxApp
 // ---------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
     BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
@@ -115,7 +113,6 @@ MRESULT wxWndProc( HWND
         EVT_END_SESSION(wxApp::OnEndSession)
         EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
     END_EVENT_TABLE()
-#endif
 
 //// Initialize
 bool wxApp::Initialize(
@@ -166,12 +163,12 @@ bool wxApp::Initialize(
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.
-#if !defined(WXMAKINGDLL)
+#if !defined(WXMAKINGDLL) && defined(__VISAGECPP__)
     extern char wxDummyChar;
     if (wxDummyChar) wxDummyChar++;
 #endif
 
-    wxSetKeyboardHook(TRUE);
+    // wxSetKeyboardHook(TRUE);
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules())
@@ -340,7 +337,7 @@ void wxApp::CleanUp()
 
     //// WINDOWS-SPECIFIC CLEANUP
 
-    wxSetKeyboardHook(FALSE);
+    // wxSetKeyboardHook(FALSE);
 
     if (wxSTD_FRAME_ICON)
         ::WinFreeFileIcon(wxSTD_FRAME_ICON);
@@ -512,6 +509,7 @@ wxApp::wxApp()
 
 wxApp::~wxApp()
 {
+#if wxUSE_UNICODE
     // Delete command-line args
     int i;
     for (i = 0; i < argc; i++)
@@ -519,6 +517,7 @@ wxApp::~wxApp()
         delete[] argv[i];
     }
     delete[] argv;
+#endif
 }
 
 bool wxApp::Initialized()