X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/153b1416a46501477067e0edd4626b0d16e0e1ec..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/os2/app.h?ds=inline diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h index 35a8cc9440..cf33821234 100644 --- a/include/wx/os2/app.h +++ b/include/wx/os2/app.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.h +// Name: wx/os2/app.h // Purpose: wxApp class // Author: David Webster // Modified by: @@ -12,6 +12,14 @@ #ifndef _WX_APP_H_ #define _WX_APP_H_ +#ifdef __WATCOMC__ + +#include +#include +#include + +#else + #include #include @@ -24,23 +32,25 @@ #define INCL_ORDERS #endif +#endif + #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 -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 @@ -51,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) @@ -59,16 +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 wxIcon GetStdIcon(int which) const; + virtual bool OnInitGui(void); + + virtual void WakeUpIdle(void); virtual void SetPrintMode(int mode) { m_nPrintMode = mode; } virtual int GetPrintMode(void) const { return m_nPrintMode; } @@ -78,17 +85,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 +93,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 +108,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() + wxDECLARE_NO_COPY_CLASS(wxApp); }; - -int WXDLLEXPORT wxEntry( int argc, char *argv[] ); #endif // _WX_APP_H_ -