Compilation fix: include wx/button.h from wx/commandlinkbutton.h.

[wxWidgets.git] / src / osx / dataview_osx.cpp

diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp
index bde6716c21edb5972259f15f9d27f8e99e486a48..45e2b3ca35f2d612925acde31b28da3b4f415140 100644 (file)
--- a/src/osx/dataview_osx.cpp
+++ b/src/osx/dataview_osx.cpp
@@ -333,9 +333,15 @@ void wxDataViewCtrl::Init()
   m_cgContext         = NULL;
 }
 
   m_cgContext         = NULL;
 }
 

-bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator )
-{
-  if (!(wxControl::Create(parent,id,pos,size,style & ~(wxHSCROLL | wxVSCROLL),validator)))
+bool wxDataViewCtrl::Create(wxWindow *parent,
+                            wxWindowID id,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxValidator& validator,
+                            const wxString& name)
+{
+  if (!(wxControl::Create(parent,id,pos,size,style,validator,name)))

     return false;
   m_peer = ::CreateDataView(this,parent,id,pos,size,style,GetExtraStyle());
 
     return false;
   m_peer = ::CreateDataView(this,parent,id,pos,size,style,GetExtraStyle());
 


@@ -490,6 +496,16 @@ unsigned int wxDataViewCtrl::GetCount() const
   return GetDataViewPeer()->GetCount();
 }
 
   return GetDataViewPeer()->GetCount();
 }
 

+wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const
+{
+    return GetDataViewPeer()->GetCurrentItem();
+}
+
+void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
+{
+    GetDataViewPeer()->SetCurrentItem(item);
+}
+

 wxRect wxDataViewCtrl::GetItemRect(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) const
 {
   if (item.IsOk() && (columnPtr != NULL))
 wxRect wxDataViewCtrl::GetItemRect(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) const
 {
   if (item.IsOk() && (columnPtr != NULL))


@@ -614,7 +630,8 @@ wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );

-    attr.font.CreateSystemFont(wxOSX_SYSTEM_FONT_VIEWS);
+    static wxFont font = wxFont(wxOSX_SYSTEM_FONT_VIEWS);
+    attr.font = font;

 
     return attr;
 }
 
     return attr;
 }