X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2f3bc41106f177e3d4ab717961c1a2469abdbef..9c34a216817028bc533e07873d047208a96b05a2:/include/wx/gtk/app.h diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h index b258ea5a99..f4618d5a5a 100644 --- a/include/wx/gtk/app.h +++ b/include/wx/gtk/app.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/gtk/app.h -// Purpose: +// Purpose: wxApp definition for wxGTK // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart @@ -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 @@ -36,22 +32,20 @@ public: * (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 SetNativeTheme(const wxString& theme); virtual bool OnInitGui(); // override base class (pure) virtuals - virtual bool Yield(bool onlyIfNeeded = FALSE); virtual void WakeUpIdle(); virtual bool Initialize(int& argc, wxChar **argv); virtual void CleanUp(); -#ifdef __WXDEBUG__ virtual void OnAssertFailure(const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg); -#endif // __WXDEBUG__ // GTK-specific methods // ------------------- @@ -62,35 +56,37 @@ 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(); private: // true if we're inside an assert modal dialog -#ifdef __WXDEBUG__ bool m_isInAssert; -#endif // __WXDEBUG__ + #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) };