added wxEncodingToCodepage() and implemented it properly (using in32 API instead...

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

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


@@ -75,6 +76,10 @@ 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:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__
 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__