Fixed wxHTML code in a Watcom Win32 DLL

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 85eaf59e8129979222668a282586058ebbecbf29..84e7153375ece20bac7abac68973c4d1e520ffa3 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -27,6 +27,7 @@ class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxCursor;
+class WXDLLEXPORT wxImage;
 
 GWorldPtr      wxMacCreateGWorld( int width , int height , int depth ) ;
 void           wxMacDestroyGWorld( GWorldPtr gw ) ;
@@ -152,7 +153,13 @@ 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);
+  
   ~wxBitmap();
+  
+  wxImage ConvertToImage() const;
 
   // get the given part of bitmap
   wxBitmap GetSubBitmap( const wxRect& rect ) const;