Return wxWindow* from wxDataViewCustomRenderer::CreateEditorCtrl().

There's no reason to limit custom editor controls to wxControl, which
would rule out e.g. composite controls or any custom widgets.
Make appropriate changes to related functions and code too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h
old mode 100644 (file)
new mode 100755 (executable)
index a25fec9..ca89147
--- a/include/wx/dvrenderers.h
+++ b/include/wx/dvrenderers.h
@@ -145,11 +145,11 @@ public:
     // in-place editing
     virtual bool HasEditorCtrl() const
         { return false; }
     // in-place editing
     virtual bool HasEditorCtrl() const
         { return false; }

-    virtual wxControl* CreateEditorCtrl(wxWindow * WXUNUSED(parent),
-                                        wxRect WXUNUSED(labelRect),
-                                        const wxVariant& WXUNUSED(value))
+    virtual wxWindow* CreateEditorCtrl(wxWindow * WXUNUSED(parent),
+                                       wxRect WXUNUSED(labelRect),
+                                       const wxVariant& WXUNUSED(value))

         { return NULL; }
         { return NULL; }

-    virtual bool GetValueFromEditorCtrl(wxControl * WXUNUSED(editor),
+    virtual bool GetValueFromEditorCtrl(wxWindow * WXUNUSED(editor),

                                         wxVariant& WXUNUSED(value))
         { return false; }
 
                                         wxVariant& WXUNUSED(value))
         { return false; }
 


@@ -157,7 +157,7 @@ public:
     virtual void CancelEditing();
     virtual bool FinishEditing();
 
     virtual void CancelEditing();
     virtual bool FinishEditing();
 

-    wxControl *GetEditorCtrl() { return m_editorCtrl; }
+    wxWindow *GetEditorCtrl() { return m_editorCtrl; }

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


@@ -168,7 +168,7 @@ protected:
 
     wxString                m_variantType;
     wxDataViewColumn       *m_owner;
 
     wxString                m_variantType;
     wxDataViewColumn       *m_owner;

-    wxWeakRef<wxControl>    m_editorCtrl;
+    wxWeakRef<wxWindow>     m_editorCtrl;

     wxDataViewItem          m_item; // for m_editorCtrl
 
     // internal utility:
     wxDataViewItem          m_item; // for m_editorCtrl
 
     // internal utility:


@@ -322,8 +322,8 @@ public:
                             wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
                             int alignment = wxDVR_DEFAULT_ALIGNMENT );
     virtual bool HasEditorCtrl() const { return true; }
                             wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
                             int alignment = wxDVR_DEFAULT_ALIGNMENT );
     virtual bool HasEditorCtrl() const { return true; }

-    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
-    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
+    virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
+    virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value );

     virtual bool Render( wxRect rect, wxDC *dc, int state );
     virtual wxSize GetSize() const;
     virtual bool SetValue( const wxVariant &value );
     virtual bool Render( wxRect rect, wxDC *dc, int state );
     virtual wxSize GetSize() const;
     virtual bool SetValue( const wxVariant &value );


@@ -347,8 +347,8 @@ public:
                             wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
                             int alignment = wxDVR_DEFAULT_ALIGNMENT );
     virtual bool HasEditorCtrl() const { return true; }
                             wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
                             int alignment = wxDVR_DEFAULT_ALIGNMENT );
     virtual bool HasEditorCtrl() const { return true; }

-    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
-    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
+    virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
+    virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value );

     virtual bool Render( wxRect rect, wxDC *dc, int state );
     virtual wxSize GetSize() const;
     virtual bool SetValue( const wxVariant &value );
     virtual bool Render( wxRect rect, wxDC *dc, int state );
     virtual wxSize GetSize() const;
     virtual bool SetValue( const wxVariant &value );


@@ -373,8 +373,8 @@ public:
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
                               int alignment = wxDVR_DEFAULT_ALIGNMENT );
 
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
                               int alignment = wxDVR_DEFAULT_ALIGNMENT );
 

