avoid a bug in Carbon headers

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

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 35a8cc9440bf386fbd053a3c40ef4d11627147fd..34b038b56d7844ab7fa75cbf393f8edcff5dc6e1 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>
 
@@ -24,6 +31,8 @@
 #define INCL_ORDERS
 #endif
 
+#endif
+
 #include "wx/event.h"
 #include "wx/icon.h"
 
@@ -68,7 +77,10 @@ public:
     virtual bool Pending(void) ;
     virtual void Dispatch(void);
 
-    virtual wxIcon GetStdIcon(int which) const;
+    virtual void Exit();
+
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual void WakeUpIdle(void);
 
     virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }
     virtual int  GetPrintMode(void) const { return m_nPrintMode; }
@@ -78,17 +90,6 @@ public:
     void OnEndSession(wxCloseEvent& rEvent);
     void OnQueryEndSession(wxCloseEvent& rEvent);
 
-    // Send idle event to all top-level windows.
-    // Returns TRUE if more idle time is requested.
-    bool SendIdleEvents(void);
-
-    // Send idle event to window and all subwindows
-    // Returns TRUE if more idle time is requested.
-    bool SendIdleEvents(wxWindow* pWin);
-
-    void SetAuto3D(bool bFlag) { m_bAuto3D = bFlag; }
-    bool GetAuto3D(void) const { return m_bAuto3D; }
-
     int AddSocketHandler(int handle, int mask,
                          void (*callback)(void*), void * gsock);
     void RemoveSocketHandler(int handle);
@@ -97,7 +98,6 @@ public:
 protected:
     bool                            m_bShowOnInit;
     int                             m_nPrintMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
-    bool                            m_bAuto3D ;   // Always use 3D controls, except where overriden
 
     //
     // PM-specific wxApp definitions */
@@ -113,15 +113,13 @@ private:
 public:
 
     // Implementation
-    static bool  Initialize(HAB vHab);
-    static void  CleanUp(void);
+    virtual bool  Initialize(int& argc, wxChar **argv);
+    virtual 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);
-    bool         ProcessIdle(void);
 
 public:
     int                             m_nCmdShow;