X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29e461a210d5d83a8fe88a9bd9dceaf8abc32816..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/gtk/window.h?ds=sidebyside diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 8155d24305..4e4185787b 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -12,12 +12,27 @@ #include "wx/dynarray.h" +#ifdef __WXGTK3__ + typedef struct _cairo cairo_t; + typedef struct _GtkStyleProvider GtkStyleProvider; + #define WXUNUSED_IN_GTK3(x) +#else + #define WXUNUSED_IN_GTK3(x) x +#endif + // helper structure that holds class that holds GtkIMContext object and // some additional data needed for key events processing struct wxGtkIMData; WX_DEFINE_EXPORTED_ARRAY_PTR(GdkWindow *, wxArrayGdkWindows); +extern "C" +{ + +typedef void (*wxGTKCallback)(); + +} + //----------------------------------------------------------------------------- // wxWindowGTK //----------------------------------------------------------------------------- @@ -45,15 +60,11 @@ public: // implement base class (pure) virtual methods // ------------------------------------------- - virtual bool Destroy(); - virtual void Raise(); virtual void Lower(); virtual bool Show( bool show = true ); - virtual void SetWindowStyleFlag( long style ); - virtual bool IsRetained() const; virtual void SetFocus(); @@ -76,6 +87,7 @@ public: virtual bool SetFont( const wxFont &font ); virtual bool SetBackgroundStyle(wxBackgroundStyle style) ; + virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const; virtual int GetCharHeight() const; virtual int GetCharWidth() const; @@ -134,12 +146,13 @@ public: // Internal addition of child windows void DoAddChild(wxWindowGTK *child); - // This methods sends wxPaintEvents to the window. It reads the - // update region, breaks it up into rects and sends an event - // for each rect. It is also responsible for background erase - // events and NC paint events. It is called from "draw" and - // "expose" handlers as well as from ::Update() - void GtkSendPaintEvents(); + // This method sends wxPaintEvents to the window. + // It is also responsible for background erase events. +#ifdef __WXGTK3__ + void GTKSendPaintEvents(cairo_t* cr); +#else + void GTKSendPaintEvents(const GdkRegion* region); +#endif // The methods below are required because many native widgets // are composed of several subwidgets and setting a style for @@ -187,6 +200,11 @@ public: void GTKHandleFocusOutNoDeferring(); static void GTKHandleDeferredFocusOut(); + // Called when m_widget becomes realized. Derived classes must call the + // base class method if they override it. + virtual void GTKHandleRealized(); + void GTKHandleUnrealize(); + protected: // for controls composed of multiple GTK widgets, return true to eliminate // spurious focus events if the focus changes between GTK+ children within @@ -237,7 +255,11 @@ public: // position and size of the window int m_x, m_y; int m_width, m_height; - int m_oldClientWidth,m_oldClientHeight; + int m_clientWidth, m_clientHeight; + // Whether the client size variables above are known to be correct + // (because they have been validated by a size-allocate) and should + // be used to report client size + bool m_useCachedClientSize; // see the docs in src/gtk/window.cpp GtkWidget *m_widget; // mostly the widget seen by the rest of GTK @@ -257,7 +279,6 @@ public: wxGtkIMData *m_imData; - // indices for the arrays below enum ScrollDir { ScrollDir_Horz, ScrollDir_Vert, ScrollDir_Max }; @@ -290,7 +311,6 @@ public: // extra (wxGTK-specific) flags bool m_noExpose:1; // wxGLCanvas has its own redrawing bool m_nativeSizeEvent:1; // wxGLCanvas sends wxSizeEvent upon "alloc_size" - bool m_hasVMT:1; // set after PostCreation() is called bool m_isScrolling:1; // dragging scrollbar thumb? bool m_clipPaintRegion:1; // true after ScrollWindow() wxRegion m_nativeUpdateRegion; // not transformed for RTL @@ -334,13 +354,19 @@ protected: void GTKFreezeWidget(GtkWidget *w); void GTKThawWidget(GtkWidget *w); + void GTKDisconnect(void* instance); #if wxUSE_TOOLTIPS virtual void DoSetToolTip( wxToolTip *tip ); #endif // wxUSE_TOOLTIPS - // common part of all ctors (not virtual because called from ctor) - void Init(); + // Create a GtkScrolledWindow containing the given widget (usually + // m_wxwindow but not necessarily) and assigns it to m_widget. Also shows + // the widget passed to it. + // + // Can be only called if we have either wxHSCROLL or wxVSCROLL in our + // style. + void GTKCreateScrolledWindowWith(GtkWidget* view); virtual void DoMoveInTabOrder(wxWindow *win, WindowOrder move); virtual bool DoNavigateIn(int flags); @@ -349,20 +375,21 @@ protected: // Copies m_children tab order to GTK focus chain: void RealizeTabOrder(); +#ifndef __WXGTK3__ // Called by ApplyWidgetStyle (which is called by SetFont() and // SetXXXColour etc to apply style changed to native widgets) to create - // modified GTK style with non-standard attributes. If forceStyle=true, - // creates empty GtkRcStyle if there are no modifications, otherwise - // returns NULL in such case. - GtkRcStyle *GTKCreateWidgetStyle(bool forceStyle = false); + // modified GTK style with non-standard attributes. + GtkRcStyle* GTKCreateWidgetStyle(); +#endif - // Overridden in many GTK widgets who have to handle subwidgets - virtual void GTKApplyWidgetStyle(bool forceStyle = false); + void GTKApplyWidgetStyle(bool forceStyle = false); // helper function to ease native widgets wrapping, called by // ApplyWidgetStyle -- override this, not ApplyWidgetStyle virtual void DoApplyWidgetStyle(GtkRcStyle *style); + void GTKApplyStyle(GtkWidget* widget, GtkRcStyle* style); + // sets the border of a given GtkScrolledWindow from a wx style static void GTKScrolledWindowSetBorder(GtkWidget* w, int style); @@ -370,16 +397,13 @@ protected: // // This is just a wrapper for g_signal_connect() and returns the handler id // just as it does. - unsigned long GTKConnectWidget(const char *signal, void (*callback)()); - - // Return true from here if PostCreation() should connect to size_request - // signal: this is done by default but doesn't work for some native - // controls which override this function to return false - virtual bool GTKShouldConnectSizeRequest() const { return !IsTopLevel(); } + unsigned long GTKConnectWidget(const char *signal, wxGTKCallback callback); void ConstrainSize(); private: + void Init(); + enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max }; // common part of ScrollLines() and ScrollPages() and could be used, in the @@ -390,6 +414,18 @@ private: bool DoScrollByUnits(ScrollDir dir, ScrollUnit unit, int units); virtual void AddChildGTK(wxWindowGTK* child); +#ifdef __WXGTK3__ + // paint context is stashed here so wxPaintDC can use it + cairo_t* m_paintContext; + // style provider for "background-image" + GtkStyleProvider* m_styleProvider; + +public: + cairo_t* GTKPaintContext() const + { + return m_paintContext; + } +#endif DECLARE_DYNAMIC_CLASS(wxWindowGTK) wxDECLARE_NO_COPY_CLASS(wxWindowGTK);