X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f7d425f604e1d812a2f1723063c40ac7f804e41..05112735c29d896a101918aacd2224b54f6dd653:/include/wx/os2/app.h

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 33f4443e00..93c1dd37d6 100644
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -43,14 +43,14 @@ 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
@@ -61,7 +61,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)
 
@@ -75,7 +75,6 @@ public:
 
     virtual bool OnInitGui(void);
 
-    virtual bool Yield(bool onlyIfNeeded = false);
     virtual void WakeUpIdle(void);
 
     virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }
@@ -111,13 +110,15 @@ public:
     // Implementation
     static bool  RegisterWindowClasses(HAB vHab);
 
+    virtual bool DoYield(bool onlyIfNeeded, long eventsToProcess);
+
 public:
     int                             m_nCmdShow;
     HMQ                             m_hMq;
 
 protected:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxApp)
+    wxDECLARE_NO_COPY_CLASS(wxApp);
 };
 #endif
     // _WX_APP_H_