fixed off by one error in wxXPMDecoder::ReadFile

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

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index e306018665cc908955ee29cced755523aac85d31..4cdf6c0940288a315eb4dbb86e1f2abacad9b801 100644 (file)
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/icon.h
@@ -31,25 +31,31 @@ class wxIcon;
 
 class wxIcon: public wxBitmap
 {
 
 class wxIcon: public wxBitmap
 {

-  DECLARE_DYNAMIC_CLASS(wxIcon)
-

 public:
 public:

-
-  wxIcon();
-  wxIcon( const wxIcon& icon);
-  wxIcon( const char **bits, int width=-1, int height=-1 );
-
-  // For compatibility with wxMSW where desired size is sometimes required to
-  // distinguish between multiple icons in a resource.
-  wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM, int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ):
-    wxBitmap(filename, type)
-  {
-  }
-  wxIcon( char **bits, int width=-1, int height=-1 );
-
-  wxIcon& operator = (const wxIcon& icon);
-  inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
-  inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+    wxIcon();
+    wxIcon( const wxIcon& icon);
+    wxIcon( const char **bits, int width=-1, int height=-1 );
+
+    // For compatibility with wxMSW where desired size is sometimes required to
+    // distinguish between multiple icons in a resource.
+    wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM, 
+            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
+        wxBitmap(filename, type)
+    {
+    }
+    wxIcon( char **bits, int width=-1, int height=-1 );
+
+    wxIcon& operator = (const wxIcon& icon);
+    inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
+    inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+
+    // 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);
+  
+private:
+    DECLARE_DYNAMIC_CLASS(wxIcon)

 };
 
 
 };