Upport latest changes from 2_8 branch (print dialog

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index f8b359a39f27a58b02dfce21dbd122c39cbfd7ee..aa63278eebd3d18c507eba03265577534361fd3b 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -7,28 +7,22 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

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

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

 
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 

-class wxApp: public wxAppBase
+class WXDLLIMPEXP_CORE wxApp: public wxAppBase

 {
 public:
     wxApp();
 {
 public:
     wxApp();


@@ -41,56 +35,53 @@ public:
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals

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

     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual bool Yield(bool onlyIfNeeded = FALSE);

+    virtual void WakeUpIdle();

 
 

-    // implementation only from now on
-    void OnIdle( wxIdleEvent &event );
-    bool SendIdleEvents();
-    bool SendIdleEvents( wxWindow* win );
-
-    static bool Initialize();
-    static bool InitialzeVisual();
-    static void CleanUp();
-
-    bool ProcessIdle();
-    void DeletePendingObjects();
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();

 
 #ifdef __WXDEBUG__
 
 #ifdef __WXDEBUG__

-    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
-
-    bool IsInAssert() const { return m_isInAssert; }
+    virtual void OnAssertFailure(const wxChar *file,
+                                 int line,
+                                 const wxChar *func,
+                                 const wxChar *cond,
+                                 const wxChar *msg);

 #endif // __WXDEBUG__
 
 #endif // __WXDEBUG__
 

-    bool            m_initialized;
+    // GTK-specific methods
+    // -------------------
+
+    // 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; }

 
 

-    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;
+    // implementation only from now on
+    // -------------------------------
+

     // This returns the current visual: either that used by wxRootWindow
     // or the XVisualInfo* for SGI.
     GdkVisual      *GetGdkVisual();
     // 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();
+

 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__
     bool m_isInAssert;
 #endif // __WXDEBUG__
 private:
     // 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_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };
 

-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
-
-#endif // __GTKAPPH__
+#endif // _WX_GTK_APP_H_