Some code renaming to avoid confusion. Test editable column in sample.

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 7aa85525866f3413cae6458de8251e8620a6d903..d9a34eee80aa9c1b5d8aca18584e18316b205436 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$


@@ -7,137 +7,80 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKAPPH__
-#define __GTKAPPH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/window.h"
-#include "wx/frame.h"
+#ifndef _WX_GTK_APP_H_
+#define _WX_GTK_APP_H_

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

-class wxApp;
-class wxLog;
+#if wxUSE_THREADS
+class WXDLLIMPEXP_FWD_BASE wxMutex;
+#endif

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// global data
+// wxApp

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-extern wxApp *wxTheApp;
+class WXDLLIMPEXP_CORE wxApp: public wxAppBase
+{
+public:
+    wxApp();
+    virtual ~wxApp();

 
 

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

 
 

-void wxExit(void);
-bool wxYield(void);
+    // override base class (pure) virtuals
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual void WakeUpIdle();

 
 

-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();

 
 

-#define wxPRINT_WINDOWS         1
-#define wxPRINT_POSTSCRIPT      2
+#ifdef __WXDEBUG__
+    virtual void OnAssertFailure(const wxChar *file,
+                                 int line,
+                                 const wxChar *func,
+                                 const wxChar *cond,
+                                 const wxChar *msg);
+#endif // __WXDEBUG__

 
 

-//-----------------------------------------------------------------------------
-// wxApp
-//-----------------------------------------------------------------------------
+    // GTK-specific methods
+    // -------------------

 
 

-class wxApp: public wxEvtHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxApp)
+    // this can be overridden to return a specific visual to be used for GTK+
+    // instead of the default one (it's used by wxGLApp)
+    //
+    // must return XVisualInfo pointer (it is not freed by caller)
+    virtual void *GetXVisualInfo() { return NULL; }

 
 

-  public:

 
 

-    wxApp();
-    ~wxApp();
+    // implementation only from now on
+    // -------------------------------

 
 

-    static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
-    static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }
+    // This returns the current visual: either that used by wxRootWindow
+    // or the XVisualInfo* for SGI.
+    GdkVisual      *GetGdkVisual();
+
+    // check for pending events, without interference from our idle source
+    bool EventsPending();
+    bool DoIdle();

 
 

-    /* 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();
-    
-    /* override to create top level frame, display splash screen etc. */
-    virtual bool OnInit() { return FALSE; }
-    
-    virtual int OnRun() { return MainLoop(); }
-    virtual int OnExit() { return 0; }
-
-    wxWindow *GetTopWindow();
-    void SetTopWindow( wxWindow *win );
-    virtual int MainLoop();
-    void ExitMainLoop();
-    bool Initialized();
-    virtual bool Pending();
-    virtual void Dispatch();
-
-    inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
-    inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
-
-    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 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;
-
-    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__
+#if wxUSE_THREADS
+    wxMutex* m_idleMutex;
+#endif
+    guint m_idleSourceId;

 
 

-  DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxApp)

 };
 
 };
 

-#endif // __GTKAPPH__
+#endif // _WX_GTK_APP_H_