X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/153b1416a46501477067e0edd4626b0d16e0e1ec..55809d1394516044a90fa34b12070d0f3e9f1439:/include/wx/os2/app.h diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h index 35a8cc9440..c97e1d4e93 100644 --- a/include/wx/os2/app.h +++ b/include/wx/os2/app.h @@ -12,6 +12,14 @@ #ifndef _WX_APP_H_ #define _WX_APP_H_ +#ifdef __WATCOMC__ + +#include +#include +#include + +#else + #include #include @@ -24,6 +32,8 @@ #define INCL_ORDERS #endif +#endif + #include "wx/event.h" #include "wx/icon.h" @@ -59,16 +69,14 @@ 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 wxIcon GetStdIcon(int which) const; + virtual bool OnInitGui(void); + + virtual bool Yield(bool onlyIfNeeded = false); + virtual void WakeUpIdle(void); virtual void SetPrintMode(int mode) { m_nPrintMode = mode; } virtual int GetPrintMode(void) const { return m_nPrintMode; } @@ -78,17 +86,6 @@ public: 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); @@ -97,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 */ @@ -113,27 +109,15 @@ private: public: // Implementation - static bool Initialize(HAB vHab); - static void CleanUp(void); - static bool RegisterWindowClasses(HAB vHab); - virtual void DoMessage(WXMSG *pMsg); - virtual bool DoMessage(void); - virtual bool ProcessMessage(WXMSG* pMsg); - void DeletePendingObjects(void); - bool ProcessIdle(void); 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_ -