X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d3a930e82ed6eb40e8ddce64997a8a017f4f49d..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/gtk/dvrenderers.h diff --git a/include/wx/gtk/dvrenderers.h b/include/wx/gtk/dvrenderers.h index 785d7f9a2b..b9119a9533 100644 --- a/include/wx/gtk/dvrenderers.h +++ b/include/wx/gtk/dvrenderers.h @@ -12,7 +12,12 @@ #ifndef _WX_GTK_DVRENDERERS_H_ #define _WX_GTK_DVRENDERERS_H_ -typedef struct _GdkRectangle GdkRectangle; +#ifdef __WXGTK3__ + typedef struct _cairo_rectangle_int cairo_rectangle_int_t; + typedef cairo_rectangle_int_t GdkRectangle; +#else + typedef struct _GdkRectangle GdkRectangle; +#endif // --------------------------------------------------------- // wxDataViewTextRenderer @@ -117,18 +122,12 @@ public: wxDC *dc, int state); + struct GTKRenderParams; + // store GTK render call parameters for possible later use - void GTKStashRenderParams(GdkWindow *window, - GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *expose_area, - int flags) + void GTKSetRenderParams(GTKRenderParams* renderParams) { - m_renderParams.window = window; - m_renderParams.widget = widget; - m_renderParams.background_area = background_area; - m_renderParams.expose_area = expose_area; - m_renderParams.flags = flags; + m_renderParams = renderParams; } // we may or not support attributes, as we don't know it, return true to @@ -143,10 +142,9 @@ public: virtual GtkCellRendererText *GtkGetTextRenderer() const; -protected: +private: bool Init(wxDataViewCellMode mode, int align); -private: // Called from GtkGetTextRenderer() to really create the renderer if // necessary. void GtkInitTextRenderer(); @@ -157,14 +155,7 @@ private: // parameters of the original render() call stored so that we could pass // them forward to m_text_renderer if our RenderText() is called - struct GTKRenderParams - { - GdkWindow *window; - GtkWidget *widget; - GdkRectangle *background_area; - GdkRectangle *expose_area; - int flags; - } m_renderParams; + GTKRenderParams* m_renderParams; DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer) };