X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e39af974ef7846e26686ae39d74e4696c1fef0c3..55809d1394516044a90fa34b12070d0f3e9f1439:/include/wx/os2/app.h diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h index 048bbc8088..c97e1d4e93 100644 --- a/include/wx/os2/app.h +++ b/include/wx/os2/app.h @@ -14,6 +14,7 @@ #ifdef __WATCOMC__ +#include #include #include @@ -68,18 +69,13 @@ 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 bool Yield(bool onlyIfNeeded = false); virtual void WakeUpIdle(void); virtual void SetPrintMode(int mode) { m_nPrintMode = mode; } @@ -90,9 +86,6 @@ public: void OnEndSession(wxCloseEvent& rEvent); void OnQueryEndSession(wxCloseEvent& rEvent); - 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); @@ -101,7 +94,6 @@ public: 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 */ @@ -117,25 +109,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() + DECLARE_NO_COPY_CLASS(wxApp) }; - -int WXDLLEXPORT wxEntry( int argc, char *argv[] ); #endif // _WX_APP_H_ -