fixing osx_carbon

[wxWidgets.git] / src / common / datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 3e52749a09e6a6cd7154bcdbc1e27c18b206baab..c5540283fc6bbe1d2e0d9490b9edbf34cef46be5 100644 (file)
--- 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;
 


@@ -387,7 +387,7 @@ wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )
     // build initial index
     unsigned int i;
     for (i = 1; i < initial_size+1; i++)
     // build initial index
     unsigned int i;
     for (i = 1; i < initial_size+1; i++)

-            m_hash.Add( wxUIntToPtr(i) );
+            m_hash.Add( wxDataViewItem(wxUIntToPtr(i)) );

     m_nextFreeID = initial_size + 1;
 }
 
     m_nextFreeID = initial_size + 1;
 }
 


@@ -403,7 +403,7 @@ void wxDataViewIndexListModel::Reset( unsigned int new_size )
     // build initial index
     unsigned int i;
     for (i = 1; i < new_size+1; i++)
     // build initial index
     unsigned int i;
     for (i = 1; i < new_size+1; i++)

-            m_hash.Add( wxUIntToPtr(i) );
+            m_hash.Add( wxDataViewItem(wxUIntToPtr(i)) );

 
     m_nextFreeID = new_size + 1;
 
 
     m_nextFreeID = new_size + 1;
 


@@ -417,8 +417,8 @@ void wxDataViewIndexListModel::RowPrepended()
     unsigned int id = m_nextFreeID;
     m_nextFreeID++;
 
     unsigned int id = m_nextFreeID;
     m_nextFreeID++;
 

-    m_hash.Insert( wxUIntToPtr(id), 0 );

     wxDataViewItem item( wxUIntToPtr(id) );
     wxDataViewItem item( wxUIntToPtr(id) );

+    m_hash.Insert( item, 0 );

     ItemAdded( wxDataViewItem(0), item );
 
 }
     ItemAdded( wxDataViewItem(0), item );
 
 }


@@ -430,8 +430,8 @@ void wxDataViewIndexListModel::RowInserted( unsigned int before )
     unsigned int id = m_nextFreeID;
     m_nextFreeID++;
 
     unsigned int id = m_nextFreeID;
     m_nextFreeID++;
 

-    m_hash.Insert( wxUIntToPtr(id), before );

     wxDataViewItem item( wxUIntToPtr(id) );
     wxDataViewItem item( wxUIntToPtr(id) );

+    m_hash.Insert( item, before );

     ItemAdded( wxDataViewItem(0), item );
 }
 
     ItemAdded( wxDataViewItem(0), item );
 }
 


@@ -440,8 +440,8 @@ void wxDataViewIndexListModel::RowAppended()
     unsigned int id = m_nextFreeID;
     m_nextFreeID++;
 
     unsigned int id = m_nextFreeID;
     m_nextFreeID++;
 

-    m_hash.Add( wxUIntToPtr(id) );

     wxDataViewItem item( wxUIntToPtr(id) );
     wxDataViewItem item( wxUIntToPtr(id) );

+    m_hash.Add( item );

     ItemAdded( wxDataViewItem(0), item );
 }
 
     ItemAdded( wxDataViewItem(0), item );
 }
 


@@ -490,7 +490,7 @@ unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) cons
         return wxPtrToUInt(item.GetID())-1;
 
     // assert for not found
         return wxPtrToUInt(item.GetID())-1;
 
     // assert for not found

-    return (unsigned int) m_hash.Index( item.GetID() );
+    return (unsigned int) m_hash.Index( item );

 }
 
 wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
 }
 
 wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const


@@ -728,12 +728,15 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
 
 void wxDataViewRendererBase::DestroyEditControl()
 {
 
 void wxDataViewRendererBase::DestroyEditControl()
 {

+    // Remove our event handler first to prevent it from (recursively) calling
+    // us again as it would do via a call to FinishEditing() when the editor
+    // loses focus when we hide it below.
+    wxEvtHandler * const handler = m_editorCtrl->PopEventHandler();
+

     // Hide the control immediately but don't delete it yet as there could be
     // some pending messages for it.
     m_editorCtrl->Hide();
 
     // Hide the control immediately but don't delete it yet as there could be
     // some pending messages for it.
     m_editorCtrl->Hide();
 

-    wxEvtHandler * const handler = m_editorCtrl->PopEventHandler();
-

     wxPendingDelete.Append(handler);
     wxPendingDelete.Append(m_editorCtrl);
 }
     wxPendingDelete.Append(handler);
     wxPendingDelete.Append(m_editorCtrl);
 }


@@ -743,8 +746,6 @@ void wxDataViewRendererBase::CancelEditing()
     if (!m_editorCtrl)
         return;
 
     if (!m_editorCtrl)
         return;
 

-    GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
-

     DestroyEditControl();
 }
 
     DestroyEditControl();
 }
 


@@ -762,21 +763,27 @@ bool wxDataViewRendererBase::FinishEditing()
 
     DestroyEditControl();
 
 
     DestroyEditControl();
 

