X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be88a6ade981b99d55fa1da20cd1a12be4a075f2..99c4be680622f58a48a04dfe0835b59d2c41afea:/include/wx/gtk1/app.h diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h index cdb4c4cb73..db2d753e3d 100644 --- a/include/wx/gtk1/app.h +++ b/include/wx/gtk1/app.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/app.h +// Name: wx/gtk1/app.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,25 +10,22 @@ #ifndef __GTKAPPH__ #define __GTKAPPH__ -#ifdef __GNUG__ -#pragma interface -#endif - #include "wx/frame.h" #include "wx/icon.h" +#include "wx/strconv.h" //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class wxApp; -class wxLog; +class WXDLLIMPEXP_FWD_CORE wxApp; +class WXDLLIMPEXP_FWD_BASE wxLog; //----------------------------------------------------------------------------- // wxApp //----------------------------------------------------------------------------- -class wxApp: public wxAppBase +class WXDLLIMPEXP_CORE wxApp: public wxAppBase { public: wxApp(); @@ -41,24 +38,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,17 +52,15 @@ 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 - // 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(); @@ -87,12 +71,7 @@ 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__