X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad553268cb629e74fcf617fc6742d7b636d1e6e6..b666df2c102d1e183532adf0c003e63b1a591e2f:/include/wx/gtk/app.h

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index ee9f9fd0ed..60ff70c269 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,78 +54,80 @@ class wxApp: public wxEvtHandler
   DECLARE_DYNAMIC_CLASS(wxApp)
 
   public:
-  
-    wxApp(void);
-    ~wxApp(void);
-    
+
+    wxApp();
+    ~wxApp();
+
     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);
+    static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }
+
+    /* this may have to be overwritten when special, non-default visuals have
+       to be set. it is also platform dependent as only X knows about displays
+       and visuals. */
+    virtual bool InitVisual();
+
+    virtual bool OnInit();
+    virtual bool OnInitGui();
+    virtual int OnRun();
+    virtual int OnExit();
+
+    wxWindow *GetTopWindow();
     void SetTopWindow( wxWindow *win );
-    virtual int MainLoop(void);
-    void ExitMainLoop(void);
-    bool Initialized(void);
-    virtual bool Pending(void);
-    virtual void Dispatch(void);
+    virtual int MainLoop();
+    void ExitMainLoop();
+    bool Initialized();
+    virtual bool Pending();
+    virtual void Dispatch();
 
     inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
-    inline bool GetWantDebugOutput(void) { return m_wantDebugOutput; }
+    inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
 
-    void OnIdle( wxIdleEvent &event );    
-    bool SendIdleEvents(void);
+    void OnIdle( wxIdleEvent &event );
+    bool SendIdleEvents();
     bool SendIdleEvents( wxWindow* win );
-        
-    inline wxString GetAppName(void) const {
+
+    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(void) const { return m_className; }
+    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(void) const { return m_exitOnFrameDelete; }
-  
-    void SetPrintMode(int WXUNUSED(mode) ) {}; 
-    int GetPrintMode(void) const { return wxPRINT_POSTSCRIPT; };
-    
+    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();
-    
-#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;
-    bool          m_wantDebugOutput;
-    wxWindow     *m_topWindow;
-    
-    gint          m_idleTag;
-    
-    int         argc;
-    char      **argv;
+    static void CommonInit();
+    static void CommonCleanUp();
+
+    bool ProcessIdle();
+    void DeletePendingObjects();
+
+    bool            m_initialized;
+    bool            m_exitOnFrameDelete;
+    bool            m_wantDebugOutput;
+    wxWindow       *m_topWindow;
     
+    gint            m_idleTag;
+    unsigned char  *m_colorCube;
+
+    int             argc;
+    char          **argv;
+
     static wxAppInitializerFunction m_appInitFn;
     
 private: