Last part from weak ref patch for event sink disconnection

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index ed87ea537b04933cd19c52590f61fc95ee8f1216..b258ea5a9969000994fc50ed33a4d33180ca778b 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -7,19 +7,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKAPPH__
-#define __GTKAPPH__
-
-#include "wx/frame.h"
-#include "wx/icon.h"
-#include "wx/strconv.h"
+#ifndef _WX_GTK_APP_H_
+#define _WX_GTK_APP_H_

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

-class WXDLLIMPEXP_CORE wxApp;
-class WXDLLIMPEXP_BASE wxLog;
+#if wxUSE_THREADS
+class WXDLLIMPEXP_FWD_BASE wxMutex;
+#endif
+
+#if wxUSE_LIBHILDON
+typedef struct _HildonProgram HildonProgram;
+#endif // wxUSE_LIBHILDON

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


@@ -44,33 +45,54 @@ public:
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
 
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
 

-    static bool InitialzeVisual();
-

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

-    virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, 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__
 

-    gint            m_idleTag;
-    void RemoveIdleTag();
+    // 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; }
+
+#if wxUSE_LIBHILDON
+    // Maemo-specific method: get the main program object
+    HildonProgram *GetHildonProgram() const { return m_hildonProgram; }
+#endif // wxUSE_LIBHILDON
+
+    // implementation only from now on
+    // -------------------------------

 
 

-    // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
-    // selection.
-    void           *m_glVisualInfo; // this is actually an XVisualInfo*
-    void           *m_glFBCInfo; // this is actually an GLXFBConfig*

     // 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;
+
+#if wxUSE_LIBHILDON
+    HildonProgram *m_hildonProgram;
+#endif // wxUSE_LIBHILDON

 
     DECLARE_DYNAMIC_CLASS(wxApp)
 
     DECLARE_DYNAMIC_CLASS(wxApp)

-    DECLARE_EVENT_TABLE()

 };
 
 };
 

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