Make wxJoystick::GetNumberJoystick a static method, as the number of

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 4fa9b5d22500aca5fdbb55b5521aa9dd5d054d56..4bccbc43d95c56c6d455a2bfa998b315b54ae0b3 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,24 +1,37 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/icon.h
+// Purpose:     wxIcon base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #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)
-*/
+#include "wx/iconloc.h"
 
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+  #include "wx/palmos/icon.h"
+#elif defined(__WXMSW__)
   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
   #include "wx/motif/icon.h"
 #elif defined(__WXGTK__)
   #include "wx/gtk/icon.h"
-#elif defined(__WXQT__)
-  #include "wx/qt/icon.h"
+#elif defined(__WXX11__)
+  #include "wx/x11/icon.h"
+#elif defined(__WXMGL__)
+  #include "wx/mgl/icon.h"
 #elif defined(__WXMAC__)
   #include "wx/mac/icon.h"
-#elif defined(__WXSTUBS__)
-  #include "wx/stubs/icon.h"
+#elif defined(__WXCOCOA__)
+  #include "wx/cocoa/icon.h"
+#elif defined(__WXPM__)
+  #include "wx/os2/icon.h"
 #endif
 
 #endif