Further wxUniv fixes

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 365c08f90a29394176c0e1ab06acecded9fd3d87..9f25e6154518cfdf8a93ca491bd3f54e5ff52500 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -14,9 +14,8 @@
 #pragma interface
 #endif
 
-#include "wx/defs.h"
-#include "wx/window.h"
 #include "wx/frame.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -25,91 +24,36 @@
 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:
-
+public:
     wxApp();
     ~wxApp();
 
-    static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
-    static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }
-
-    /* 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(). */
+    /* 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 to create top level frame, display splash screen etc. */
-    virtual bool OnInit() { return FALSE; }
-    
-    virtual int OnRun() { return MainLoop(); }
-    virtual int OnExit() { return 0; }
-
-    wxWindow *GetTopWindow();
-    void SetTopWindow( wxWindow *win );
-    
+
+    // override base class (pure) virtuals
     virtual int MainLoop();
-    void ExitMainLoop();
-    bool Initialized();
+    virtual void ExitMainLoop();
+    virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
 
-    inline void SetWantDebugOutput( bool flag ) { m_wantDebugOutput = flag; }
-    inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
+    virtual wxIcon GetStdIcon(int which) const;
 
+    // implementation only from now on
     void OnIdle( wxIdleEvent &event );
     bool SendIdleEvents();
     bool SendIdleEvents( wxWindow* win );
 
-    inline wxString GetAppName() const 
-      { if (m_appName != "") return m_appName; else return m_className; }
-    inline void SetAppName( const wxString& name ) { m_appName = name; }
-    
-    inline wxString GetClassName() 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; }
-
-    inline void SetExitOnFrameDelete( bool flag ) { m_exitOnFrameDelete = flag; }
-    inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
-
-    void SetPrintMode( int WXUNUSED(mode) ) {}
-    int GetPrintMode() const { return wxPRINT_POSTSCRIPT; }
-
-    /* override this function to create default log target of arbitrary
-     * user-defined classv (default implementation creates a wxLogGui object) */
-    virtual wxLog *CreateLogTarget();
-
-  // implementation 
-
     static bool Initialize();
     static bool InitialzeVisual();
     static void CleanUp();
@@ -117,24 +61,27 @@ class wxApp: public wxEvtHandler
     bool ProcessIdle();
     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; }
+
     bool            m_initialized;
-    bool            m_exitOnFrameDelete;
-    bool            m_wantDebugOutput;
-    wxWindow       *m_topWindow;
-    
+
     gint            m_idleTag;
+#if wxUSE_THREADS
+    gint            m_wakeUpTimerTag;
+#endif
     unsigned char  *m_colorCube;
 
-    int             argc;
-    char          **argv;
-
-    wxString        m_vendorName;
-    wxString        m_appName;
-    wxString        m_className;
+private:
+    // Set to TRUE while we are in wxYield().
+    bool m_suppressIdleEvents;
 
-    static wxAppInitializerFunction m_appInitFn;
-    
-  DECLARE_EVENT_TABLE()
+private:
+    DECLARE_DYNAMIC_CLASS(wxApp)
+    DECLARE_EVENT_TABLE()
 };
 
+int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+
 #endif // __GTKAPPH__