fixed event generation for wxChoice: it now sends one and exactly one wxEVT_COMMAND_C...

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 7193a4379ed6f1d1870304f0162ee1b48d1b04c7..55c540bcd58aeae0c2db31a31cdcf96432a2d1cb 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-    #pragma implementation "app.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -56,7 +52,11 @@
 
 #endif //
 
-#ifndef __EMX__
+#if defined(__WATCOMC__)
+
+#include <tcpustd.h>
+
+#elif !defined(__EMX__)
 
 #define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
 extern "C" int _System bsdselect(int,
@@ -488,8 +488,8 @@ void wxApp::OnIdle(
     if (gbInOnIdle)
         return;
 
-    gbInOnIdle = TRUE;
-    
+    gbInOnIdle = true;
+
     wxAppBase::OnIdle(rEvent);
 
 #if wxUSE_DC_CACHEING
@@ -651,7 +651,7 @@ void wxApp::WakeUpIdle()
             //
             // Should never happen
             //
-            wxLogLastError("PostMessage(WM_NULL)");
+            wxLogLastError(wxT("PostMessage(WM_NULL)"));
         }
     }
 } // end of wxWakeUpIdle
@@ -661,10 +661,7 @@ HAB wxGetInstance()
     return vHabmain;
 }
 
-void wxSetInstance(
-  HAB                               vHab
-)
+void wxSetInstance( HAB vHab )
 {
     vHabmain = vHab;
 }
-