Added missing costructor

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

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 6e79190ab468c2b0fbc22c8e19fd3b8210166cff..6b528f8b16f89ff46d92a8e9e122f9410e5e02e6 100644 (file)
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -2,10 +2,9 @@
 // Name:        app.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        app.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKAPPH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKAPPH__


@@ -15,8 +14,8 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/window.h"

 #include "wx/frame.h"
 #include "wx/frame.h"

+#include "wx/icon.h"

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


@@ -24,97 +23,65 @@
 
 class wxApp;
 class wxLog;
 
 class wxApp;
 class wxLog;

-class wxConfig; // it's not used #if !USE_WXCONFIG, but fwd decl doesn't harm

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// global data
+// wxApp

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-extern wxApp *wxTheApp;
-
-//-----------------------------------------------------------------------------
-// global functions
-//-----------------------------------------------------------------------------
+class wxApp: public wxAppBase
+{
+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();
+    bool SendIdleEvents( wxWindow* win );
+
+    static bool Initialize();
+    static bool InitialzeVisual();
+    static void CleanUp();
+
+    bool ProcessIdle();
+#if wxUSE_THREADS
+    void ProcessPendingEvents();
+#endif
+    void DeletePendingObjects();

 
 

-void wxExit(void);
-bool wxYield(void);
+    // 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; }

 
 

-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
+    bool            m_initialized;

 
 

-#define wxPRINT_WINDOWS         1
-#define wxPRINT_POSTSCRIPT      2
+    gint            m_idleTag;
+#if wxUSE_THREADS
+    gint            m_wakeUpTimerTag;
+#endif
+    unsigned char  *m_colorCube;

 
 

-//-----------------------------------------------------------------------------
-// wxApp
-//-----------------------------------------------------------------------------
+private:
+    /// Set to TRUE while we are in wxYield().
+    bool m_suppressIdleEvents;

 
 

-class wxApp: public wxEvtHandler
-{
-  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 bool OnIdle(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);
-    void DeletePendingObjects(void);
-    
-    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; }
-
-    inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
-    inline bool GetExitOnFrameDelete(void) const { return m_exitOnFrameDelete; }
-  
-    void SetPrintMode(int WXUNUSED(mode) ) {}; 
-    int GetPrintMode(void) const { return wxPRINT_POSTSCRIPT; };
-  
-    static void CommonInit(void);
-    static void CommonCleanUp(void);    
-    
-    // override this function to create default log target of arbitrary
-    // user-defined classv (default implementation creates a wxLogGui object)
-    virtual wxLog *CreateLogTarget();
-    
-#if USE_WXCONFIG
-    // override this function to create a global wxConfig object of different
-    // than default type (right now the default implementation returns NULL)
-    virtual wxConfig *CreateConfig() { return NULL; }
-#endif
-    
-    bool          m_initialized;
-    bool          m_exitOnFrameDelete;
-    gint          m_idleTag;
-    wxWindow     *m_topWindow;
-    wxString      m_appName;
-    wxString      m_className;
-    
-    int         argc;
-    char      **argv;
-    
-    static wxAppInitializerFunction m_appInitFn;
+    DECLARE_DYNAMIC_CLASS(wxApp)
+    DECLARE_EVENT_TABLE()

 };
 
 #endif // __GTKAPPH__
 };
 
 #endif // __GTKAPPH__