X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be88a6ade981b99d55fa1da20cd1a12be4a075f2..a76d8a29531683cc1c82294ce0c894886f09c404:/include/wx/gtk/app.h diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h index cdb4c4cb73..fd4fa6226b 100644 --- a/include/wx/gtk/app.h +++ b/include/wx/gtk/app.h @@ -10,7 +10,7 @@ #ifndef __GTKAPPH__ #define __GTKAPPH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -41,24 +41,13 @@ 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 Yield(bool onlyIfNeeded = FALSE); + virtual void WakeUpIdle(); - // implementation only from now on - void OnIdle( wxIdleEvent &event ); - bool SendIdleEvents(); - bool SendIdleEvents( wxWindow* win ); + virtual bool Initialize(int& argc, wxChar **argv); + virtual void CleanUp(); - static bool Initialize(); static bool InitialzeVisual(); - static void CleanUp(); - - bool ProcessIdle(); - void DeletePendingObjects(); #ifdef __WXDEBUG__ virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg); @@ -66,12 +55,9 @@ public: bool IsInAssert() const { return m_isInAssert; } #endif // __WXDEBUG__ - bool m_initialized; - gint m_idleTag; -#if wxUSE_THREADS - gint m_wakeUpTimerTag; -#endif + void RemoveIdleTag(); + unsigned char *m_colorCube; // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual @@ -87,12 +73,8 @@ private: bool m_isInAssert; #endif // __WXDEBUG__ - bool CallInternalIdle( wxWindow* win ); - DECLARE_DYNAMIC_CLASS(wxApp) DECLARE_EVENT_TABLE() }; -int WXDLLEXPORT wxEntry( int argc, char *argv[] ); - #endif // __GTKAPPH__