X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a06dd8df2db19e3e646f2d3c8f696168e98f846..bb4549de8f731378d169faec928ec4e0c64536e8:/include/wx/gtk/app.h?ds=sidebyside

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 6e79190ab4..c697207972 100644
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -2,10 +2,9 @@
 // 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__
@@ -15,6 +14,7 @@
 #pragma interface
 #endif
 
+#include "wx/defs.h"
 #include "wx/window.h"
 #include "wx/frame.h"
 
@@ -24,7 +24,6 @@
 
 class wxApp;
 class wxLog;
-class wxConfig; // it's not used #if !USE_WXCONFIG, but fwd decl doesn't harm
 
 //-----------------------------------------------------------------------------
 // global data
@@ -55,18 +54,18 @@ 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);
@@ -74,8 +73,14 @@ class wxApp: public wxEvtHandler
     bool Initialized(void);
     virtual bool Pending(void);
     virtual void Dispatch(void);
-    void DeletePendingObjects(void);
-    
+
+    inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
+    inline bool GetWantDebugOutput(void) { return m_wantDebugOutput; }
+
+    void OnIdle( wxIdleEvent &event );
+    bool SendIdleEvents(void);
+    bool SendIdleEvents( wxWindow* win );
+
     inline wxString GetAppName(void) const {
       if (m_appName != "")
         return m_appName;
@@ -84,37 +89,45 @@ class wxApp: public wxEvtHandler
     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; }
 
     inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
     inline bool GetExitOnFrameDelete(void) const { return m_exitOnFrameDelete; }
-  
-    void SetPrintMode(int WXUNUSED(mode) ) {}; 
+
+    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
-    
+
+  // GTK implementation
+
+    static void CommonInit(void);
+    static void CommonCleanUp(void);
+
+    bool ProcessIdle(void);
+    void DeletePendingObjects(void);
+
     bool          m_initialized;
     bool          m_exitOnFrameDelete;
-    gint          m_idleTag;
+    bool          m_wantDebugOutput;
     wxWindow     *m_topWindow;
-    wxString      m_appName;
-    wxString      m_className;
     
+    gint          m_idleTag;
+
     int         argc;
     char      **argv;
-    
+
     static wxAppInitializerFunction m_appInitFn;
+    
+private:
+  wxString m_vendorName,
+           m_appName,
+           m_className;
+
+  DECLARE_EVENT_TABLE()
 };
 
 #endif // __GTKAPPH__