Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 72c419454c564c7bb7d4dd080ae903c2640e554c..3e752ba5ff84a10761bf05d0b3f2edb84b5e9ef5 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -93,7 +93,11 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON  = (HICON) NULL;
 
 HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
 
 
 HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
 

-MRESULT wxWndProc(HWND, UINT, MPARAM, MPARAM);
+MRESULT wxWndProc( HWND
+                  ,ULONG
+                  ,MPARAM
+                  ,MPARAM
+                 );

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -103,7 +107,6 @@ MRESULT wxWndProc(HWND, UINT, MPARAM, MPARAM);
 // wxApp
 // ---------------------------------------------------------------------------
 
 // wxApp
 // ---------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
     BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
     BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)


@@ -111,7 +114,6 @@ MRESULT wxWndProc(HWND, UINT, MPARAM, MPARAM);
         EVT_END_SESSION(wxApp::OnEndSession)
         EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
     END_EVENT_TABLE()
         EVT_END_SESSION(wxApp::OnEndSession)
         EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
     END_EVENT_TABLE()

-#endif

 
 //// Initialize
 bool wxApp::Initialize(
 
 //// Initialize
 bool wxApp::Initialize(


@@ -162,7 +164,7 @@ bool wxApp::Initialize(
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.
 
     // 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
     extern char wxDummyChar;
     if (wxDummyChar) wxDummyChar++;
 #endif


@@ -399,7 +401,7 @@ int wxEntry(
 , char*                             argv[]
 )
 {
 , char*                             argv[]
 )
 {

-    HAB                             vHab;
+    HAB                             vHab = 0;

 
     if (!wxApp::Initialize(vHab))
         return 0;
 
     if (!wxApp::Initialize(vHab))
         return 0;


@@ -508,6 +510,7 @@ wxApp::wxApp()
 
 wxApp::~wxApp()
 {
 
 wxApp::~wxApp()
 {

+#if wxUSE_UNICODE

     // Delete command-line args
     int i;
     for (i = 0; i < argc; i++)
     // Delete command-line args
     int i;
     for (i = 0; i < argc; i++)


@@ -515,6 +518,7 @@ wxApp::~wxApp()
         delete[] argv[i];
     }
     delete[] argv;
         delete[] argv[i];
     }
     delete[] argv;

+#endif

 }
 
 bool wxApp::Initialized()
 }
 
 bool wxApp::Initialized()


@@ -874,7 +878,7 @@ void wxExit()
 // Yield to incoming messages
 bool wxYield()
 {
 // Yield to incoming messages
 bool wxYield()
 {

-    HAB                             vHab;
+    HAB                             vHab = 0;

     QMSG                            vMsg;
     // We want to go back to the main message loop
     // if we see a WM_QUIT. (?)
     QMSG                            vMsg;
     // We want to go back to the main message loop
     // if we see a WM_QUIT. (?)