-    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
-    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
+    virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
+    virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value );

 
     virtual bool SetValue( const wxVariant &value );
     virtual bool GetValue( wxVariant &value ) const;
 
     virtual bool SetValue( const wxVariant &value );
     virtual bool GetValue( wxVariant &value ) const;

diff --git a/include/wx/generic/dvrenderers.h b/include/wx/generic/dvrenderers.h
index f9ae4142027161d50ffa351a2d5a3a8b9f66f4c0..fe71dc45f6b71843504cf2cf29d226b3542fecf4 100644 (file)
--- a/include/wx/generic/dvrenderers.h
+++ b/include/wx/generic/dvrenderers.h
@@ -67,9 +67,9 @@ public:
 
     // in-place editing
     virtual bool HasEditorCtrl() const;
 
     // in-place editing
     virtual bool HasEditorCtrl() const;

-    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect,
-                                         const wxVariant &value );
-    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
+    virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect,
+                                        const wxVariant &value );
+    virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value );

 
 protected:
     wxString   m_text;
 
 protected:
     wxString   m_text;


@@ -177,9 +177,9 @@ public:
     virtual wxSize GetSize() const;
 
     virtual bool HasEditorCtrl() const { return true; }
     virtual wxSize GetSize() const;
 
     virtual bool HasEditorCtrl() const { return true; }

-    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect,
-                                         const wxVariant &value );
-    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
+    virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect,
+                                        const wxVariant &value );
+    virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value );

 
 private:
     wxDataViewIconText   m_value;
 
 private:
     wxDataViewIconText   m_value;

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index f41d5e0a504a22094c8f31da20ce46f663b7851d..aebeef76e309a9554fe4f906a37357302a542877 100644 (file)
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -1590,9 +1590,9 @@ public:
         }
         @endcode
     */
         }
         @endcode
     */

-    virtual wxControl* CreateEditorCtrl(wxWindow* parent,
-                                        wxRect labelRect,
-                                        const wxVariant& value);
+    virtual wxWindow* CreateEditorCtrl(wxWindow* parent,
+                                       wxRect labelRect,
+                                       const wxVariant& value);

 
     /**
         Return the attribute to be used for rendering.
 
     /**
         Return the attribute to be used for rendering.


@@ -1627,7 +1627,7 @@ public:
         }
         @endcode
     */
         }
         @endcode
     */

