X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90a1a975d4f1c07b53e0f70df7cde32ab1d84f53..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/mgl/app.h diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h index ea6fa45bcc..8bd35c9760 100644 --- a/include/wx/mgl/app.h +++ b/include/wx/mgl/app.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.h +// Name: wx/mgl/app.h // Purpose: // Author: Vaclav Slavik // Id: $Id$ @@ -10,20 +10,17 @@ #ifndef __WX_APP_H__ #define __WX_APP_H__ -#ifdef __GNUG__ -#pragma interface "app.h" -#endif - #include "wx/frame.h" #include "wx/icon.h" +#include "wx/vidmode.h" //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxApp; -class WXDLLEXPORT wxLog; -class WXDLLEXPORT wxEventLoop; +class WXDLLIMPEXP_FWD_CORE wxApp; +class WXDLLIMPEXP_FWD_CORE wxLog; +class WXDLLIMPEXP_FWD_CORE wxEventLoop; //----------------------------------------------------------------------------- // wxApp @@ -33,7 +30,7 @@ class WXDLLEXPORT wxApp: public wxAppBase { public: wxApp(); - ~wxApp(); + virtual ~wxApp(); /* override for altering the way wxGTK intializes the GUI * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by @@ -42,37 +39,20 @@ public: virtual bool OnInitGui(); // override base class (pure) virtuals - virtual int MainLoop(); - virtual void ExitMainLoop(); - virtual bool Initialized(); - virtual bool Pending(); - virtual void Dispatch(); - virtual bool ProcessIdle(); - - // implementation only from now on - void OnIdle(wxIdleEvent &event); - bool SendIdleEvents(); - bool SendIdleEvents(wxWindow* win); - - static bool Initialize(); - static void CleanUp(); - - virtual bool ProcessIdle(); - void DeletePendingObjects(); + virtual bool Initialize(int& argc, wxChar **argv); + virtual void CleanUp(); + virtual void Exit(); + virtual void WakeUpIdle(); virtual bool Yield(bool onlyIfNeeded = FALSE); - virtual wxDisplayModeInfo GetDisplayMode() const { return m_displayMode; } - virtual bool SetDisplayMode(const wxDisplayModeInfo& mode); + virtual wxVideoMode GetDisplayMode() const { return m_displayMode; } + virtual bool SetDisplayMode(const wxVideoMode& mode); private: DECLARE_DYNAMIC_CLASS(wxApp) - DECLARE_EVENT_TABLE() - - wxEventLoop *m_mainLoop; - wxDisplayModeInfo m_displayMode; -}; -int WXDLLEXPORT wxEntry(int argc, char *argv[]); + wxVideoMode m_displayMode; +}; #endif // __WX_APP_H__