don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 19c9cd13831e1d7531a2462ba0d39482e09f5746..ccf2a0548f4e9e018e9051a4510710af393b617d 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -30,8 +30,8 @@ extern WXDLLIMPEXP_DATA_CORE(const char) 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/osx/carbon/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