Native wxBitmapComboBox patch for GTK+

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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 4eae6667341c40099c8b9a0bdb3b58cb323bf7be..8bb9adcabce0da3bd531f06489bfc521a15c2788 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -22,7 +22,7 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];

 
 // ----------------------------------------------------------------------------
 // include the wxListCtrl class declaration
 
 // ----------------------------------------------------------------------------
 // include the wxListCtrl class declaration


@@ -30,6 +30,8 @@ extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"

+#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
+    #include "wx/mac/carbon/listctrl.h"

 #else
     #include "wx/generic/listctrl.h"
 #endif
 #else
     #include "wx/generic/listctrl.h"
 #endif


@@ -38,7 +40,7 @@ extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
 // wxListView: a class which provides a better API for list control
 // ----------------------------------------------------------------------------
 
 // wxListView: a class which provides a better API for list control
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListView : public wxListCtrl
+class WXDLLIMPEXP_CORE wxListView : public wxListCtrl

 {
 public:
     wxListView() { }
 {
 public:
     wxListView() { }


@@ -82,7 +84,7 @@ public:
         { return GetNextSelected(-1); }
 
     // return true if the item is selected
         { return GetNextSelected(-1); }
 
     // return true if the item is selected

-    bool IsSelected(long index)
+    bool IsSelected(long index) const

         { return GetItemState(index, wxLIST_STATE_SELECTED) != 0; }
 
     // columns
         { return GetItemState(index, wxLIST_STATE_SELECTED) != 0; }
 
     // columns