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 4583310223a01bbb8cb700de8b9c7f69347da2a3..f9a08a3c916092c9c959457dbb67e60800dd693d 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -53,16 +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
         // from XPM data

-#ifndef __DIGITALMARS__

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

-#endif
+

     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,