1. bug in wxString::find_first_of() fixed

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

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 82b5d302512b6e16565e79fa19bcbc9ad6ab29dc..cc0989f68b0e8d19d269d91c81292edc6b4af5e1 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -78,7 +78,8 @@ public:
     wxBitmap(const char bits[], int width, int height, int depth = 1);
 
     // Initialize with XPM data
     wxBitmap(const char bits[], int width, int height, int depth = 1);
 
     // Initialize with XPM data

-    wxBitmap(char **data, wxControl *anItem = NULL);
+    wxBitmap(const char **data) { CreateFromXpm(data); }
+    wxBitmap(char **data) { CreateFromXpm((const char **)data); }

 
     // Load a file or resource
     wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
 
     // Load a file or resource
     wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);


@@ -116,8 +117,8 @@ public:
 
     virtual ~wxBitmap();
 
 
     virtual ~wxBitmap();
 

-    // GRG, Dic/99
-    wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect ) const;
+    // get the given part of bitmap
+    wxBitmap GetSubBitmap( const wxRect& rect ) const;

  
     // copies the contents and mask of the given (colour) icon to the bitmap
     bool CopyFromIcon(const wxIcon& icon);
  
     // copies the contents and mask of the given (colour) icon to the bitmap
     bool CopyFromIcon(const wxIcon& icon);


@@ -182,6 +183,9 @@ protected:
     virtual wxGDIImageRefData *CreateData() const
         { return new wxBitmapRefData; }
 
     virtual wxGDIImageRefData *CreateData() const
         { return new wxBitmapRefData; }
 

+    // creates the bitmap from XPM data, supposed to be called from ctor
+    bool CreateFromXpm(const char **bits);
+

 private:
 #ifdef __WIN32__
     // common part of CopyFromIcon/CopyFromCursor for Win32
 private:
 #ifdef __WIN32__
     // common part of CopyFromIcon/CopyFromCursor for Win32