add member for sheetdialog

[wxWidgets.git] / src / osx / carbon / dataview.cpp

diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp
index 48b992758baf607ae825fd0eff6c53bc211086f2..ff748471c213319136e043f7f89e6c1445d1eb73 100644 (file)
--- a/src/osx/carbon/dataview.cpp
+++ b/src/osx/carbon/dataview.cpp
@@ -889,7 +889,7 @@ bool wxMacDataViewDataBrowserListViewControl::InsertColumn(unsigned int pos, wxD
 
   UInt32 noOfColumns;
 
-  wxCFStringRef title(columnPtr->GetTitle(),m_font.Ok() ? dynamic_cast<wxDataViewCtrl*>(GetWXPeer())->GetFont().GetEncoding() : wxLocale::GetSystemEncoding());
+  wxCFStringRef title(columnPtr->GetTitle(),m_font.IsOk() ? dynamic_cast<wxDataViewCtrl*>(GetWXPeer())->GetFont().GetEncoding() : wxLocale::GetSystemEncoding());
 
 
  // try to get new ID for the column:
@@ -1236,6 +1236,11 @@ void wxMacDataViewDataBrowserListViewControl::OnSize()
     SetHasScrollBars(true,true);
 }
 
+void wxMacDataViewDataBrowserListViewControl::StartEditor( const wxDataViewItem & item, unsigned int column )
+{
+    // implement me
+}
+
 //
 // callback functions (inherited from wxMacDataBrowserTableViewControl)
 //
@@ -2339,7 +2344,7 @@ bool wxDataViewTextRenderer::MacRender()
 {
   wxCHECK_MSG(GetValue().GetType() == GetVariantType(),false,wxString(_("Text renderer cannot render value; value type: ")) << GetValue().GetType());
 
-  wxCFStringRef cfString(GetValue().GetString(),(GetView()->GetFont().Ok() ? GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
+  wxCFStringRef cfString(GetValue().GetString(),(GetView()->GetFont().IsOk() ? GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
   return (::SetDataBrowserItemDataText(GetNativeData()->GetItemDataRef(),cfString) == noErr);
 }
 
@@ -2365,7 +2370,7 @@ bool wxDataViewBitmapRenderer::MacRender()
   wxBitmap bitmap;
 
   bitmap << GetValue();
-  return (!(bitmap.Ok()) || (::SetDataBrowserItemDataIcon(GetNativeData()->GetItemDataRef(),bitmap.GetIconRef()) == noErr));
+  return (!(bitmap.IsOk()) || (::SetDataBrowserItemDataIcon(GetNativeData()->GetItemDataRef(),bitmap.GetIconRef()) == noErr));
 }
 
 IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer)
@@ -2390,7 +2395,7 @@ bool wxDataViewIconTextRenderer::MacRender()
 
   iconText << GetValue();
 
-  wxCFStringRef cfString(iconText.GetText(),(GetView()->GetFont().Ok() ? GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
+  wxCFStringRef cfString(iconText.GetText(),(GetView()->GetFont().IsOk() ? GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
 
   if (iconText.GetIcon().IsOk())
     if (::SetDataBrowserItemDataIcon(GetNativeData()->GetItemDataRef(),MAC_WXHICON(iconText.GetIcon().GetHICON())) != noErr)
@@ -2556,7 +2561,7 @@ void wxDataViewColumn::SetBitmap(wxBitmap const& bitmap)
       DataBrowserListViewHeaderDesc headerDescription;
 
       wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description."));
-      if (GetBitmap().Ok())
+      if (GetBitmap().IsOk())
         headerDescription.btnContentInfo.u.iconRef = GetBitmap().GetIconRef();
       else
         headerDescription.btnContentInfo.u.iconRef = NULL;
@@ -2632,10 +2637,10 @@ void wxDataViewColumn::SetReorderable(bool reorderable)
   }
 }
 
-void wxDataViewColumn::SetResizeable(bool resizeable)
+void wxDataViewColumn::SetResizeable(bool resizable)
 {
  // first set the internal flag of the column:
-  if (resizeable)
+  if (resizable)
     m_flags |= wxDATAVIEW_COL_RESIZABLE;
   else
     m_flags &= ~wxDATAVIEW_COL_RESIZABLE;
@@ -2651,7 +2656,7 @@ void wxDataViewColumn::SetResizeable(bool resizeable)
       DataBrowserListViewHeaderDesc headerDescription;
 
       verify_noerr(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription));
-      if (resizeable)
+      if (resizable)
       {
         if (GetMinWidth() >= GetMaxWidth())
         {
@@ -2735,7 +2740,7 @@ void wxDataViewColumn::SetTitle(wxString const& title)
     if (macDataViewListCtrlPtr != NULL)
     {
       DataBrowserListViewHeaderDesc headerDescription;
-      wxCFStringRef           cfTitle(title,(dataViewCtrlPtr->GetFont().Ok() ? dataViewCtrlPtr->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
+      wxCFStringRef           cfTitle(title,(dataViewCtrlPtr->GetFont().IsOk() ? dataViewCtrlPtr->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
 
       wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description."));
       headerDescription.titleString = cfTitle;