-    virtual bool GetValueFromEditorCtrl(wxControl* editor,
+    virtual bool GetValueFromEditorCtrl(wxWindow* editor,

                                         wxVariant& value);
 
     /**
                                         wxVariant& value);
 
     /**

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 99dda0c..fa3d356
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -40,7 +40,7 @@ namespace
 class wxDataViewEditorCtrlEvtHandler: public wxEvtHandler
 {
 public:
 class wxDataViewEditorCtrlEvtHandler: public wxEvtHandler
 {
 public:

-    wxDataViewEditorCtrlEvtHandler(wxControl *editor, wxDataViewRenderer *owner)
+    wxDataViewEditorCtrlEvtHandler(wxWindow *editor, wxDataViewRenderer *owner)

     {
         m_editorCtrl = editor;
         m_owner = owner;
     {
         m_editorCtrl = editor;
         m_owner = owner;


@@ -59,7 +59,7 @@ protected:
 
 private:
     wxDataViewRenderer     *m_owner;
 
 private:
     wxDataViewRenderer     *m_owner;

-    wxControl              *m_editorCtrl;
+    wxWindow               *m_editorCtrl;

     bool                    m_finished;
     bool                    m_focusOnIdle;
 
     bool                    m_finished;
     bool                    m_focusOnIdle;
 


@@ -1417,7 +1417,7 @@ wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCell
     m_max = max;
 }
 
     m_max = max;
 }
 

-wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+wxWindow* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )

 {
     long l = value;
     wxSize size = labelRect.GetSize();
 {
     long l = value;
     wxSize size = labelRect.GetSize();


@@ -1437,7 +1437,7 @@ wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect la
     return sc;
 }
 
     return sc;
 }
 

-bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value )

 {
     wxSpinCtrl *sc = (wxSpinCtrl*) editor;
     long l = sc->GetValue();
 {
     wxSpinCtrl *sc = (wxSpinCtrl*) editor;
     long l = sc->GetValue();


@@ -1482,7 +1482,7 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString& choices
     m_choices = choices;
 }
 
     m_choices = choices;
 }
 

-wxControl* wxDataViewChoiceRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+wxWindow* wxDataViewChoiceRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )

 {
     wxChoice* c = new wxChoice
                       (
 {
     wxChoice* c = new wxChoice
                       (


@@ -1497,7 +1497,7 @@ wxControl* wxDataViewChoiceRenderer::CreateEditorCtrl( wxWindow *parent, wxRect
     return c;
 }
 
     return c;
 }
 

-bool wxDataViewChoiceRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+bool wxDataViewChoiceRenderer::GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value )

 {
     wxChoice *c = (wxChoice*) editor;
     wxString s = c->GetStringSelection();
 {
     wxChoice *c = (wxChoice*) editor;
     wxString s = c->GetStringSelection();


@@ -1538,14 +1538,14 @@ wxDataViewChoiceByIndexRenderer::wxDataViewChoiceByIndexRenderer( const wxArrayS
 {
 }
 
 {
 }
 

-wxControl* wxDataViewChoiceByIndexRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+wxWindow* wxDataViewChoiceByIndexRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )

 {
     wxVariant string_value = GetChoice( value.GetLong() );
 
     return wxDataViewChoiceRenderer::CreateEditorCtrl( parent, labelRect, string_value );
 }
 
 {
     wxVariant string_value = GetChoice( value.GetLong() );
 
     return wxDataViewChoiceRenderer::CreateEditorCtrl( parent, labelRect, string_value );
 }
 

-bool wxDataViewChoiceByIndexRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+bool wxDataViewChoiceByIndexRenderer::GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value )

 {
     wxVariant string_value;
     if (!wxDataViewChoiceRenderer::GetValueFromEditorCtrl( editor, string_value ))
 {
     wxVariant string_value;
     if (!wxDataViewChoiceRenderer::GetValueFromEditorCtrl( editor, string_value ))

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index cf63855f78d56b55ca2c68923c2a608620ce4362..b2b2c6374d967d7ca6f58861ac0eed415ef97dcb 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -732,7 +732,7 @@ bool wxDataViewTextRenderer::HasEditorCtrl() const
     return true;
 }
 
     return true;
 }
 

-wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
+wxWindow* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,

         wxRect labelRect, const wxVariant &value )
 {
     wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, value,
         wxRect labelRect, const wxVariant &value )
 {
     wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, value,


@@ -746,7 +746,7 @@ wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
     return ctrl;
 }
 
     return ctrl;
 }
 

-bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value )
+bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant &value )

 {
     wxTextCtrl *text = (wxTextCtrl*) editor;
     value = text->GetValue();
 {
     wxTextCtrl *text = (wxTextCtrl*) editor;
     value = text->GetValue();


@@ -1106,7 +1106,7 @@ wxSize wxDataViewIconTextRenderer::GetSize() const
     return wxSize(80,20);
 }
 
     return wxSize(80,20);
 }
 

-wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value)
+wxWindow* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value)

 {
     wxDataViewIconText iconText;
     iconText << value;
 {
     wxDataViewIconText iconText;
     iconText << value;


@@ -1132,7 +1132,7 @@ wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect
     return ctrl;
 }
 
     return ctrl;
 }
 

-bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant& value )
+bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant& value )

 {
     wxTextCtrl *text = (wxTextCtrl*) editor;
 
 {
     wxTextCtrl *text = (wxTextCtrl*) editor;