X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9dea36ef6d117e0562f0079345a77ff1696d3a49..1a787c5dc89b1cb6a9ddb4ebef3ad2fb24b49c8c:/src/os2/app.cpp

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index ee11aa649b..3e752ba5ff 100644
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -107,7 +107,6 @@ MRESULT wxWndProc( HWND
 // wxApp
 // ---------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
     BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
@@ -115,7 +114,6 @@ MRESULT wxWndProc( HWND
         EVT_END_SESSION(wxApp::OnEndSession)
         EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
     END_EVENT_TABLE()
-#endif
 
 //// Initialize
 bool wxApp::Initialize(
@@ -166,7 +164,7 @@ 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
@@ -512,6 +510,7 @@ wxApp::wxApp()
 
 wxApp::~wxApp()
 {
+#if wxUSE_UNICODE
     // Delete command-line args
     int i;
     for (i = 0; i < argc; i++)
@@ -519,6 +518,7 @@ wxApp::~wxApp()
         delete[] argv[i];
     }
     delete[] argv;
+#endif
 }
 
 bool wxApp::Initialized()