Fix for VA 4.0

[wxWidgets.git] / include / wx / generic / listctrl.h

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 98b332888d476eb04771688081f1174d7c38d122..e6e931b290e33169c2dff1511b71500897b99a49 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -180,7 +180,8 @@ public:
 private:
     void SetAttributes(wxDC *dc,
                        const wxListItemAttr *attr,
-                       const wxColour& colText, const wxFont& font);
+                       const wxColour& colText, const wxFont& font,
+                       bool hilight);
 
     DECLARE_DYNAMIC_CLASS(wxListLineData);
 };
@@ -250,9 +251,7 @@ public:
                     const wxString &value = "",
                     const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
                     int style = 0,
-#if wxUSE_VALIDATORS
                     const wxValidator& validator = wxDefaultValidator,
-#endif
                     const wxString &name = "wxListTextCtrlText" );
     void OnChar( wxKeyEvent &event );
     void OnKillFocus( wxFocusEvent &event );
@@ -378,23 +377,25 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 {
 public:
     wxListCtrl();
-    wxListCtrl( wxWindow *parent, wxWindowID id = -1,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-#if wxUSE_VALIDATORS
-      long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,
-#endif
-       const wxString &name = "listctrl" )
+    wxListCtrl( wxWindow *parent,
+                wxWindowID id = -1,
+                const wxPoint &pos = wxDefaultPosition,
+                const wxSize &size = wxDefaultSize,
+                long style = wxLC_ICON,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString &name = "listctrl" )
     {
         Create(parent, id, pos, size, style, validator, name);
     }
     ~wxListCtrl();
     
-    bool Create( wxWindow *parent, wxWindowID id = -1,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-#if wxUSE_VALIDATORS
-      long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,
-#endif
-      const wxString &name = "listctrl" );
+    bool Create( wxWindow *parent,
+                 wxWindowID id = -1,
+                 const wxPoint &pos = wxDefaultPosition,
+                 const wxSize &size = wxDefaultSize,
+                 long style = wxLC_ICON,
+                 const wxValidator& validator = wxDefaultValidator,
+                 const wxString &name = "listctrl" );
 
     bool GetColumn( int col, wxListItem& item ) const;
     bool SetColumn( int col, wxListItem& item );