added IsSizeDeferred() (part of patch 1199639)

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 6d892226290caa2bc22bf086faa7112f0903edd3..4bccbc43d95c56c6d455a2bfa998b315b54ae0b3 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,13 +1,22 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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"