As per wx-dev, split the sort arrow options out to a separate parameter.

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index c0af6c26c2f6ad935efb7d979d929c702d351b76..34993fdb40db8b8372eaccd76af814dd79a83dae 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,20 +1,36 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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(__PALMOS__)
-  #include "wx/palmos/icon.h"
+#if defined(__WXPALMOS__)
+  #include "wx/generic/icon.h"

 #elif defined(__WXMSW__)
   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
   #include "wx/motif/icon.h"
 #elif defined(__WXMSW__)
   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
   #include "wx/motif/icon.h"

+#elif defined(__WXGTK20__)
+  #include "wx/generic/icon.h"

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

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

 #elif defined(__WXX11__)
 #elif defined(__WXX11__)

-  #include "wx/x11/icon.h"
+  #include "wx/generic/icon.h"

 #elif defined(__WXMGL__)
 #elif defined(__WXMGL__)

-  #include "wx/mgl/icon.h"
+  #define wxICON_DEFAULT_BITMAP_TYPE wxBITMAP_TYPE_ICO_RESOURCE
+  #include "wx/generic/icon.h"
+#elif defined(__WXDFB__)
+  #include "wx/generic/icon.h"

 #elif defined(__WXMAC__)
   #include "wx/mac/icon.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
   #include "wx/mac/icon.h"
 #elif defined(__WXCOCOA__)