Some further changes. Now also sets a wsUSE_WCHAR_T that's set to 0 for

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 07d586dcb81f0d0665e8bab1f3478f9aa3533bc7..38f8a5a5d7fc15a779233b4d17260e35a4c3cbe9 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -61,25 +61,27 @@ class wxApp: public wxEvtHandler
     static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
     static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }
 
     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 bool OnInitGui();

-    virtual int OnRun();
-    virtual int OnExit();
+    
+    /* 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 );
 
     wxWindow *GetTopWindow();
     void SetTopWindow( wxWindow *win );

+    

     virtual int MainLoop();
     void ExitMainLoop();
     bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
 
     virtual int MainLoop();
     void ExitMainLoop();
     bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
 

-    inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
+    inline void SetWantDebugOutput( bool flag ) { m_wantDebugOutput = flag; }

     inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
 
     void OnIdle( wxIdleEvent &event );
     inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
 
     void OnIdle( wxIdleEvent &event );


@@ -87,53 +89,60 @@ class wxApp: public wxEvtHandler
     bool SendIdleEvents( wxWindow* win );
 
     inline wxString GetAppName() const 
     bool SendIdleEvents( wxWindow* win );
 
     inline wxString GetAppName() const 

-    {
-      if (m_appName != "")
-        return m_appName;
-      else return m_className;
-    }
+      { if (m_appName != "") return m_appName; else return m_className; }
+    inline void SetAppName( const wxString& name ) { m_appName = name; }

     
     

-    inline void SetAppName(const wxString& name) { m_appName = name; };

     inline wxString GetClassName() const { return m_className; }
     inline wxString GetClassName() const { return m_className; }

-    inline void SetClassName(const wxString& name) { m_className = name; }
+    inline void SetClassName( const wxString& name ) { m_className = name; }
+    

     const wxString& GetVendorName() const { return m_vendorName; }
     const wxString& GetVendorName() const { return m_vendorName; }

-    void SetVendorName(const wxString& name) { m_vendorName = name; }
+    void SetVendorName( const wxString& name ) { m_vendorName = name; }

 
 

-    inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
+    inline void SetExitOnFrameDelete( bool flag ) { m_exitOnFrameDelete = flag; }

     inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
 
     inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
 

-    void SetPrintMode(int WXUNUSED(mode) ) {};
-    int GetPrintMode() const { return wxPRINT_POSTSCRIPT; };
+    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)
+    /* override this function to create default log target of arbitrary
+     * user-defined classv (default implementation creates a wxLogGui object) */

     virtual wxLog *CreateLogTarget();
 
     virtual wxLog *CreateLogTarget();
 

-  // GTK implementation
+  // implementation 

 
 

-    static void CommonInit();
-    static void CommonCleanUp();
+    static bool Initialize();
+    static bool InitialzeVisual();
+    static void CleanUp();

 
     bool ProcessIdle();
 
     bool ProcessIdle();

+#if wxUSE_THREADS
+    void ProcessPendingEvents();
+#endif

     void DeletePendingObjects();
 
     void DeletePendingObjects();
 

-    bool          m_initialized;
-    bool          m_exitOnFrameDelete;
-    bool          m_wantDebugOutput;
-    wxWindow     *m_topWindow;
+    /// This can be used to suppress the generation of Idle events.
+    inline void SuppressIdleEvents(bool arg = TRUE) { m_suppressIdleEvents = arg; }
+    inline bool GetSuppressIdleEvents() const { return m_suppressIdleEvents; }
+    
+    bool            m_initialized;
+    bool            m_exitOnFrameDelete;
+    bool            m_wantDebugOutput;
+    wxWindow       *m_topWindow;

     
     

-    gint          m_idleTag;
+    gint            m_idleTag;
+    unsigned char  *m_colorCube;

 
 

-    int         argc;
-    char      **argv;
+    int             argc;
+    char          **argv;

 
 

-    static wxAppInitializerFunction m_appInitFn;
-    
-private:
-  wxString m_vendorName,
-           m_appName,
-           m_className;
+    wxString        m_vendorName;
+    wxString        m_appName;
+    wxString        m_className;

 
 

+    static wxAppInitializerFunction m_appInitFn;
+ private:
+    /// Set to TRUE while we are in wxYield().
+    bool m_suppressIdleEvents;

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };