link with wininet.lib under Windows to avoid linking errors in wxUSE_URL_NATIVE=...

[wxWidgets.git] / src / generic / listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 55d57648271adc83b9f993ffca0e49cf54ca41da..f4dc7c16994f2a0e1ec599ac4ad88e603509a556 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -618,7 +618,7 @@ public:
     void OnPaint( wxPaintEvent &event );
 
     void OnChildFocus(wxChildFocusEvent& event);
-    
+
     void DrawImage( int index, wxDC *dc, int x, int y );
     void GetImageSize( int index, int &width, int &height ) const;
     int GetTextLength( const wxString &s ) const;
@@ -4881,12 +4881,7 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {
-    // FIXME
-#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
-    wxScrolledCanvas::OnScroll(event);
-#else
     HandleOnScroll( event );
-#endif
 
     // update our idea of which lines are shown when we redraw the window the
     // next time
@@ -5046,7 +5041,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
     m_headerHeight = 0;
 
     // just like in other ports, an assert will fail if the user doesn't give any type style:
-    wxASSERT_MSG( !(style & wxLC_MASK_TYPE),
+    wxASSERT_MSG( (style & wxLC_MASK_TYPE),
                   _T("wxListCtrl style should have exactly one mode bit set") );
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
@@ -5065,7 +5060,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {
         wxFont font;
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_ATSU_TEXT
         font.MacCreateFromThemeFont( kThemeViewsFont );
 #else
         font.MacCreateFromUIFont( kCTFontViewsFontType );
@@ -5082,7 +5077,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
         if (m_headerWin)
         {
             wxFont font;
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_ATSU_TEXT
             font.MacCreateFromThemeFont( kThemeSmallSystemFont );
 #else
         font.MacCreateFromUIFont( kCTFontSystemFontType );
@@ -5768,7 +5763,7 @@ wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 #else
     wxUnusedVar(variant);
     wxVisualAttributes attr;
-    attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+    attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT);
     attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
     attr.font  = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
     return attr;