compilation fix after incorrectly resolved conflict

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

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 69062ef67e563ff55b5cd1f0601f3b192ec8a193..32f5922bd764f0aed6e88fd048392f29fb5facdf 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -1,15 +1,25 @@
-#ifndef __IMAGLISTH_BASE__
-#define __IMAGLISTH_BASE__
+#ifndef _WX_IMAGLIST_H_BASE_
+#define _WX_IMAGLIST_H_BASE_
 
 #if defined(__WXMSW__)
+#ifdef __WIN16__
+#include "wx/generic/imaglist.h"
+#else
 #include "wx/msw/imaglist.h"
+#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"
+#elif defined(__WXPM__)
+#include "wx/generic/imaglist.h"
+#elif defined(__WXSTUBS__)
+#include "wx/generic/imaglist.h"
 #endif
 
 #endif
-    // __IMAGLISTH_BASE__
+    // _WX_IMAGLIST_H_BASE_