-    if (!Validate(value))
-        return false;
-
+    bool isValid = Validate(value);

     unsigned int col = GetOwner()->GetModelColumn();
     unsigned int col = GetOwner()->GetModelColumn();

-    dv_ctrl->GetModel()->ChangeValue(value, m_item, col);

 
     // Now we should send Editing Done event
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl->GetId() );
     event.SetDataViewColumn( GetOwner() );
     event.SetModel( dv_ctrl->GetModel() );
     event.SetItem( m_item );
 
     // Now we should send Editing Done event
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl->GetId() );
     event.SetDataViewColumn( GetOwner() );
     event.SetModel( dv_ctrl->GetModel() );
     event.SetItem( m_item );

+    event.SetValue( value );
+    event.SetColumn( col );
+    event.SetEditCanceled( !isValid );

     event.SetEventObject( dv_ctrl );
     dv_ctrl->GetEventHandler()->ProcessEvent( event );
 
     event.SetEventObject( dv_ctrl );
     dv_ctrl->GetEventHandler()->ProcessEvent( event );
 

-    return true;
+    if ( isValid && event.IsAllowed() )
+    {
+        dv_ctrl->GetModel()->ChangeValue(value, m_item, col);
+        return true;
+    }
+
+    return false;

 }
 
 void wxDataViewRendererBase::PrepareForItem(const wxDataViewModel *model,
 }
 
 void wxDataViewRendererBase::PrepareForItem(const wxDataViewModel *model,


@@ -1417,7 +1424,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 +1444,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();


@@ -1455,7 +1462,15 @@ bool wxDataViewSpinRenderer::Render( wxRect rect, wxDC *dc, int state )
 
 wxSize wxDataViewSpinRenderer::GetSize() const
 {
 
 wxSize wxDataViewSpinRenderer::GetSize() const
 {

-    return wxSize(80,16);
+    wxSize sz = GetTextExtent(wxString::Format("%d", (int)m_data));
+
+    // Allow some space for the spin buttons, which is approximately the size
+    // of a scrollbar (and getting pixel-exact value would be complicated).
+    // Also add some whitespace between the text and the button:
+    sz.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+    sz.x += GetTextExtent("M").x;
+
+    return sz;

 }
 
 bool wxDataViewSpinRenderer::SetValue( const wxVariant &value )
 }
 
 bool wxDataViewSpinRenderer::SetValue( const wxVariant &value )


@@ -1482,15 +1497,22 @@ 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(parent, wxID_ANY, labelRect.GetTopLeft(), wxDefaultSize, m_choices );
+    wxChoice* c = new wxChoice
+                      (
+                          parent,
+                          wxID_ANY,
+                          labelRect.GetTopLeft(),
+                          wxSize(labelRect.GetWidth(), -1),
+                          m_choices
+                      );

     c->Move(labelRect.GetRight() - c->GetRect().width, wxDefaultCoord);
     c->SetStringSelection( value.GetString() );
     return c;
 }
 
     c->Move(labelRect.GetRight() - c->GetRect().width, wxDefaultCoord);
     c->SetStringSelection( value.GetString() );
     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();


@@ -1506,7 +1528,18 @@ bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state )
 
 wxSize wxDataViewChoiceRenderer::GetSize() const
 {
 
 wxSize wxDataViewChoiceRenderer::GetSize() const
 {

-    return wxSize(80,16);
+    wxSize sz;
+
+    for ( wxArrayString::const_iterator i = m_choices.begin(); i != m_choices.end(); ++i )
+        sz.IncTo(GetTextExtent(*i));
+
+    // Allow some space for the right-side button, which is approximately the
+    // size of a scrollbar (and getting pixel-exact value would be complicated).
+    // Also add some whitespace between the text and the button:
+    sz.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+    sz.x += GetTextExtent("M").x;
+
+    return sz;

 }
 
 bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value )
 }
 
 bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value )


@@ -1531,14 +1564,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 ))


@@ -1972,7 +2005,7 @@ wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, u
 
     wxDataViewTreeStoreNodeList::compatibility_iterator node = parent_node->GetChildren().Item( pos );
     if (node)
 
     wxDataViewTreeStoreNodeList::compatibility_iterator node = parent_node->GetChildren().Item( pos );
     if (node)

-        return node->GetData();
+        return wxDataViewItem(node->GetData());

 
     return wxDataViewItem(0);
 }
 
     return wxDataViewItem(0);
 }


@@ -2078,7 +2111,7 @@ void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item )
 
 void wxDataViewTreeStore::DeleteAllItems()
 {
 
 void wxDataViewTreeStore::DeleteAllItems()
 {

-    DeleteChildren(m_root);
+    DeleteChildren(wxDataViewItem(m_root));

 }
 
 void
 }
 
 void


@@ -2238,7 +2271,7 @@ bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id,
         wxDATAVIEW_CELL_EDITABLE,
         -1,                         // default width
         wxALIGN_NOT,                //  and alignment
         wxDATAVIEW_CELL_EDITABLE,
         -1,                         // default width
         wxALIGN_NOT,                //  and alignment

-        0                           // not resizeable
+        0                           // not resizable

     );
 
     return true;
     );
 
     return true;