compilation warning (and possible bug) fix

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 101671a656860397cfa28d0d10d1b76b0f068578..1d9305e9aa4dc64d61146df08e31dc2275a7aac3 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -90,11 +90,17 @@ 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
     {
 protected:
     virtual wxGDIImageRefData *CreateData() const
     {


@@ -104,9 +110,6 @@ protected:
     // create from XPM data
     void CreateIconFromXpm(const char **data);
 
     // create from XPM data
     void CreateIconFromXpm(const char **data);
 

-    // create from bitmap (which should have a mask unless it's monochrome)
-    void CopyFromBitmap(const wxBitmap& bmp);
-

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