moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

[wxWidgets.git] / include / wx / gtk / app.h

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 056c8c67297b1aca396cb60cf332bcae97b746a7..2681dea2537e0eaf12f54f33bdfa71e27e34d1d9 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -30,11 +30,9 @@ class wxLog;
 
 class wxApp: public wxAppBase
 {
 
 class wxApp: public wxAppBase
 {

-DECLARE_DYNAMIC_CLASS(wxApp)
-

 public:
     wxApp();
 public:
     wxApp();

-    ~wxApp();
+    virtual ~wxApp();

 
     /* override for altering the way wxGTK intializes the GUI
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
 
     /* override for altering the way wxGTK intializes the GUI
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by


@@ -61,14 +59,13 @@ public:
     static void CleanUp();
 
     bool ProcessIdle();
     static void CleanUp();
 
     bool ProcessIdle();

-#if wxUSE_THREADS
-    void ProcessPendingEvents();
-#endif

     void DeletePendingObjects();
 
     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 *msg);
+
+    bool IsInAssert() const { return m_isInAssert; }
+#endif // __WXDEBUG__

 
     bool            m_initialized;
 
 
     bool            m_initialized;
 


@@ -78,11 +75,20 @@ public:
 #endif
     unsigned char  *m_colorCube;
 
 #endif
     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;
+    

 private:
 private:

-    /// Set to TRUE while we are in wxYield().
-    bool m_suppressIdleEvents;
+    // true if we're inside an assert modal dialog
+#ifdef __WXDEBUG__
+    bool m_isInAssert;
+#endif // __WXDEBUG__

 
 

+    DECLARE_DYNAMIC_CLASS(wxApp)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+

 #endif // __GTKAPPH__
 #endif // __GTKAPPH__