Update msw files to use the new definitions

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

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index c22eb5e56225e1f28de1019fd580a6144e6c17a0..efadb28ba19eea7d3eba6b307b50d689f3290b6f 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -15,7 +15,7 @@
 #include "wx/bitmap.h"
 
 // Icon
 #include "wx/bitmap.h"
 
 // Icon

-class WXDLLEXPORT wxIcon : public wxBitmap
+class WXDLLIMPEXP_CORE wxIcon : public wxBitmap

 {
 public:
     wxIcon();
 {
 public:
     wxIcon();


@@ -24,10 +24,12 @@ public:
     wxIcon(const char bits[], int width, int height);
 
     // Initialize with XPM data
     wxIcon(const char bits[], int width, int height);
 
     // Initialize with XPM data

-    wxIcon(const char **data);
+    wxIcon(const char* const* data);
+#ifdef wxNEEDS_CHARPP

     wxIcon(char **data);
     wxIcon(char **data);

+#endif

 
 

-    wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
+    wxIcon(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE,

            int desiredWidth = -1, int desiredHeight = -1)
     {
         LoadFile(name, type, desiredWidth, desiredHeight);
            int desiredWidth = -1, int desiredHeight = -1)
     {
         LoadFile(name, type, desiredWidth, desiredHeight);


@@ -41,25 +43,18 @@ public:
     virtual ~wxIcon();
 
     bool LoadFile(const wxString& name, wxBitmapType type,
     virtual ~wxIcon();
 
     bool LoadFile(const wxString& name, wxBitmapType type,

-                  int desiredWidth, int desiredHeight = -1);
+                  int desiredWidth, int desiredHeight);

 
 

-    // unhide base class LoadFile()
+    // unhide the base class version

     virtual bool LoadFile(const wxString& name,
     virtual bool LoadFile(const wxString& name,

-                          wxBitmapType type = wxBITMAP_TYPE_XPM)
-    {
-        return LoadFile(name, type, -1, -1);
-    }
+                          wxBitmapType flags = wxICON_DEFAULT_TYPE)
+        { return LoadFile(name, flags); }

 
     // create from bitmap (which should have a mask unless it's monochrome):
     // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 
 
     // create from bitmap (which should have a mask unless it's monochrome):
     // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 

-    bool operator == (const wxIcon& icon) const
-        { return m_refData == icon.m_refData; }
-    bool operator != (const wxIcon& icon) const
-        { return !(*this == icon); }
-

 
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };
 
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };