X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b5a798153e654af05c7aac93d8965bebf33c019..9d9ad67384e5dc658c4de46e49113c321489bf81:/include/wx/mgl/app.h diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h index 43bec77767..d0bedefdf4 100644 --- a/include/wx/mgl/app.h +++ b/include/wx/mgl/app.h @@ -10,7 +10,7 @@ #ifndef __WX_APP_H__ #define __WX_APP_H__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "app.h" #endif @@ -42,36 +42,22 @@ 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(); - - 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__ +