fixed bug with the caret positioning after SetValue() introduced by the last commit

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 58083583f8ea141b041eeeaf5c72812e3ae2d493..e031a2ce9f57e48fa50487b2c2887a13fed79fc8 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.h
+// Name:        wx/gtk/app.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -32,7 +32,7 @@ class wxApp: public wxAppBase
 {
 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


@@ -46,6 +46,7 @@ public:
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();

+    virtual bool Yield(bool onlyIfNeeded = FALSE);

 
     virtual wxIcon GetStdIcon(int which) const;
 
 
     virtual wxIcon GetStdIcon(int which) const;
 


@@ -59,14 +60,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;
 


@@ -76,13 +76,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__

 
 

-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__