changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 2baded96c354999b57f7189a263b64314144d708..4fa9b5d22500aca5fdbb55b5521aa9dd5d054d56 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,18 +1,24 @@
 #ifndef _WX_ICON_H_BASE_
 #define _WX_ICON_H_BASE_
 
 #ifndef _WX_ICON_H_BASE_
 #define _WX_ICON_H_BASE_
 

+/* Commenting out since duplicated in gdicmn.h
+// this is for Unix (i.e. now for anything other than MSW)
+#undef  wxICON
+#define wxICON(icon_name)   wxIcon(icon_name##_xpm)
+*/
+

 #if defined(__WXMSW__)
 #if defined(__WXMSW__)

-#include "wx/msw/icon.h"
+  #include "wx/msw/icon.h"

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

-#include "wx/motif/icon.h"
+  #include "wx/motif/icon.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/gtk/icon.h"
+  #include "wx/gtk/icon.h"

 #elif defined(__WXQT__)
 #elif defined(__WXQT__)

-#include "wx/qt/icon.h"
+  #include "wx/qt/icon.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/icon.h"
+  #include "wx/mac/icon.h"

 #elif defined(__WXSTUBS__)
 #elif defined(__WXSTUBS__)

-#include "wx/stubs/icon.h"
+  #include "wx/stubs/icon.h"

 #endif
 
 #endif
 #endif
 
 #endif