Small fixes after wxHtmlTagHandler::GetParser() addition.

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

diff --git a/src/osx/carbon/listbox.cpp b/src/osx/carbon/listbox.cpp
index 2ee41be25e0e3a23bbf7310b6eeb8d6c17ab9f91..441f9aa930ccc327eeeb17ae41d5f7b9cf6d5d08 100644 (file)
--- a/src/osx/carbon/listbox.cpp
+++ b/src/osx/carbon/listbox.cpp
@@ -137,10 +137,10 @@ int wxMacDataBrowserListControl::DoListHitTest(const wxPoint& inpoint) const
             }
 
             if ( point.y < bounds.top )
             }
 
             if ( point.y < bounds.top )

-                // index(bounds) greater then key(point)
+                // index(bounds) greater than key(point)

                 high = mid - 1;
             else
                 high = mid - 1;
             else

-                // index(bounds) less then key(point)
+                // index(bounds) less than key(point)

                 low = mid + 1;
         }
     }
                 low = mid + 1;
         }
     }


@@ -337,8 +337,8 @@ wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxWindow *peer, const
     err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true );
 #if 0
     // shouldn't be necessary anymore under 10.2
     err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true );
 #if 0
     // shouldn't be necessary anymore under 10.2

-    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
-    m_peer->SetNeedsFocusRect( true );
+    GetPeer()->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
+    GetPeer()->SetNeedsFocusRect( true );

 #endif
 }
 
 #endif
 }
 


@@ -406,7 +406,7 @@ wxMacDataBrowserColumn* wxMacDataBrowserListControl::DoInsertColumn( unsigned in
     // TODO: Why is m_font not defined when we enter wxLC_LIST mode, but is
     // defined for other modes?
     wxFontEncoding enc;
     // TODO: Why is m_font not defined when we enter wxLC_LIST mode, but is
     // defined for other modes?
     wxFontEncoding enc;

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

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