activating DrawRectangle optimization

[wxWidgets.git] / include / wx / gtk / dvrenderers.h

diff --git a/include/wx/gtk/dvrenderers.h b/include/wx/gtk/dvrenderers.h
index 667de363b9a583b34e70f4d2147f35ee921116ef..b9119a9533c72a9f668ead41d50ad12c8dec2ab4 100644 (file)
--- a/include/wx/gtk/dvrenderers.h
+++ b/include/wx/gtk/dvrenderers.h
@@ -3,7 +3,7 @@
 // Purpose:     All GTK wxDataViewCtrl renderer classes
 // Author:      Robert Roebling, Vadim Zeitlin
 // Created:     2009-11-07 (extracted from wx/gtk/dataview.h)
 // Purpose:     All GTK wxDataViewCtrl renderer classes
 // Author:      Robert Roebling, Vadim Zeitlin
 // Created:     2009-11-07 (extracted from wx/gtk/dataview.h)

-// RCS-ID:      $Id: wxhead.h,v 1.11 2009-06-29 10:23:04 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2006 Robert Roebling
 //              (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 // Copyright:   (c) 2006 Robert Roebling
 //              (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence


@@ -12,6 +12,13 @@
 #ifndef _WX_GTK_DVRENDERERS_H_
 #define _WX_GTK_DVRENDERERS_H_
 
 #ifndef _WX_GTK_DVRENDERERS_H_
 #define _WX_GTK_DVRENDERERS_H_
 

+#ifdef __WXGTK3__
+    typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
+    typedef cairo_rectangle_int_t GdkRectangle;
+#else
+    typedef struct _GdkRectangle GdkRectangle;
+#endif
+

 // ---------------------------------------------------------
 // wxDataViewTextRenderer
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
 // ---------------------------------------------------------


@@ -41,6 +48,11 @@ public:
 
     virtual void SetAlignment( int align );
 
 
     virtual void SetAlignment( int align );
 

+    virtual bool GtkSupportsAttrs() const { return true; }
+    virtual bool GtkSetAttr(const wxDataViewItemAttr& attr);
+
+    virtual GtkCellRendererText *GtkGetTextRenderer() const;
+

 protected:
     // implementation of Set/GetValue()
     bool SetTextValue(const wxString& str);
 protected:
     // implementation of Set/GetValue()
     bool SetTextValue(const wxString& str);


@@ -100,34 +112,51 @@ public:
     virtual ~wxDataViewCustomRenderer();
 
 
     virtual ~wxDataViewCustomRenderer();
 
 

-    virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
+    // Create DC on request
+    virtual wxDC *GetDC();

 
 

-    void RenderText( const wxString &text, int xoffset,  wxRect cell, wxDC *dc, int state );
+    // override the base class function to use GTK text cell renderer
+    virtual void RenderText(const wxString& text,
+                            int xoffset,
+                            wxRect cell,
+                            wxDC *dc,
+                            int state);

 
 

-    virtual wxSize GetSize() const = 0;
+    struct GTKRenderParams;

 
 

-    // Create DC on request
-    virtual wxDC *GetDC();
+    // store GTK render call parameters for possible later use
+    void GTKSetRenderParams(GTKRenderParams* renderParams)
+    {
+        m_renderParams = renderParams;
+    }

 
 

+    // we may or not support attributes, as we don't know it, return true to
+    // make it possible to use them
+    virtual bool GtkSupportsAttrs() const { return true; }

 
 

-protected:
+    virtual bool GtkSetAttr(const wxDataViewItemAttr& attr)
+    {
+        SetAttr(attr);
+        return !attr.IsDefault();
+    }

 
 

-    bool Init(wxDataViewCellMode mode, int align);
+    virtual GtkCellRendererText *GtkGetTextRenderer() const;

 
 private:
 
 private:

+    bool Init(wxDataViewCellMode mode, int align);
+
+    // Called from GtkGetTextRenderer() to really create the renderer if
+    // necessary.
+    void GtkInitTextRenderer();
+

     wxDC        *m_dc;
 
     wxDC        *m_dc;
 

-public:
-    // Internal, temporary for RenderText.
-    GtkCellRenderer      *m_text_renderer;
-    GdkWindow            *window;
-    GtkWidget            *widget;
-    void                 *background_area;
-    void                 *cell_area;
-    void                 *expose_area;
-    int                   flags;
+    GtkCellRendererText      *m_text_renderer;
+
+    // parameters of the original render() call stored so that we could pass
+    // them forward to m_text_renderer if our RenderText() is called
+    GTKRenderParams* m_renderParams;

 
 

-protected:

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
 };
 


@@ -151,9 +180,17 @@ public:
     virtual wxSize GetSize() const;
 
 private:
     virtual wxSize GetSize() const;
 
 private:

+    void GTKSetLabel();
+

     wxString    m_label;
     int         m_value;
 
     wxString    m_label;
     int         m_value;
 

+#if !wxUSE_UNICODE
+    // Flag used to indicate that we need to set the label because we were
+    // unable to do it in the ctor (see comments there).
+    bool m_needsToSetLabel;
+#endif // !wxUSE_UNICODE
+

 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
 };
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
 };


@@ -189,34 +226,6 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
 };
 

-// ---------------------------------------------------------
-// wxDataViewDateRenderer
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer
-{
-public:
-    wxDataViewDateRenderer( const wxString &varianttype = "datetime",
-                            wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
-                            int align = wxDVR_DEFAULT_ALIGNMENT );
-
-    bool SetValue( const wxVariant &value );
-    bool GetValue( wxVariant &value ) const;
-
-    virtual bool Render( wxRect cell, wxDC *dc, int state );
-    virtual wxSize GetSize() const;
-    virtual bool Activate( wxRect cell,
-                           wxDataViewModel *model,
-                           const wxDataViewItem &item,
-                           unsigned int col );
-
-private:
-    wxDateTime    m_date;
-
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)
-};
-

 // -------------------------------------
 // wxDataViewChoiceRenderer
 // -------------------------------------
 // -------------------------------------
 // wxDataViewChoiceRenderer
 // -------------------------------------


@@ -234,10 +243,33 @@ public:
 
     void SetAlignment( int align );
 
 
     void SetAlignment( int align );
 

+    wxString GetChoice(size_t index) const { return m_choices[index]; }
+    const wxArrayString& GetChoices() const { return m_choices; }
+

 private:
     wxArrayString m_choices;
     wxString      m_data;
 };
 
 private:
     wxArrayString m_choices;
     wxString      m_data;
 };
 

+// ----------------------------------------------------------------------------
+// wxDataViewChoiceByIndexRenderer
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewChoiceByIndexRenderer: public wxDataViewChoiceRenderer
+{
+public:
+    wxDataViewChoiceByIndexRenderer( const wxArrayString &choices,
+                              wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
+                              int alignment = wxDVR_DEFAULT_ALIGNMENT );
+
+    virtual bool SetValue( const wxVariant &value );
+    virtual bool GetValue( wxVariant &value ) const;
+
+private:
+    virtual void GtkOnTextEdited(const char *itempath, const wxString& str);
+};
+
+
+

 #endif // _WX_GTK_DVRENDERERS_H_
 
 #endif // _WX_GTK_DVRENDERERS_H_