Unicodification of wxTextFile

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

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 58083583f8ea141b041eeeaf5c72812e3ae2d493..6014589623f641039958e07130c9b09d6f0d956b 100644 (file)
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -59,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;
 


@@ -77,12 +76,15 @@ public:
     unsigned char  *m_colorCube;
 
 private:
     unsigned char  *m_colorCube;
 
 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__

 
 

-private:

     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };
 

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

 #endif // __GTKAPPH__
 #endif // __GTKAPPH__