wxGTK fixes for the yesterday's addition of m_isWindow flag

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index ee9f9fd0eda24bac79af29f153c255c66884f7fd..365c08f90a29394176c0e1ab06acecded9fd3d87 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/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,6 +14,7 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

+#include "wx/defs.h"

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


@@ -24,7 +24,6 @@
 
 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
 
 //-----------------------------------------------------------------------------
 // global data


@@ -55,85 +54,86 @@ class wxApp: public wxEvtHandler
   DECLARE_DYNAMIC_CLASS(wxApp)
 
   public:
   DECLARE_DYNAMIC_CLASS(wxApp)
 
   public:

-  
-    wxApp(void);
-    ~wxApp(void);
-    
+
+    wxApp();
+    ~wxApp();
+

     static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
     static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }

-    static wxAppInitializerFunction GetInitializerFunction(void) { return m_appInitFn; }
+    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(). */
+    virtual bool OnInitGui();

     
     

-    virtual bool OnInit(void);
-    virtual bool OnInitGui(void);
-    virtual int OnRun(void);
-    virtual int OnExit(void);
+    /* override to create top level frame, display splash screen etc. */
+    virtual bool OnInit() { return FALSE; }

     
     

-    wxWindow *GetTopWindow(void);
+    virtual int OnRun() { return MainLoop(); }
+    virtual int OnExit() { return 0; }
+
+    wxWindow *GetTopWindow();

     void SetTopWindow( wxWindow *win );
     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 void SetWantDebugOutput( bool flag ) { m_wantDebugOutput = flag; }
+    inline bool GetWantDebugOutput() { return m_wantDebugOutput; }

 
 

-    void OnIdle( wxIdleEvent &event );    
-    bool SendIdleEvents(void);
+    void OnIdle( wxIdleEvent &event );
+    bool SendIdleEvents();

     bool SendIdleEvents( wxWindow* win );
     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; }

 
 

-    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 wxString GetAppName() const 
+      { if (m_appName != "") return m_appName; else return m_className; }
+    inline void SetAppName( const wxString& name ) { m_appName = name; }

     
     

-    // 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
+    inline wxString GetClassName() const { return m_className; }
+    inline void SetClassName( const wxString& name ) { m_className = name; }

     
     

-  // GTK implementation
+    const wxString& GetVendorName() const { return m_vendorName; }
+    void SetVendorName( const wxString& name ) { m_vendorName = name; }

 
 

-    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;
+    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();
+
+    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;
+
+    wxString        m_vendorName;
+    wxString        m_appName;
+    wxString        m_className;
+

     static wxAppInitializerFunction m_appInitFn;
     
     static wxAppInitializerFunction m_appInitFn;
     

-private:
-  wxString m_vendorName,
-           m_appName,
-           m_className;
-

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };