X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/005f5d1878c1d344e79e3c43b2790332dcea68f3..245f35816d761212279e8cf223475efb7a367553:/include/wx/gtk/app.h diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h index 3e3d10661e..398275be71 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(__APPLE__) #pragma interface #endif @@ -47,8 +47,7 @@ public: virtual bool Pending(); virtual void Dispatch(); virtual bool Yield(bool onlyIfNeeded = FALSE); - - virtual wxIcon GetStdIcon(int which) const; + virtual bool ProcessIdle(); // implementation only from now on void OnIdle( wxIdleEvent &event ); @@ -59,11 +58,10 @@ public: static bool InitialzeVisual(); static void CleanUp(); - bool ProcessIdle(); void DeletePendingObjects(); #ifdef __WXDEBUG__ - virtual void OnAssert(const wxChar *file, int line, const wxChar *msg); + virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg); bool IsInAssert() const { return m_isInAssert; } #endif // __WXDEBUG__ @@ -82,13 +80,15 @@ public: // This returns the current visual: either that used by wxRootWindow // or the XVisualInfo* for SGI. GdkVisual *GetGdkVisual(); - + private: // true if we're inside an assert modal dialog #ifdef __WXDEBUG__ bool m_isInAssert; #endif // __WXDEBUG__ + bool CallInternalIdle( wxWindow* win ); + DECLARE_DYNAMIC_CLASS(wxApp) DECLARE_EVENT_TABLE() };