Small fixes after wxHtmlTagHandler::GetParser() addition.

[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 c37094dc70af725bad9dd1cc96b90fa0db342679..5cc788b68fee91f8c6ec083b419dfdb58109bfc4 100644 (file)
--- a/src/osx/carbon/listctrl_mac.cpp
+++ b/src/osx/carbon/listctrl_mac.cpp
@@ -685,7 +685,7 @@ bool wxListCtrl::Create(wxWindow *parent,
             (EventHandlerRef *)&m_macListCtrlEventHandler);
 
         m_renameTimer = new wxListCtrlRenameTimer( this );
             (EventHandlerRef *)&m_macListCtrlEventHandler);
 
         m_renameTimer = new wxListCtrlRenameTimer( this );

-        
+

         Connect( wxID_ANY, wxEVT_CHAR, wxCharEventHandler(wxListCtrl::OnChar), NULL, this );
         Connect( wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(wxListCtrl::OnLeftDown), NULL, this );
         Connect( wxID_ANY, wxEVT_LEFT_DCLICK, wxMouseEventHandler(wxListCtrl::OnDblClick), NULL, this );
         Connect( wxID_ANY, wxEVT_CHAR, wxCharEventHandler(wxListCtrl::OnChar), NULL, this );
         Connect( wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(wxListCtrl::OnLeftDown), NULL, this );
         Connect( wxID_ANY, wxEVT_LEFT_DCLICK, wxMouseEventHandler(wxListCtrl::OnDblClick), NULL, this );


@@ -775,7 +775,7 @@ void wxListCtrl::SetWindowStyleFlag(long flag)
 
 void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
 
 void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {

-    wxControl::DoSetSize(x, y, width, height, sizeFlags);
+    wxListCtrlBase::DoSetSize(x, y, width, height, sizeFlags);

 
     if (m_genericImpl)
         m_genericImpl->SetSize(0, 0, width, height, sizeFlags);
 
     if (m_genericImpl)
         m_genericImpl->SetSize(0, 0, width, height, sizeFlags);


@@ -801,15 +801,9 @@ void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     }
 }
 
     }
 }
 

-wxSize wxListCtrl::DoGetBestSize() const
-{
-    return wxWindow::DoGetBestSize();
-}
-

 bool wxListCtrl::SetFont(const wxFont& font)
 {
 bool wxListCtrl::SetFont(const wxFont& font)
 {

-    bool rv = true;
-    rv = wxControl::SetFont(font);
+    bool rv = wxListCtrlBase::SetFont(font);

     if (m_genericImpl)
         rv = m_genericImpl->SetFont(font);
     return rv;
     if (m_genericImpl)
         rv = m_genericImpl->SetFont(font);
     return rv;


@@ -849,21 +843,21 @@ void wxListCtrl::Freeze ()
 {
     if (m_genericImpl)
         m_genericImpl->Freeze();
 {
     if (m_genericImpl)
         m_genericImpl->Freeze();

-    wxControl::Freeze();
+    wxListCtrlBase::Freeze();

 }
 
 void wxListCtrl::Thaw ()
 {
     if (m_genericImpl)
         m_genericImpl->Thaw();
 }
 
 void wxListCtrl::Thaw ()
 {
     if (m_genericImpl)
         m_genericImpl->Thaw();

-    wxControl::Thaw();
+    wxListCtrlBase::Thaw();

 }
 
 void wxListCtrl::Update ()
 {
     if (m_genericImpl)
         m_genericImpl->Update();
 }
 
 void wxListCtrl::Update ()
 {
     if (m_genericImpl)
         m_genericImpl->Update();

-    wxControl::Update();
+    wxListCtrlBase::Update();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -903,7 +897,7 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const
 }
 
 // Sets information about this column
 }
 
 // Sets information about this column

-bool wxListCtrl::SetColumn(int col, wxListItem& item)
+bool wxListCtrl::SetColumn(int col, const wxListItem& item)

 {
     if (m_genericImpl)
         return m_genericImpl->SetColumn(col, item);
 {
     if (m_genericImpl)
         return m_genericImpl->SetColumn(col, item);


@@ -943,7 +937,7 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
         if (item.GetMask() & wxLIST_MASK_TEXT)
         {
             wxFontEncoding enc;
         if (item.GetMask() & wxLIST_MASK_TEXT)
         {
             wxFontEncoding enc;

-            if ( m_font.Ok() )
+            if ( m_font.IsOk() )

                 enc = GetFont().GetEncoding();
             else
                 enc = wxLocale::GetSystemEncoding();
                 enc = GetFont().GetEncoding();
             else
                 enc = wxLocale::GetSystemEncoding();


@@ -2161,7 +2155,7 @@ long wxListCtrl::InsertItem(long index, const wxString& label, int imageIndex)
 }
 
 // For list view mode (only), inserts a column.
 }
 
 // For list view mode (only), inserts a column.

-long wxListCtrl::InsertColumn(long col, wxListItem& item)
+long wxListCtrl::DoInsertColumn(long col, const wxListItem& item)

 {
     if (m_genericImpl)
         return m_genericImpl->InsertColumn(col, item);
 {
     if (m_genericImpl)
         return m_genericImpl->InsertColumn(col, item);


@@ -2177,7 +2171,7 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item)
         if (imageList && imageList->GetImageCount() > 0)
         {
             wxBitmap bmp = imageList->GetBitmap(0);
         if (imageList && imageList->GetImageCount() > 0)
         {
             wxBitmap bmp = imageList->GetBitmap(0);

-            //if (bmp.Ok())
+            //if (bmp.IsOk())

             //    type = kDataBrowserIconAndTextType;
         }
 
             //    type = kDataBrowserIconAndTextType;
         }
 


@@ -2214,27 +2208,6 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item)
     return col;
 }
 
     return col;
 }
 

-long wxListCtrl::InsertColumn(long col,
-                              const wxString& heading,
-                              int format,
-                              int width)
-{
-    if (m_genericImpl)
-        return m_genericImpl->InsertColumn(col, heading, format, width);
-
-    wxListItem item;
-    item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
-    item.m_text = heading;
-    if ( width > -1 )
-    {
-        item.m_mask |= wxLIST_MASK_WIDTH;
-        item.m_width = width;
-    }
-    item.m_format = format;
-
-    return InsertColumn(col, item);
-}
-

 // scroll the control by the given number of pixels (exception: in list view,
 // dx is interpreted as number of columns)
 bool wxListCtrl::ScrollList(int dx, int dy)
 // scroll the control by the given number of pixels (exception: in list view,
 // dx is interpreted as number of columns)
 bool wxListCtrl::ScrollList(int dx, int dy)


@@ -2334,15 +2307,6 @@ int wxListCtrl::OnGetItemColumnImage(long item, long column) const
     return -1;
 }
 
     return -1;
 }
 

