Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewritten in-place editing for generic wxDataViewCtrl

Browse Source 
moving the code (partly) to the renderer and away
    from the wxDataViewCtrl class. Adding new in-plae
    editors (wxChoice) should be much simpler now.
  Also implemented using Validate() before committing
    a change to the data model.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-04-16 12:45:25 +00:00
parent 8060b0be0e
commit 99d471a5db
3 changed files with 186 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
include/wx/generic/dataview.h
View File

@@ -25,6 +25,30 @@ class WXDLLIMPEXP_ADV wxDataViewCtrl;
class WXDLLIMPEXP_ADV wxDataViewMainWindow;
class WXDLLIMPEXP_ADV wxDataViewHeaderWindow;
//-----------------------------------------------------------------------------
// wxDataViewEditorCtrlEvtHandler
//-----------------------------------------------------------------------------
class wxDataViewEditorCtrlEvtHandler: public wxEvtHandler
{
public:
wxDataViewEditorCtrlEvtHandler( wxControl *editor, wxDataViewRenderer *owner );
void AcceptChangesAndFinish();
protected:
void OnChar( wxKeyEvent &event );
void OnKillFocus( wxFocusEvent &event );
private:
wxDataViewRenderer *m_owner;
wxControl *m_editorCtrl;
bool m_finished;
private:
DECLARE_EVENT_TABLE()
};
// ---------------------------------------------------------
// wxDataViewRenderer
// ---------------------------------------------------------
@@ -78,10 +102,24 @@ public:
// Create DC on request
virtual wxDC *GetDC();
// in-place editing
virtual bool HasEditorCtrl()
{ return false; }
virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
{ return NULL; }
virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
{ return false; }
virtual bool StartEditing( unsigned int row, wxRect labelRect );
virtual void CancelEditing();
virtual bool FinishEditing();
private:
wxDC *m_dc;
int m_align;
wxDataViewCellMode m_mode;
wxDC *m_dc;
int m_align;
wxDataViewCellMode m_mode;
wxControl *m_editorCtrl;
unsigned int m_row; // for m_editorCtrl
protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
@@ -102,6 +140,7 @@ protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
};
// ---------------------------------------------------------
// wxDataViewTextRenderer
// ---------------------------------------------------------
@@ -119,8 +158,13 @@ public:
bool Render( wxRect cell, wxDC *dc, int state );
wxSize GetSize() const;
// in-place editing
virtual bool HasEditorCtrl();
virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
private:
wxString m_text;
wxString m_text;
protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
@@ -362,6 +406,8 @@ public: // utility functions not part of the API
// updates the header window after a change in a column setting
void OnColumnChange();
wxDataViewMainWindow* GetMainWindow() { return m_clientArea; }
private:
wxDataViewListModelNotifier *m_notifier;
wxDataViewMainWindow *m_clientArea;