X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/os2/app.h?ds=sidebyside diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h index 13d3911521..984783963d 100644 --- 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 ///////////////////////////////////////////////////////////////////////////// @@ -41,16 +40,16 @@ class WXDLLIMPEXP_FWD_CORE wxFrame; class WXDLLIMPEXP_FWD_CORE wxWindow; class WXDLLIMPEXP_FWD_CORE wxApp; class WXDLLIMPEXP_FWD_CORE wxKeyEvent; -class WXDLLIMPEXP_FWD_CORE wxLog; +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 +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) @@ -75,7 +74,6 @@ public: virtual bool OnInitGui(void); - virtual bool Yield(bool onlyIfNeeded = false); virtual void WakeUpIdle(void); virtual void SetPrintMode(int mode) { m_nPrintMode = mode; } @@ -117,7 +115,7 @@ public: protected: DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxApp) + wxDECLARE_NO_COPY_CLASS(wxApp); }; #endif // _WX_APP_H_