X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aae24d21a33faa2a23fccde24255365ca845c46f..55c43a7cbb4138f4f74e9b20d5b0c3b4c0c11815:/include/wx/gtk/app.h

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 07d586dcb8..e031a2ce9f 100644
--- 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$
@@ -14,9 +14,8 @@
 #pragma interface
 #endif
 
-#include "wx/defs.h"
-#include "wx/window.h"
 #include "wx/frame.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -25,116 +24,72 @@
 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
 //-----------------------------------------------------------------------------
 
-class wxApp: public wxEvtHandler
+class wxApp: public wxAppBase
 {
-  DECLARE_DYNAMIC_CLASS(wxApp)
-
-  public:
-
+public:
     wxApp();
-    ~wxApp();
+    virtual ~wxApp();
 
-    static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
-    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();
+    /* 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 int OnRun();
-    virtual int OnExit();
 
-    wxWindow *GetTopWindow();
-    void SetTopWindow( wxWindow *win );
+    // override base class (pure) virtuals
     virtual int MainLoop();
-    void ExitMainLoop();
-    bool Initialized();
+    virtual void ExitMainLoop();
+    virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
 
-    inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
-    inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
+    virtual wxIcon GetStdIcon(int which) const;
 
+    // implementation only from now on
     void OnIdle( wxIdleEvent &event );
     bool SendIdleEvents();
     bool SendIdleEvents( wxWindow* win );
 
-    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() 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() 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();
-
-  // GTK implementation
-
-    static void CommonInit();
-    static void CommonCleanUp();
+    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;
+#ifdef __WXDEBUG__
+    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
+
+    bool IsInAssert() const { return m_isInAssert; }
+#endif // __WXDEBUG__
 
-    int         argc;
-    char      **argv;
+    bool            m_initialized;
 
-    static wxAppInitializerFunction m_appInitFn;
+    gint            m_idleTag;
+#if wxUSE_THREADS
+    gint            m_wakeUpTimerTag;
+#endif
+    unsigned char  *m_colorCube;
+
+    // used by the the wxGLApp and wxGLCanvas class for GL-based X visual 
+    // selection; this is actually an XVisualInfo*
+    void           *m_glVisualInfo;
     
 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()
 };
 
+int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+
 #endif // __GTKAPPH__