Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 34b038b56d7844ab7fa75cbf393f8edcff5dc6e1..984783963d6051a71801afd7d586fcc3adb6f662 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        app.h
+// Name:        wx/os2/app.h
 // Purpose:     wxApp class
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,6 +13,7 @@
 
 #ifdef __WATCOMC__
 
+#include <types.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 
@@ -36,20 +36,20 @@
 #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;
+WXDLLIMPEXP_DATA_CORE(extern wxApp*) wxTheApp;
+WXDLLIMPEXP_DATA_CORE(extern HAB)    vHabmain;
 
 // Force an exit from main loop
-void WXDLLEXPORT wxExit(void);
+void WXDLLIMPEXP_CORE wxExit(void);
 
 // Yield to other apps/messages
-bool WXDLLEXPORT wxYield(void);
+bool WXDLLIMPEXP_CORE wxYield(void);
 
 extern MRESULT EXPENTRY wxWndProc( HWND
                                   ,ULONG
@@ -60,7 +60,7 @@ extern MRESULT EXPENTRY wxWndProc( HWND
 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
-class WXDLLEXPORT wxApp : public wxAppBase
+class WXDLLIMPEXP_CORE wxApp : public wxAppBase
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 
@@ -68,18 +68,12 @@ 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 void WakeUpIdle(void);
 
     virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }
@@ -113,25 +107,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()
+    wxDECLARE_NO_COPY_CLASS(wxApp);
 };
-
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
 #endif
     // _WX_APP_H_
-