no changes, just remove #if'd out code

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

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 915e1a12678053a276a9db218db77b9ed698e1e1..f4d6fe2fa0af3f5adf52c139589e0daa06084eaf 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -14,6 +14,7 @@
 
 #ifdef __WATCOMC__
 
 
 #ifdef __WATCOMC__
 

+#include <types.h>

 #include <sys/ioctl.h>
 #include <sys/select.h>
 
 #include <sys/ioctl.h>
 #include <sys/select.h>
 


@@ -36,20 +37,20 @@
 #include "wx/event.h"
 #include "wx/icon.h"
 
 #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
 
 // Force an exit from main loop

-void WXDLLEXPORT wxExit(void);
+void WXDLLIMPEXP_CORE wxExit(void);

 
 // Yield to other apps/messages
 
 // Yield to other apps/messages

-bool WXDLLEXPORT wxYield(void);
+bool WXDLLIMPEXP_CORE wxYield(void);

 
 extern MRESULT EXPENTRY wxWndProc( HWND
                                   ,ULONG
 
 extern MRESULT EXPENTRY wxWndProc( HWND
                                   ,ULONG


@@ -60,7 +61,7 @@ extern MRESULT EXPENTRY wxWndProc( HWND
 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 
 // 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)
 
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 


@@ -68,19 +69,12 @@ public:
     wxApp();
     virtual ~wxApp();
 
     wxApp();
     virtual ~wxApp();
 

-    virtual bool OnInitGui(void);
-

     // override base class (pure) virtuals
     // 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 ProcessIdle(void);

     virtual void WakeUpIdle(void);
 
     virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }
     virtual void WakeUpIdle(void);
 
     virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }


@@ -91,17 +85,6 @@ public:
     void OnEndSession(wxCloseEvent& rEvent);
     void OnQueryEndSession(wxCloseEvent& rEvent);
 
     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);
     int AddSocketHandler(int handle, int mask,
                          void (*callback)(void*), void * gsock);
     void RemoveSocketHandler(int handle);


@@ -110,7 +93,6 @@ public:
 protected:
     bool                            m_bShowOnInit;
     int                             m_nPrintMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 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 */
 
     //
     // PM-specific wxApp definitions */


@@ -126,25 +108,15 @@ private:
 public:
 
     // Implementation
 public:
 
     // Implementation

-    virtual bool  Initialize(int argc, wxChar **argv);
-    virtual void  CleanUp(void);
-

     static bool  RegisterWindowClasses(HAB vHab);
     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:
 
 public:
     int                             m_nCmdShow;
     HMQ                             m_hMq;
 
 protected:

-    bool                            m_bKeepGoing ;
-

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    wxDECLARE_NO_COPY_CLASS(wxApp);

 };
 };

-
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );

 #endif
     // _WX_APP_H_
 #endif
     // _WX_APP_H_

-