X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/738f9e5a12b8bb3936cc10347be98390602d3660..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gtk1/app.h

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 58083583f8..c8b7dc8a97 100644
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        app.h
+// Name:        wx/gtk1/app.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -10,29 +9,28 @@
 #ifndef __GTKAPPH__
 #define __GTKAPPH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/frame.h"
 #include "wx/icon.h"
+#include "wx/strconv.h"
+
+typedef struct _GdkVisual GdkVisual;
 
 //-----------------------------------------------------------------------------
 // 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();
-    ~wxApp();
+    virtual ~wxApp();
 
     /* override for altering the way wxGTK intializes the GUI
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
@@ -41,48 +39,39 @@ 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 wxIcon GetStdIcon(int which) const;
+    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();
-#if wxUSE_THREADS
-    void ProcessPendingEvents();
-#endif
-    void DeletePendingObjects();
+    virtual void OnAssertFailure(const wxChar *file,
+                                 int line,
+                                 const wxChar *func,
+                                 const wxChar *cond,
+                                 const wxChar *msg);
 
-    // 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; }
+    bool IsInAssert() const { return m_isInAssert; }
 
-    bool            m_initialized;
+    int             m_idleTag;
+    void RemoveIdleTag();
 
-    gint            m_idleTag;
-#if wxUSE_THREADS
-    gint            m_wakeUpTimerTag;
-#endif
     unsigned char  *m_colorCube;
 
-private:
-    /// Set to TRUE while we are in wxYield().
-    bool m_suppressIdleEvents;
+    // Used by the wxGLApp and wxGLCanvas class for GL-based X visual
+    // 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();
 
 private:
+    // true if we're inside an assert modal dialog
+    bool m_isInAssert;
+
     DECLARE_DYNAMIC_CLASS(wxApp)
-    DECLARE_EVENT_TABLE()
 };
 
 #endif // __GTKAPPH__