X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e04ef47f695b057dfe4c907e63497ae7ff05572..eba99da4c0563e6508761272a1e1f1b791d0af6b:/include/wx/gtk/app.h?ds=sidebyside diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h index f8b359a39f..d80afdb2fd 100644 --- a/include/wx/gtk/app.h +++ b/include/wx/gtk/app.h @@ -10,12 +10,13 @@ #ifndef __GTKAPPH__ #define __GTKAPPH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif #include "wx/frame.h" #include "wx/icon.h" +#include "wx/strconv.h" //----------------------------------------------------------------------------- // classes @@ -41,46 +42,38 @@ 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 *msg); + 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; - 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 - // selection; this is actually an XVisualInfo* - void *m_glVisualInfo; + // selection. + void *m_glVisualInfo; // this is actually an XVisualInfo* + void *m_glFBCInfo; // this is actually an GLXFBConfig* // This returns the current visual: either that used by wxRootWindow // or the XVisualInfo* for SGI. GdkVisual *GetGdkVisual(); +#ifdef __WXGTK20__ + wxConvBrokenFileNames *m_convBrokenFileNames; + wxMBConv *m_oldConvFileName; +#endif + private: // true if we're inside an assert modal dialog #ifdef __WXDEBUG__ @@ -91,6 +84,4 @@ private: DECLARE_EVENT_TABLE() }; -int WXDLLEXPORT wxEntry( int argc, char *argv[] ); - #endif // __GTKAPPH__