wxMenu::Insert() seems to work, bug in wxMenuBase::Insert() is corrected

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 7b79768cbbf5b6262839c9bd60493defae868ba4..7564b247c77028c9354826066e2db34abd88e154 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -2,9 +2,8 @@
 // Name:        app.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -15,8 +14,8 @@
 #pragma interface
 #endif
 
-#include "wx/window.h"
 #include "wx/frame.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -25,109 +24,62 @@
 class wxApp;
 class wxLog;
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern wxApp *wxTheApp;
-
-//-----------------------------------------------------------------------------
-// global functions
-//-----------------------------------------------------------------------------
-
-void wxExit(void);
-bool wxYield(void);
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-#define wxPRINT_WINDOWS         1
-#define wxPRINT_POSTSCRIPT      2
-
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 
-class wxApp: public wxEvtHandler
+class wxApp: public wxAppBase
 {
-  DECLARE_DYNAMIC_CLASS(wxApp)
-
-  public:
-
-    wxApp(void);
-    ~wxApp(void);
-
-    static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
-    static wxAppInitializerFunction GetInitializerFunction(void) { return m_appInitFn; }
-
-    virtual bool OnInit(void);
-    virtual bool OnInitGui(void);
-    virtual int OnRun(void);
-    virtual int OnExit(void);
-
-    wxWindow *GetTopWindow(void);
-    void SetTopWindow( wxWindow *win );
-    virtual int MainLoop(void);
-    void ExitMainLoop(void);
-    bool Initialized(void);
-    virtual bool Pending(void);
-    virtual void Dispatch(void);
-
-    inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
-    inline bool GetWantDebugOutput(void) { return m_wantDebugOutput; }
-
+public:
+    wxApp();
+    ~wxApp();
+
+    /* override for altering the way wxGTK intializes the GUI
+     * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
+     * default. when overriding this method, the code in it is likely to be
+     * platform dependent, otherwise use OnInit(). */
+    virtual bool OnInitGui();
+
+    // override base class (pure) virtuals
+    virtual int MainLoop();
+    virtual void ExitMainLoop();
+    virtual bool Initialized();
+    virtual bool Pending();
+    virtual void Dispatch();
+
+    virtual wxIcon GetStdIcon(int which) const;
+
+    // implementation only from now on
     void OnIdle( wxIdleEvent &event );
-    bool SendIdleEvents(void);
+    bool SendIdleEvents();
     bool SendIdleEvents( wxWindow* win );
 
-    inline wxString GetAppName(void) const {
-      if (m_appName != "")
-        return m_appName;
-      else return m_className;
-    }
-    inline void SetAppName(const wxString& name) { m_appName = name; };
-    inline wxString GetClassName(void) const { return m_className; }
-    inline void SetClassName(const wxString& name) { m_className = name; }
-    const wxString& GetVendorName() const { return m_vendorName; }
-    void SetVendorName(const wxString& name) { m_vendorName = name; }
+    static bool Initialize();
+    static bool InitialzeVisual();
+    static void CleanUp();
 
-    inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
-    inline bool GetExitOnFrameDelete(void) const { return m_exitOnFrameDelete; }
+    bool ProcessIdle();
+    void DeletePendingObjects();
 
-    void SetPrintMode(int WXUNUSED(mode) ) {};
-    int GetPrintMode(void) const { return wxPRINT_POSTSCRIPT; };
+    // 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; }
 
-    // override this function to create default log target of arbitrary
-    // user-defined classv (default implementation creates a wxLogGui object)
-    virtual wxLog *CreateLogTarget();
+    bool            m_initialized;
 
-  // GTK implementation
-
-    static void CommonInit(void);
-    static void CommonCleanUp(void);
-
-    bool ProcessIdle(void);
-    void DeletePendingObjects(void);
-
-    bool          m_initialized;
-    bool          m_exitOnFrameDelete;
-    bool          m_wantDebugOutput;
-    wxWindow     *m_topWindow;
-    
-    gint          m_idleTag;
-
-    int         argc;
-    char      **argv;
+    gint            m_idleTag;
+#if wxUSE_THREADS
+    gint            m_wakeUpTimerTag;
+#endif
+    unsigned char  *m_colorCube;
 
-    static wxAppInitializerFunction m_appInitFn;
-    
 private:
-  wxString m_vendorName,
-           m_appName,
-           m_className;
+    /// Set to TRUE while we are in wxYield().
+    bool m_suppressIdleEvents;
 
-  DECLARE_EVENT_TABLE()
+private:
+    DECLARE_DYNAMIC_CLASS(wxApp)
+    DECLARE_EVENT_TABLE()
 };
 
 #endif // __GTKAPPH__