X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b7f2165565bb33b149baf1272e28f9a61d579d3..3abf2c720bea956795f6958e21db292cde614f52:/include/wx/msw/icon.h?ds=inline

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 101671a656..1d9305e9aa 100644
--- 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; }
 
+    // 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(); }
 
+    // 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
     {
@@ -104,9 +110,6 @@ protected:
     // 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)
 };