Fixed OS/2 compilation problems.

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 6104c696eccb2f1166ad122aed6e57bc84d3bec9..1d9305e9aa4dc64d61146df08e31dc2275a7aac3 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -60,15 +60,23 @@ public:
 class WXDLLEXPORT wxIcon : public wxIconBase
 {
 public:
 class WXDLLEXPORT wxIcon : public wxIconBase
 {
 public:

-    wxIcon();
+    // ctors
+        // default
+    wxIcon() { }

 
 

-    // Copy constructors
+        // copy

     wxIcon(const wxIcon& icon) { Ref(icon); }
 
     wxIcon(const wxIcon& icon) { Ref(icon); }
 

+        // from raw data

     wxIcon(const char bits[], int width, int height);
     wxIcon(const char bits[], int width, int height);

+        // from XPM data
+    wxIcon(const char **data) { CreateIconFromXpm(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);
     wxIcon(const wxString& name,
            long type = wxBITMAP_TYPE_ICO_RESOURCE,
            int desiredWidth = -1, int desiredHeight = -1);

+

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


@@ -82,17 +90,26 @@ public:
     bool operator != (const wxIcon& icon) const
         { return m_refData != icon.m_refData; }
 
     bool operator != (const wxIcon& icon) const
         { return m_refData != icon.m_refData; }
 

+    // implementation only from now on

     wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
 
     void SetHICON(WXHICON icon) { SetHandle((WXHANDLE)icon); }
     WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
 
     wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
 
     void SetHICON(WXHICON icon) { SetHandle((WXHANDLE)icon); }
     WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
 

+    // 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);
+

 protected:
     virtual wxGDIImageRefData *CreateData() const
     {
         return new wxIconRefData;
     }
 
 protected:
     virtual wxGDIImageRefData *CreateData() const
     {
         return new wxIconRefData;
     }
 

+    // create from XPM data
+    void CreateIconFromXpm(const char **data);
+

 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };