check for wxUSE_TIMER in headers, not the files including them

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

diff --git a/include/wx/editlbox.h b/include/wx/editlbox.h
index ad946eee7d75595dfafb60714058ae19d215c01a..59236bcf3f10b5bd5422b044a8e96130466b177b 100644 (file)
--- a/include/wx/editlbox.h
+++ b/include/wx/editlbox.h
@@ -17,9 +17,9 @@
 
 #include "wx/panel.h"
 
 
 #include "wx/panel.h"
 

-class WXDLLEXPORT wxBitmapButton;
-class WXDLLEXPORT wxListCtrl;
-class WXDLLEXPORT wxListEvent;
+class WXDLLIMPEXP_FWD_CORE wxBitmapButton;
+class WXDLLIMPEXP_FWD_CORE wxListCtrl;
+class WXDLLIMPEXP_FWD_CORE wxListEvent;

 
 #define wxEL_ALLOW_NEW          0x0100
 #define wxEL_ALLOW_EDIT         0x0200
 
 #define wxEL_ALLOW_NEW          0x0100
 #define wxEL_ALLOW_EDIT         0x0200


@@ -27,7 +27,7 @@ class WXDLLEXPORT wxListEvent;
 #define wxEL_NO_REORDER         0x0800
 #define wxEL_DEFAULT_STYLE      (wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE)
 
 #define wxEL_NO_REORDER         0x0800
 #define wxEL_DEFAULT_STYLE      (wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE)
 

-extern WXDLLEXPORT_DATA(const wxChar) wxEditableListBoxNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxEditableListBoxNameStr[];

 
 // This class provides a composite control that lets the
 // user easily enter list of strings
 
 // This class provides a composite control that lets the
 // user easily enter list of strings