Use "_x64" instead of "amd64" for x64 MSW makefile builds.

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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 9c289e604c0625a5899ee365a81f1659c49ed25e..de43556b2cd154325dd94b919c84d3c02f5d783d 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -12,10 +12,6 @@
 #ifndef _WX_LISTCTRL_H_BASE_
 #define _WX_LISTCTRL_H_BASE_
 
 #ifndef _WX_LISTCTRL_H_BASE_
 #define _WX_LISTCTRL_H_BASE_
 

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

 #include "wx/defs.h" // headers should include this before first wxUSE_XXX check
 
 #if wxUSE_LISTCTRL
 #include "wx/defs.h" // headers should include this before first wxUSE_XXX check
 
 #if wxUSE_LISTCTRL


@@ -26,14 +22,16 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

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

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

-#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)

     #include "wx/msw/listctrl.h"
     #include "wx/msw/listctrl.h"

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

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


@@ -42,7 +40,7 @@ WXDLLEXPORT_DATA(extern 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() { }


@@ -86,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