Misc small changes

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

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 12774bdff41e8a6e96e6081c5b5aa45465b51c7d..7aa92ee1bf7f0bbec246891dbc3dd3a23e8ceb4a 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -1,13 +1,23 @@
-#ifndef __IMAGLISTH_BASE__
-#define __IMAGLISTH_BASE__
+#ifndef _WX_IMAGLIST_H_BASE_
+#define _WX_IMAGLIST_H_BASE_

 
 

-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
+#ifdef __WIN16__
+#include "wx/generic/imaglist.h"
+#else

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

-#elif defined(__MOTIF__)
+#endif
+#elif defined(__WXMOTIF__)
+#include "wx/generic/imaglist.h"
+#elif defined(__WXGTK__)
+#include "wx/generic/imaglist.h"
+#elif defined(__WXQT__)
+#include "wx/generic/imaglist.h"
+#elif defined(__WXMAC__)

 #include "wx/generic/imaglist.h"
 #include "wx/generic/imaglist.h"

-#elif defined(__GTK__)
+#elif defined(__WXSTUBS__)

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

-    // __IMAGLISTH_BASE__
+    // _WX_IMAGLIST_H_BASE_