X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d4ec2a50740e7cd0d9b57113d0a9925b4c9918c..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/gtk/app.h diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h index 4b1b2e5029..f4618d5a5a 100644 --- a/include/wx/gtk/app.h +++ b/include/wx/gtk/app.h @@ -56,6 +56,13 @@ public: // must return XVisualInfo pointer (it is not freed by caller) virtual void *GetXVisualInfo() { return NULL; } + // 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(); @@ -64,10 +71,6 @@ public: // 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(); @@ -79,7 +82,7 @@ private: #if wxUSE_THREADS wxMutex m_idleMutex; #endif - guint m_idleSourceId; + unsigned m_idleSourceId; #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 HildonProgram *m_hildonProgram;