X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/657a8a359826e46a7fc458216403f54deca34989..4ed85025f3ba537206f70f3dd10466e16da926d4:/include/wx/gtk/app.h?ds=inline diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h index 0ded824a5f..f4618d5a5a 100644 --- a/include/wx/gtk/app.h +++ b/include/wx/gtk/app.h @@ -14,13 +14,9 @@ // classes //----------------------------------------------------------------------------- -#if wxUSE_THREADS -class WXDLLIMPEXP_FWD_BASE wxMutex; -#endif - -#if wxUSE_LIBHILDON +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 typedef struct _HildonProgram HildonProgram; -#endif // wxUSE_LIBHILDON +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 //----------------------------------------------------------------------------- // wxApp @@ -60,18 +56,21 @@ public: // must return XVisualInfo pointer (it is not freed by caller) virtual void *GetXVisualInfo() { return NULL; } -#if wxUSE_LIBHILDON + // Check if we're using a global menu. Currently this is only true when + // running under Ubuntu Unity and global menu is not disabled. + // + // This is mostly used in the implementation in order to work around + // various bugs arising due to this. + static bool GTKIsUsingGlobalMenu(); + +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 // Maemo-specific method: get the main program object - HildonProgram *GetHildonProgram() const { return m_hildonProgram; } -#endif // wxUSE_LIBHILDON + HildonProgram *GetHildonProgram(); +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 // implementation only from now on // ------------------------------- - // 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(); @@ -81,13 +80,13 @@ private: bool m_isInAssert; #if wxUSE_THREADS - wxMutex* m_idleMutex; + wxMutex m_idleMutex; #endif - guint m_idleSourceId; + unsigned m_idleSourceId; -#if wxUSE_LIBHILDON +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 HildonProgram *m_hildonProgram; -#endif // wxUSE_LIBHILDON +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 DECLARE_DYNAMIC_CLASS(wxApp) };