moved smart phone test to chkconf.h from features.h

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 5c14c2129fad90e4c6831ca399008a3eb67d5cb3..f9a08a3c916092c9c959457dbb67e60800dd693d 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -20,23 +20,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-// compatible (even if incorrect) behaviour by default: derive wxIcon from
-// wxBitmap
-#ifndef wxICON_IS_BITMAP
-    #define wxICON_IS_BITMAP 0
-#endif
-
-#if wxICON_IS_BITMAP
-    #include "wx/bitmap.h"
-
-    #define wxIconRefDataBase   wxBitmapRefData
-    #define wxIconBase          wxBitmap
-#else
-    #include "wx/msw/gdiimage.h"
-
-    #define wxIconRefDataBase   wxGDIImageRefData
-    #define wxIconBase          wxGDIImage
-#endif
+#include "wx/msw/gdiimage.h"

 
 // ---------------------------------------------------------------------------
 // icon data
 
 // ---------------------------------------------------------------------------
 // icon data


@@ -44,7 +28,7 @@
 
 // notice that although wxIconRefData inherits from wxBitmapRefData, it is not
 // a valid wxBitmapRefData
 
 // notice that although wxIconRefData inherits from wxBitmapRefData, it is not
 // a valid wxBitmapRefData

-class WXDLLEXPORT wxIconRefData : public wxIconRefDataBase
+class WXDLLEXPORT wxIconRefData : public wxGDIImageRefData

 {
 public:
     wxIconRefData() { }
 {
 public:
     wxIconRefData() { }


@@ -57,7 +41,7 @@ public:
 // Icon
 // ---------------------------------------------------------------------------
 
 // Icon
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxIcon : public wxIconBase
+class WXDLLEXPORT wxIcon : public wxGDIImage

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -69,14 +53,19 @@ public:
 
         // from raw data
     wxIcon(const char bits[], int width, int height);
 
         // from raw data
     wxIcon(const char bits[], int width, int height);

+

         // from XPM data
     wxIcon(const char **data) { CreateIconFromXpm(data); }
         // from XPM data
     wxIcon(const char **data) { CreateIconFromXpm(data); }

+

     wxIcon(char **data) { CreateIconFromXpm((const char **)data); }
     wxIcon(char **data) { CreateIconFromXpm((const char **)data); }

+

         // from resource/file
     wxIcon(const wxString& name,
            long type = wxBITMAP_TYPE_ICO_RESOURCE,
            int desiredWidth = -1, int desiredHeight = -1);
 
         // from resource/file
     wxIcon(const wxString& name,
            long type = wxBITMAP_TYPE_ICO_RESOURCE,
            int desiredWidth = -1, int desiredHeight = -1);
 

+    wxIcon(const wxIconLocation& loc);
+

     virtual ~wxIcon();
 
     virtual bool LoadFile(const wxString& name,
     virtual ~wxIcon();
 
     virtual bool LoadFile(const wxString& name,