-wxListItemAttr *wxListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
-{
-    wxASSERT_MSG( item >= 0 && item < GetItemCount(),
-                  wxT("invalid item index in OnGetItemAttr()") );
-
-    // no attributes by default
-    return NULL;
-}
-

 void wxListCtrl::SetItemCount(long count)
 {
     wxASSERT_MSG( IsVirtual(), wxT("this is for virtual controls only") );
 void wxListCtrl::SetItemCount(long count)
 {
     wxASSERT_MSG( IsVirtual(), wxT("this is for virtual controls only") );


@@ -2696,11 +2660,10 @@ enum
 static void calculateCGDrawingBounds(CGRect inItemRect, CGRect *outIconRect, CGRect *outTextRect, bool hasIcon = false)
 {
   float textBottom;
 static void calculateCGDrawingBounds(CGRect inItemRect, CGRect *outIconRect, CGRect *outTextRect, bool hasIcon = false)
 {
   float textBottom;

-  float iconH, iconW = 0;
+  float iconW = 0;

   float padding = kItemPadding;
   if (hasIcon)
   {
   float padding = kItemPadding;
   if (hasIcon)
   {

-    iconH = kIconHeight;

     iconW = kIconWidth;
     padding = padding*2;
   }
     iconW = kIconWidth;
     padding = padding*2;
   }


@@ -2786,7 +2749,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     if (bgColor == wxNullColour)
         bgColor = listBgColor;
 
     if (bgColor == wxNullColour)
         bgColor = listBgColor;
 

-    if (!font.Ok())
+    if (!font.IsOk())

         font = list->GetFont();
 
     wxCFStringRef cfString( text, wxLocale::GetSystemEncoding() );
         font = list->GetFont();
 
     wxCFStringRef cfString( text, wxLocale::GetSystemEncoding() );


@@ -2850,12 +2813,12 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     else
     {
 
     else
     {
 

-        if (color.Ok())
+        if (color.IsOk())

             color.GetRGBColor(&labelColor);
             color.GetRGBColor(&labelColor);

-        else if (list->GetTextColour().Ok())
+        else if (list->GetTextColour().IsOk())

             list->GetTextColour().GetRGBColor(&labelColor);
 
             list->GetTextColour().GetRGBColor(&labelColor);
 

-        if (bgColor.Ok())
+        if (bgColor.IsOk())

         {
             bgColor.GetRGBColor(&backgroundColor);
             CGContextSaveGState(context);
         {
             bgColor.GetRGBColor(&backgroundColor);
             CGContextSaveGState(context);


@@ -2897,7 +2860,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     {
         info.version = kHIThemeTextInfoVersionOne;
         info.fontID = kThemeViewsFont;
     {
         info.version = kHIThemeTextInfoVersionOne;
         info.fontID = kThemeViewsFont;

-        if (font.Ok())
+        if (font.IsOk())

         {
             info.fontID = kThemeSpecifiedFont;
             info.font = (CTFontRef) font.OSXGetCTFont();
         {
             info.fontID = kThemeSpecifiedFont;
             info.font = (CTFontRef) font.OSXGetCTFont();


@@ -2911,7 +2874,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         info.version = kHIThemeTextInfoVersionZero;
         info.fontID = kThemeViewsFont;
 
         info.version = kHIThemeTextInfoVersionZero;
         info.fontID = kThemeViewsFont;
 

-        if (font.Ok())
+        if (font.IsOk())

         {
             info.fontID = font.MacGetThemeFontID();
 
         {
             info.fontID = font.MacGetThemeFontID();