put wxUSE_DATAVIEWCTRL in alphabetical order

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 1f273ebb070423a2bada1a977fa7422e786410b6..bcf9c53ca8df4b125625a5a376e9b217d7bf56aa 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,14 +1,29 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
 
 #include "wx/iconloc.h"
 
 #ifndef _WX_ICON_H_BASE_
 #define _WX_ICON_H_BASE_
 
 #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"
   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
   #include "wx/motif/icon.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

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

+#elif defined(__WXGTK__)
+  #include "wx/gtk1/icon.h"

 #elif defined(__WXX11__)
   #include "wx/x11/icon.h"
 #elif defined(__WXMGL__)
 #elif defined(__WXX11__)
   #include "wx/x11/icon.h"
 #elif defined(__WXMGL__)