added #if wxUSE_CMDLINE_PARSER around the header

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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 0fc15269f168473d943f91508da8df3c1ebaf852..c0507e1396bd1de9e4fee2e7eeec8d7af731d11f 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -32,10 +32,12 @@ typedef int (wxCALLBACK *wxListCtrlCompare)(long item1, long item2, long sortDat
 // style flags
 #define wxLC_VRULES          0x0001
 #define wxLC_HRULES          0x0002
 // style flags
 #define wxLC_VRULES          0x0001
 #define wxLC_HRULES          0x0002

+

 #define wxLC_ICON            0x0004
 #define wxLC_SMALL_ICON      0x0008
 #define wxLC_LIST            0x0010
 #define wxLC_REPORT          0x0020
 #define wxLC_ICON            0x0004
 #define wxLC_SMALL_ICON      0x0008
 #define wxLC_LIST            0x0010
 #define wxLC_REPORT          0x0020

+

 #define wxLC_ALIGN_TOP       0x0040
 #define wxLC_ALIGN_LEFT      0x0080
 #define wxLC_AUTOARRANGE     0x0100
 #define wxLC_ALIGN_TOP       0x0040
 #define wxLC_ALIGN_LEFT      0x0080
 #define wxLC_AUTOARRANGE     0x0100


@@ -276,25 +278,9 @@ private:
 // include the wxListCtrl class declaration
 // ----------------------------------------------------------------------------
 
 // include the wxListCtrl class declaration
 // ----------------------------------------------------------------------------
 

-#if defined(__WXUNIVERSAL__)
-    #include "wx/generic/listctrl.h"
-#elif defined(__WXMSW__)
-    #ifdef __WIN16__
-        #include "wx/generic/listctrl.h"
-    #else
-        #include "wx/msw/listctrl.h"
-    #endif
-#elif defined(__WXMOTIF__)
-    #include "wx/generic/listctrl.h"
-#elif defined(__WXGTK__)
-    #include "wx/generic/listctrl.h"
-#elif defined(__WXQT__)
-    #include "wx/generic/listctrl.h"
-#elif defined(__WXMAC__)
-    #include "wx/generic/listctrl.h"
-#elif defined(__WXPM__)
-    #include "wx/generic/listctrl.h"
-#elif defined(__WXSTUBS__)
+#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
+    #include "wx/msw/listctrl.h"
+#else

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