fix printf() argument type in GetOsInfo()

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

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 12774bdff41e8a6e96e6081c5b5aa45465b51c7d..1b2c2c4cc28dd82828c90b96dc39c82a79c99c50 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -1,13 +1,24 @@
-#ifndef __IMAGLISTH_BASE__
-#define __IMAGLISTH_BASE__
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/imaglist.h
+// Purpose:     wxImageList base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
 
-#if defined(__WINDOWS__)
-#include "wx/msw/imaglist.h"
-#elif defined(__MOTIF__)
-#include "wx/generic/imaglist.h"
-#elif defined(__GTK__)
-#include "wx/generic/imaglist.h"
+#ifndef _WX_IMAGLIST_H_BASE_
+#define _WX_IMAGLIST_H_BASE_
+
+#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
+    #include "wx/msw/imaglist.h"
+#elif defined(__WXMAC_CARBON__)
+    #include "wx/mac/imaglist.h"
+#else
+    #include "wx/generic/imaglist.h"
 #endif
 
 #endif
-    // __IMAGLISTH_BASE__
+    // _WX_IMAGLIST_H_BASE_