X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/777f9cef025177773ad424e77a72019a0d9b6e94..fcdd53359135f790b85728c4254b97095a56dad8:/src/common/datavcmn.cpp diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 5edb1147bd..949ffa233f 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -19,8 +19,10 @@ #include "wx/dataview.h" #include "wx/spinctrl.h" +#include "wx/choice.h" #include "wx/weakref.h" +#include "wx/vector.h" #ifndef WX_PRECOMP #include "wx/dc.h" @@ -30,7 +32,7 @@ #include "wx/crt.h" #endif -const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl"); +const char wxDataViewCtrlNameStr[] = "dataviewCtrl"; bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) @@ -41,7 +43,7 @@ bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) #ifdef __WXDEBUG__ void wxDataViewItem::Print(const wxString& text) const { - wxPrintf(wxT("item %s: %l\n"), text.GetData(), (long)m_id); + wxPrintf(wxT("item %s: %lu\n"), text.GetData(), wxPtrToUInt(m_id)); } #endif @@ -671,7 +673,7 @@ wxDataViewRendererBase::~wxDataViewRendererBase() const wxDataViewCtrl* wxDataViewRendererBase::GetView() const { - return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner(); + return const_cast(this)->GetOwner()->GetOwner(); } class wxKillRef: public wxWindowRef @@ -720,6 +722,8 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la void wxDataViewRendererBase::CancelEditing() { + if (!m_editorCtrl) return; + GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); m_editorCtrl->Hide(); @@ -728,6 +732,8 @@ void wxDataViewRendererBase::CancelEditing() bool wxDataViewRendererBase::FinishEditing() { + if (!m_editorCtrl) return true; + wxVariant value; GetValueFromEditorCtrl( m_editorCtrl, value ); @@ -761,6 +767,7 @@ BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler) EVT_CHAR (wxDataViewEditorCtrlEvtHandler::OnChar) EVT_KILL_FOCUS (wxDataViewEditorCtrlEvtHandler::OnKillFocus) EVT_IDLE (wxDataViewEditorCtrlEvtHandler::OnIdle) + EVT_TEXT_ENTER (-1, wxDataViewEditorCtrlEvtHandler::OnTextEnter) END_EVENT_TABLE() wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler( @@ -785,6 +792,12 @@ void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event ) event.Skip(); } +void wxDataViewEditorCtrlEvtHandler::OnTextEnter( wxCommandEvent &WXUNUSED(event) ) +{ + m_finished = true; + m_owner->FinishEditing(); +} + void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event ) { switch ( event.m_keyCode ) @@ -795,10 +808,11 @@ void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event ) break; case WXK_ESCAPE: + { m_finished = true; m_owner->CancelEditing(); break; - + } default: event.Skip(); } @@ -819,64 +833,18 @@ void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event ) // wxDataViewColumnBase // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject) - -wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title), - wxDataViewRenderer *renderer, - unsigned int model_column, - int WXUNUSED(width), - wxAlignment WXUNUSED(align), - int WXUNUSED(flags)) +void wxDataViewColumnBase::Init(wxDataViewRenderer *renderer, + unsigned int model_column) { m_renderer = renderer; m_model_column = model_column; m_owner = NULL; m_renderer->SetOwner( (wxDataViewColumn*) this ); - - // NOTE: the wxDataViewColumn's ctor must store the width, align, flags - // parameters inside the native control! -} - -wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap, - wxDataViewRenderer *renderer, - unsigned int model_column, - int WXUNUSED(width), - wxAlignment WXUNUSED(align), - int WXUNUSED(flags) ) -{ - m_renderer = renderer; - m_model_column = model_column; - m_bitmap = bitmap; - m_owner = NULL; - m_renderer->SetOwner( (wxDataViewColumn*) this ); } wxDataViewColumnBase::~wxDataViewColumnBase() { - if (m_renderer) - delete m_renderer; -} - -int wxDataViewColumnBase::GetFlags() const -{ - int ret = 0; - - if (IsSortable()) - ret |= wxDATAVIEW_COL_SORTABLE; - if (IsResizeable()) - ret |= wxDATAVIEW_COL_RESIZABLE; - if (IsHidden()) - ret |= wxDATAVIEW_COL_HIDDEN; - - return ret; -} - -void wxDataViewColumnBase::SetFlags(int flags) -{ - SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0); - SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0); - SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0); - SetReorderable((flags & wxDATAVIEW_COL_REORDERABLE) != 0); + delete m_renderer; } // --------------------------------------------------------- @@ -928,6 +896,30 @@ const wxDataViewModel* wxDataViewCtrlBase::GetModel() const return m_model; } +void wxDataViewCtrlBase::ExpandAncestors( const wxDataViewItem & item ) +{ + if (!m_model) return; + + if (!item.IsOk()) return; + + wxVector parentChain; + + // at first we get all the parents of the selected item + wxDataViewItem parent = m_model->GetParent(item); + while (parent.IsOk()) + { + parentChain.push_back(parent); + parent = m_model->GetParent(parent); + } + + // then we expand the parents, starting at the root + while (!parentChain.empty()) + { + Expand(parentChain.back()); + parentChain.pop_back(); + } +} + wxDataViewColumn * wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) @@ -1208,7 +1200,7 @@ wxDataViewCtrlBase::PrependColumn( wxDataViewColumn *col ) return true; } -bool +bool wxDataViewCtrlBase::InsertColumn( unsigned int WXUNUSED(pos), wxDataViewColumn *col ) { col->SetOwner( (wxDataViewCtrl*) this ); @@ -1261,7 +1253,7 @@ wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect la wxString str; str.Printf( wxT("%d"), (int) l ); wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str, - labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS, m_min, m_max, l ); + labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS|wxTE_PROCESS_ENTER, m_min, m_max, l ); #ifdef __WXMAC__ size = sc->GetSize(); wxPoint pt = sc->GetPosition(); @@ -1304,6 +1296,64 @@ bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const return true; } +// ------------------------------------- +// wxDataViewChoiceRenderer +// ------------------------------------- + +#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXMAC__) + +wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString& choices, wxDataViewCellMode mode, int alignment ) : + wxDataViewCustomRenderer(wxT("string"), mode, alignment ) +{ + m_choices = choices; +} + +wxControl* wxDataViewChoiceRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +{ + wxString s = value; + wxSize size = labelRect.GetSize(); +#ifdef __WXMAC__ + size = wxSize( wxMax(70,labelRect.width ), -1 ); +#endif + wxChoice *c = new wxChoice( parent, wxID_ANY, labelRect.GetTopLeft(), size, m_choices ); + c->SetStringSelection( value.GetString() ); + + return c; +} + +bool wxDataViewChoiceRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) +{ + wxChoice *c = (wxChoice*) editor; + wxString s = c->GetStringSelection(); + value = s; + return true; +} + +bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state ) +{ + RenderText( m_data, 0, rect, dc, state ); + return true; +} + +wxSize wxDataViewChoiceRenderer::GetSize() const +{ + return wxSize(80,16); +} + +bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value ) +{ + m_data = value.GetString(); + return true; +} + +bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const +{ + value = m_data; + return true; +} + +#endif + //----------------------------------------------------------------------------- // wxDataViewTreeStore //----------------------------------------------------------------------------- @@ -1862,10 +1912,12 @@ void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event ) void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event ) { #if defined(wxUSE_GENERICDATAVIEWCTRL) - wxSize size = GetClientSize(); - wxDataViewColumn *col = GetColumn( 0 ); - if (col) - col->SetWidth( size.x ); + // automatically resize our only column to take the entire control width + if ( GetColumnCount() ) + { + wxSize size = GetClientSize(); + GetColumn(0)->SetWidth(size.x); + } #endif event.Skip( true ); }