X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72cdf4c9b3ce92addf09cfb322f0c19bfb0f8744..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/app.h diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h index 7564b247c7..398275be71 100644 --- a/include/wx/gtk1/app.h +++ b/include/wx/gtk1/app.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.h +// Name: wx/gtk/app.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,7 +10,7 @@ #ifndef __GTKAPPH__ #define __GTKAPPH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -32,7 +32,7 @@ class 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 @@ -46,8 +46,8 @@ public: virtual bool Initialized(); virtual bool Pending(); virtual void Dispatch(); - - virtual wxIcon GetStdIcon(int which) const; + virtual bool Yield(bool onlyIfNeeded = FALSE); + virtual bool ProcessIdle(); // implementation only from now on void OnIdle( wxIdleEvent &event ); @@ -58,12 +58,13 @@ public: static bool InitialzeVisual(); static void CleanUp(); - bool ProcessIdle(); void DeletePendingObjects(); - // This can be used to suppress the generation of Idle events. - void SuppressIdleEvents(bool arg = TRUE) { m_suppressIdleEvents = arg; } - bool GetSuppressIdleEvents() const { return m_suppressIdleEvents; } +#ifdef __WXDEBUG__ + virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg); + + bool IsInAssert() const { return m_isInAssert; } +#endif // __WXDEBUG__ bool m_initialized; @@ -73,13 +74,25 @@ public: #endif unsigned char *m_colorCube; -private: - /// Set to TRUE while we are in wxYield(). - bool m_suppressIdleEvents; + // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual + // selection; this is actually an XVisualInfo* + void *m_glVisualInfo; + // 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() }; +int WXDLLEXPORT wxEntry( int argc, char *argv[] ); + #endif // __GTKAPPH__