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 8095ec921c2dba9ffaff98c2f6e41cbcf9565fc2..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)
 


@@ -72,10 +73,8 @@ public:
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp(void);
 
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp(void);
 

-    virtual bool Initialized(void);

     virtual bool OnInitGui(void);
 
     virtual bool OnInitGui(void);
 

-    virtual bool Yield(bool onlyIfNeeded = FALSE);

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


@@ -117,8 +116,7 @@ public:
 
 protected:
     DECLARE_EVENT_TABLE()
 
 protected:
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxApp)
+    wxDECLARE_NO_COPY_CLASS(wxApp);

 };
 #endif
     // _WX_APP_H_
 };
 #endif
     // _WX_APP_H_

-