bracket unused function

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

diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h
index 6a1bdc9ad008fd9b4c726c363c70748b0781deba..a25fec93d0c74d0562535533931fb067afdc5c61 100644 (file)
--- a/include/wx/dvrenderers.h
+++ b/include/wx/dvrenderers.h
@@ -116,8 +116,14 @@ public:
 
     virtual void SetAttr(const wxDataViewItemAttr& WXUNUSED(attr)) { }
 
 
     virtual void SetAttr(const wxDataViewItemAttr& WXUNUSED(attr)) { }
 

+    virtual void SetEnabled(bool WXUNUSED(enabled)) { }
+

     wxString GetVariantType() const             { return m_variantType; }
 
     wxString GetVariantType() const             { return m_variantType; }
 

+    // helper that calls SetValue and SetAttr:
+    void PrepareForItem(const wxDataViewModel *model,
+                        const wxDataViewItem& item, unsigned column);
+

     // renderer properties:
     virtual void SetMode( wxDataViewCellMode mode ) = 0;
     virtual wxDataViewCellMode GetMode() const = 0;
     // renderer properties:
     virtual void SetMode( wxDataViewCellMode mode ) = 0;
     virtual wxDataViewCellMode GetMode() const = 0;


@@ -153,6 +159,9 @@ public:
 
     wxControl *GetEditorCtrl() { return m_editorCtrl; }
 
 
     wxControl *GetEditorCtrl() { return m_editorCtrl; }
 

+    virtual bool IsCustomRenderer() const { return false; }
+
+

 protected:
     // Called from {Cancel,Finish}Editing() to cleanup m_editorCtrl
     void DestroyEditControl();
 protected:
     // Called from {Cancel,Finish}Editing() to cleanup m_editorCtrl
     void DestroyEditControl();


@@ -221,21 +230,21 @@ public:
     // to drag it: by default they all simply return false indicating that the
     // events are not handled
 
     // to drag it: by default they all simply return false indicating that the
     // events are not handled
 

-    virtual bool Activate(wxRect WXUNUSED(cell),
+    virtual bool Activate(const wxRect& WXUNUSED(cell),

                           wxDataViewModel *WXUNUSED(model),
                           const wxDataViewItem & WXUNUSED(item),
                           unsigned int WXUNUSED(col))
         { return false; }
 
                           wxDataViewModel *WXUNUSED(model),
                           const wxDataViewItem & WXUNUSED(item),
                           unsigned int WXUNUSED(col))
         { return false; }
 

-    virtual bool LeftClick(wxPoint WXUNUSED(cursor),
-                           wxRect WXUNUSED(cell),
+    virtual bool LeftClick(const wxPoint& WXUNUSED(cursor),
+                           const wxRect& WXUNUSED(cell),

                            wxDataViewModel *WXUNUSED(model),
                            const wxDataViewItem & WXUNUSED(item),
                            unsigned int WXUNUSED(col) )
         { return false; }
 
                            wxDataViewModel *WXUNUSED(model),
                            const wxDataViewItem & WXUNUSED(item),
                            unsigned int WXUNUSED(col) )
         { return false; }
 

-    virtual bool StartDrag(wxPoint WXUNUSED(cursor),
-                           wxRect WXUNUSED(cell),
+    virtual bool StartDrag(const wxPoint& WXUNUSED(cursor),
+                           const wxRect& WXUNUSED(cell),

                            wxDataViewModel *WXUNUSED(model),
                            const wxDataViewItem & WXUNUSED(item),
                            unsigned int WXUNUSED(col) )
                            wxDataViewModel *WXUNUSED(model),
                            const wxDataViewItem & WXUNUSED(item),
                            unsigned int WXUNUSED(col) )


@@ -257,6 +266,11 @@ public:
     virtual void SetAttr(const wxDataViewItemAttr& attr) { m_attr = attr; }
     const wxDataViewItemAttr& GetAttr() const { return m_attr; }
 
     virtual void SetAttr(const wxDataViewItemAttr& attr) { m_attr = attr; }
     const wxDataViewItemAttr& GetAttr() const { return m_attr; }
 

+    // Store the enabled state of the item so that it can be accessed from
+    // Render() via GetEnabled() if needed.
+    virtual void SetEnabled(bool enabled) { m_enabled = enabled; }
+    bool GetEnabled() const { return m_enabled; }
+

 
     // Implementation only from now on
 
 
     // Implementation only from now on
 


@@ -267,8 +281,15 @@ public:
     // Prepare DC to use attributes and call Render().
     void WXCallRender(wxRect rect, wxDC *dc, int state);
 
     // Prepare DC to use attributes and call Render().
     void WXCallRender(wxRect rect, wxDC *dc, int state);
 

+    virtual bool IsCustomRenderer() const { return true; }
+
+protected:
+    // helper for GetSize() implementations, respects attributes
+    wxSize GetTextExtent(const wxString& str) const;
+

 private:
     wxDataViewItemAttr m_attr;
 private:
     wxDataViewItemAttr m_attr;

+    bool m_enabled;

 
     wxDECLARE_NO_COPY_CLASS(wxDataViewCustomRendererBase);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxDataViewCustomRendererBase);
 };


@@ -341,40 +362,27 @@ private:
     wxString      m_data;
 };
 
     wxString      m_data;
 };
 

-#endif // generic or Carbon versions
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxDataViewChoiceRendererByIndex
+// wxDataViewChoiceByIndexRenderer

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_ADV wxDataViewChoiceRendererByIndex: public wxDataViewChoiceRenderer
+class WXDLLIMPEXP_ADV wxDataViewChoiceByIndexRenderer: public wxDataViewChoiceRenderer

 {
 public:
 {
 public:

-    wxDataViewChoiceRendererByIndex( const wxArrayString &choices,
+    wxDataViewChoiceByIndexRenderer( const wxArrayString &choices,

                               wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,

-                              int alignment = wxDVR_DEFAULT_ALIGNMENT ) :
-      wxDataViewChoiceRenderer( choices, mode, alignment )
-    {
-    }
-                            
-    virtual bool SetValue( const wxVariant &value )
-    {
-        wxVariant string_value = GetChoice( value.GetLong() );
-        return wxDataViewChoiceRenderer::SetValue( string_value );
-    }
-    
-    virtual bool GetValue( wxVariant &value ) const
-    {
-        wxVariant string_value;
-        if (!wxDataViewChoiceRenderer::GetValue( string_value ))
-            return false;
-            
-        value = (long) GetChoices().Index( string_value.GetString() );
-        return true;
-    }
+                              int alignment = wxDVR_DEFAULT_ALIGNMENT );
+
+    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
+    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
+
+    virtual bool SetValue( const wxVariant &value );
+    virtual bool GetValue( wxVariant &value ) const;

 };
 
 
 };
 
 

+#endif // generic or Carbon versions
+

 // this class is obsolete, its functionality was merged in
 // wxDataViewTextRenderer itself now, don't use it any more
 #define wxDataViewTextRendererAttr wxDataViewTextRenderer
 // this class is obsolete, its functionality was merged in
 // wxDataViewTextRenderer itself now, don't use it any more
 #define wxDataViewTextRendererAttr wxDataViewTextRenderer