Disconnect "hide" menu signal to fix menu destruction in wxGTK.

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

diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h
index 6a1bdc9ad008fd9b4c726c363c70748b0781deba..1be414ffb760ddfef238b44e936f4f2f01a445a1 100644 (file)
--- a/include/wx/dvrenderers.h
+++ b/include/wx/dvrenderers.h
@@ -118,6 +118,10 @@ public:
 
     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;
@@ -267,6 +271,10 @@ public:
     // Prepare DC to use attributes and call Render().
     void WXCallRender(wxRect rect, wxDC *dc, int state);
 
+protected:
+    // helper for GetSize() implementations, respects attributes
+    wxSize GetTextExtent(const wxString& str) const;
+
 private:
     wxDataViewItemAttr m_attr;
 
@@ -341,40 +349,27 @@ private:
     wxString      m_data;
 };
 
-#endif // generic or Carbon versions
-
 // ----------------------------------------------------------------------------
-// wxDataViewChoiceRendererByIndex
+// wxDataViewChoiceByIndexRenderer
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxDataViewChoiceRendererByIndex: public wxDataViewChoiceRenderer
+class WXDLLIMPEXP_ADV wxDataViewChoiceByIndexRenderer: public wxDataViewChoiceRenderer
 {
 public:
-    wxDataViewChoiceRendererByIndex( const wxArrayString &choices,
+    wxDataViewChoiceByIndexRenderer( const wxArrayString &choices,
                               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