Nuke GTK1 from include/gtk

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

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index d51ca4d33f6606bb81b23d215d4315c7e3f4b5f4..cfefe3ecce641e4b861de062c9e239a508f28baf 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -11,13 +11,13 @@
 #ifndef __LISTCTRLH_G__
 #define __LISTCTRLH_G__
 
 #ifndef __LISTCTRLH_G__
 #define __LISTCTRLH_G__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "listctrl.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/defs.h"
 #include "wx/object.h"

+#ifdef __WXMAC__
+#include "wx/imaglist.h"
+#else

 #include "wx/generic/imaglist.h"
 #include "wx/generic/imaglist.h"

+#endif

 
 #include "wx/control.h"
 #include "wx/timer.h"
 
 #include "wx/control.h"
 #include "wx/timer.h"


@@ -114,6 +114,8 @@ public:
     wxColour GetItemTextColour( long item ) const;
     void SetItemBackgroundColour( long item, const wxColour &col);
     wxColour GetItemBackgroundColour( long item ) const;
     wxColour GetItemTextColour( long item ) const;
     void SetItemBackgroundColour( long item, const wxColour &col);
     wxColour GetItemBackgroundColour( long item ) const;

+    void SetItemFont( long item, const wxFont &f);
+    wxFont GetItemFont( long item ) const;

     int GetSelectedItemCount() const;
     wxColour GetTextColour() const;
     void SetTextColour(const wxColour& col);
     int GetSelectedItemCount() const;
     wxColour GetTextColour() const;
     void SetTextColour(const wxColour& col);