Applied wxImage -> wxCursor patch, tool window event table fix

[wxWidgets.git] / include / wx / os2 / app.h

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index f5287d284c27b74bd58918556fc8822f58fde27c..2c631f549436135da974b3873152dec514a0cc7a 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -12,6 +12,13 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
+#ifdef __WATCOMC__
+
+#include <sys/ioctl.h>
+#include <sys/select.h>
+
+#else
+
 #include <sys/time.h>
 #include <sys/types.h>
 
@@ -21,10 +28,11 @@
 #include <utils.h>
 #undef BYTE_ORDER
 #include <types.h>
-#include <nerrno.h>
 #define INCL_ORDERS
 #endif
 
+#endif
+
 #include "wx/event.h"
 #include "wx/icon.h"
 
@@ -68,6 +76,7 @@ public:
     virtual bool Initialized(void);
     virtual bool Pending(void) ;
     virtual void Dispatch(void);
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
 
     virtual wxIcon GetStdIcon(int which) const;
 
@@ -118,6 +127,7 @@ public:
     static void  CleanUp(void);
 
     static bool  RegisterWindowClasses(HAB vHab);
+    virtual void DoMessage(WXMSG *pMsg);
     virtual bool DoMessage(void);
     virtual bool ProcessMessage(WXMSG* pMsg);
     void         DeletePendingObjects(void);