update mac gl, after rev 50900

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

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 4a4312085d08ba67c89d935715c4e9aff1d88537..33f4443e00a2f2099c8b525608a0aee47c65bc22 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -14,6 +14,7 @@
 
 #ifdef __WATCOMC__
 
+#include <types.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 
@@ -36,11 +37,11 @@
 #include "wx/event.h"
 #include "wx/icon.h"
 
-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxApp;
-class WXDLLEXPORT wxKeyEvent;
-class WXDLLEXPORT wxLog;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxApp;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
+class WXDLLIMPEXP_FWD_BASE wxLog;
 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 WXDLLEXPORT_DATA(extern HAB)    vHabmain;
@@ -68,18 +69,13 @@ public:
     wxApp();
     virtual ~wxApp();
 
-    virtual bool OnInitGui(void);
-
     // override base class (pure) virtuals
-    virtual int  MainLoop(void);
-    virtual void ExitMainLoop(void);
-    virtual bool Initialized(void);
-    virtual bool Pending(void) ;
-    virtual void Dispatch(void);
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp(void);
 
-    virtual void Exit();
+    virtual bool OnInitGui(void);
 
-    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual bool Yield(bool onlyIfNeeded = false);
     virtual void WakeUpIdle(void);
 
     virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }
@@ -113,23 +109,15 @@ private:
 public:
 
     // Implementation
-    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);
 
 public:
     int                             m_nCmdShow;
     HMQ                             m_hMq;
 
 protected:
-    bool                            m_bKeepGoing ;
-
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxApp)
 };
 #endif
     // _WX_APP_H_
-