Support for G_FILENAME_ENCODING=@locale

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index f8b359a39f27a58b02dfce21dbd122c39cbfd7ee..82ee2dd180fe934d76b5978b85686b22d166f0d5 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -10,12 +10,13 @@
 #ifndef __GTKAPPH__
 #define __GTKAPPH__
 
 #ifndef __GTKAPPH__
 #define __GTKAPPH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #include "wx/frame.h"
 #include "wx/icon.h"
 #pragma interface
 #endif
 
 #include "wx/frame.h"
 #include "wx/icon.h"

+#include "wx/strconv.h"

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


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

-    virtual int MainLoop();
-    virtual void ExitMainLoop();
-    virtual bool Initialized();
-    virtual bool Pending();
-    virtual void Dispatch();

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

+    virtual void WakeUpIdle();

 
 

-    // implementation only from now on
-    void OnIdle( wxIdleEvent &event );
-    bool SendIdleEvents();
-    bool SendIdleEvents( wxWindow* win );
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();

 
 

-    static bool Initialize();

     static bool InitialzeVisual();
     static bool InitialzeVisual();

-    static void CleanUp();
-
-    bool ProcessIdle();
-    void DeletePendingObjects();

 
 #ifdef __WXDEBUG__
 
 #ifdef __WXDEBUG__

-    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
+    virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg);

 
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__
 
 
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__
 

-    bool            m_initialized;
-

     gint            m_idleTag;
     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();


@@ -91,6 +79,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

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

 #endif // __GTKAPPH__
 #endif // __GTKAPPH__