added wxGetCCDefaultFont() returning the default icon font

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

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

 
 

-#if defined(__WINDOWS__)
-#include "wx/msw/imaglist.h"
-#elif defined(__MOTIF__)
-#include "wx/generic/imaglist.h"
-#elif defined(__GTK__)
-#include "wx/generic/imaglist.h"
+#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
+    #include "wx/msw/imaglist.h"
+#else
+    #include "wx/generic/imaglist.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __IMAGLISTH_BASE__
+    // _WX_IMAGLIST_H_BASE_