cache results of Motif 2 and Motif-is-Lesstif tests

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

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 834aaa338e37e162b1e836fa556cc80939d028e1..d1e6f63ef58e423bf9d8a2ec49ed7f0c70c69d80 100644 (file)
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -16,19 +16,20 @@
 
 #include "wx/frame.h"
 #include "wx/icon.h"
 
 #include "wx/frame.h"
 #include "wx/icon.h"

+#include "wx/strconv.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxApp;
-class wxLog;
+class WXDLLIMPEXP_CORE wxApp;
+class WXDLLIMPEXP_BASE wxLog;

 
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 

-class wxApp: public wxAppBase
+class WXDLLIMPEXP_CORE wxApp: public wxAppBase

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


@@ -41,8 +42,6 @@ public:
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals

-    virtual bool Initialized();
-

     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void WakeUpIdle();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void WakeUpIdle();
 


@@ -58,18 +57,18 @@ public:
 #endif // __WXDEBUG__
 
     gint            m_idleTag;
 #endif // __WXDEBUG__
 
     gint            m_idleTag;

-#if wxUSE_THREADS
-    gint            m_wakeUpTimerTag;
-#endif
+    void RemoveIdleTag();
+    

     unsigned char  *m_colorCube;
 
     // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
     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;
+    // 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();
     // 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
 #ifdef __WXDEBUG__
 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__