Removed unused variable.

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index c69720797268ed6985dc59839469ed63a94fcde9..3fb0e93c8ae191f9a78cc924676116449dab1b56 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.h
+// Name:        wx/gtk/app.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,13 +10,12 @@
 #ifndef __GTKAPPH__
 #define __GTKAPPH__
 
 #ifndef __GTKAPPH__
 #define __GTKAPPH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-#include "wx/window.h"

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

+#include "wx/icon.h"

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


@@ -25,109 +24,58 @@
 class wxApp;
 class wxLog;
 
 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
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 

-class wxApp: public wxEvtHandler
+class wxApp: public wxAppBase

 {
 {

-  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 int OnExit(void);
+public:
+    wxApp();
+    virtual ~wxApp();

 
 

-    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);
+    /* 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();

 
 

-    inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
-    inline bool GetWantDebugOutput(void) { return m_wantDebugOutput; }
+    // override base class (pure) virtuals
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual void WakeUpIdle();

 
 

-    void OnIdle( wxIdleEvent &event );
-    bool SendIdleEvents(void);
-    bool SendIdleEvents( wxWindow* win );
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();

 
 

-    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; }
+    static bool InitialzeVisual();

 
 

-    inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
-    inline bool GetExitOnFrameDelete(void) const { return m_exitOnFrameDelete; }
+#ifdef __WXDEBUG__
+    virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg);

 
 

-    void SetPrintMode(int WXUNUSED(mode) ) {};
-    int GetPrintMode(void) const { return wxPRINT_POSTSCRIPT; };
+    bool IsInAssert() const { return m_isInAssert; }
+#endif // __WXDEBUG__

 
 

-    // override this function to create default log target of arbitrary
-    // user-defined classv (default implementation creates a wxLogGui object)
-    virtual wxLog *CreateLogTarget();
-
-  // 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;
+    gint            m_idleTag;
+#if wxUSE_THREADS
+    gint            m_wakeUpTimerTag;
+#endif
+    unsigned char  *m_colorCube;

 
 

-    int         argc;
-    char      **argv;
+    // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
+    // selection; this is actually an XVisualInfo*
+    void           *m_glVisualInfo;
+    // This returns the current visual: either that used by wxRootWindow
+    // or the XVisualInfo* for SGI.
+    GdkVisual      *GetGdkVisual();

 
 

-    static wxAppInitializerFunction m_appInitFn;
-    

 private:
 private:

-  wxString m_vendorName,
-           m_appName,
-           m_className;
+    // true if we're inside an assert modal dialog
+#ifdef __WXDEBUG__
+    bool m_isInAssert;
+#endif // __WXDEBUG__

 
 

-  DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxApp)
+    DECLARE_EVENT_TABLE()

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