fixing return values and handling of invalid files

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

diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp
index f16559a92fab185f2e37602220af0ebed912b5b5..82a99344fcf82f37755d889265819febebf7c29e 100644 (file)
--- a/src/osx/carbon/listctrl_mac.cpp
+++ b/src/osx/carbon/listctrl_mac.cpp
@@ -783,11 +783,7 @@ wxListCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
-#if wxOSX_USE_ATSU_TEXT
-    attr.font.MacCreateFromThemeFont( kThemeViewsFont ) ;
-#else
-    attr.font.MacCreateFromUIFont( kCTFontViewsFontType ) ;
-#endif
+    attr.font.CreateSystemFont(wxOSX_SYSTEM_FONT_VIEWS);
 
     return attr;
 }
@@ -1392,7 +1388,7 @@ wxRect wxListCtrl::GetViewRect() const
 bool wxListCtrl::GetSubItemRect( long item, long subItem, wxRect& rect, int code ) const
 {
     if (m_genericImpl)
-        return m_genericImpl->GetItemRect(item, rect, code);
+        return m_genericImpl->GetSubItemRect(item, subItem, rect, code);
 
     // TODO: implement for DataBrowser implementation        
     return false;
@@ -2857,7 +2853,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         if (font.Ok())
         {
             info.fontID = kThemeSpecifiedFont;
-            info.font = (CTFontRef) font.MacGetCTFont();
+            info.font = (CTFontRef) font.OSXGetCTFont();
             setup = true;
         }
     }
@@ -2872,7 +2868,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         {
             info.fontID = font.MacGetThemeFontID();
 
-            ::TextSize( (short)(font.MacGetFontSize()) ) ;
+            ::TextSize( (short)(font.GetPointSize()) ) ;
             ::TextFace( font.MacGetFontStyle() ) ;
         }
     }