Window management and sizer layout corrections

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index baacd60aa824cc23c1539fc2b97fa9b38d10ce34..f5d99b666de8579ca8426408c63ecaa8cb4e0adb 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -29,6 +29,7 @@ class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxControl;
+class WXDLLEXPORT wxImage;
 
 // ----------------------------------------------------------------------------
 // Bitmap data
@@ -83,8 +84,8 @@ public:
             );
 
     // Initialize with XPM data
-    wxBitmap(const char** ppData);
-    wxBitmap(char** ppData);
+    wxBitmap(const char** ppData) { CreateFromXpm(ppData); }
+    wxBitmap(char** ppData) { CreateFromXpm((const char**)ppData); }
 
     // Load a file or resource
     wxBitmap( const wxString& rName
@@ -105,6 +106,9 @@ public:
              ,int nDepth = -1
             );
 
+    wxBitmap( const wxImage& image, int depth = -1 )
+                         { (void)CreateFromImage(image, depth); }
+
     // we must have this, otherwise icons are silently copied into bitmaps using
     // the copy ctor but the resulting bitmap is invalid!
     inline wxBitmap(const wxIcon& rIcon)
@@ -132,6 +136,8 @@ public:
 
     virtual ~wxBitmap();
 
+    wxImage ConvertToImage() const;
+
     // get the given part of bitmap
     wxBitmap GetSubBitmap(const wxRect& rRect) const;
 
@@ -225,7 +231,8 @@ protected:
         { return new wxBitmapRefData; }
 
     // creates the bitmap from XPM data, supposed to be called from ctor
-    bool CreateFromXpm(const char **bits);
+    bool CreateFromXpm(const char** ppData);
+    bool CreateFromImage(const wxImage& image, int depth);
 
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);