wxBestHelpController now used as default on Windows

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

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 58083583f8ea141b041eeeaf5c72812e3ae2d493..d80afdb2fdb915797fbe75e3cbe99b9055c6b3c4 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$


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


@@ -32,7 +33,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


@@ -41,46 +42,44 @@ 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 void WakeUpIdle();

 
 

-    virtual wxIcon GetStdIcon(int which) const;
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();

 
 

-    // implementation only from now on
-    void OnIdle( wxIdleEvent &event );
-    bool SendIdleEvents();
-    bool SendIdleEvents( wxWindow* win );
-
-    static bool Initialize();

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

-    static void CleanUp();
-
-    bool ProcessIdle();
-#if wxUSE_THREADS
-    void ProcessPendingEvents();
-#endif
-    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 *cond, const wxChar *msg);

 
 

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

 
     gint            m_idleTag;
 
     gint            m_idleTag;

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

     unsigned char  *m_colorCube;
 
     unsigned char  *m_colorCube;
 

-private:
-    /// Set to TRUE while we are in wxYield().
-    bool m_suppressIdleEvents;
+    // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
+    // 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();
+    
+#ifdef __WXGTK20__
+    wxConvBrokenFileNames *m_convBrokenFileNames;
+    wxMBConv *m_oldConvFileName;
+#endif

 
 private:
 
 private:

+    // true if we're inside an assert modal dialog
+#ifdef __WXDEBUG__
+    bool m_isInAssert;
+#endif // __WXDEBUG__
+

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