added remark about wxMENU_TEAROFF being wxGTK only

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

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 7b9820cbb018f5261e158e9dadc99a5d6d1fdb22..d96f86a163a3bf19679d7e9dd69cb0c2b8aa07ec 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -28,6 +28,7 @@ class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxControl;
+class WXDLLEXPORT wxImage;
 
 // ----------------------------------------------------------------------------
 // Bitmap data
@@ -89,6 +90,9 @@ public:
 
     // If depth is omitted, will create a bitmap compatible with the display
     wxBitmap(int width, int height, int depth = -1);
+    
+    // Convert from wxImage:
+    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!
@@ -117,6 +121,8 @@ public:
 
     virtual ~wxBitmap();
 
+    wxImage ConvertToImage() const;
+
     // get the given part of bitmap
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
  
@@ -185,6 +191,9 @@ protected:
 
     // creates the bitmap from XPM data, supposed to be called from ctor
     bool CreateFromXpm(const char **bits);
+    // creates the bitmap from wxImage, supposed to be called from ctor
+    bool CreateFromImage(const wxImage& image, int depth);
+
 
 private:
 #ifdef __WIN32__