wxMGL support for std dialogs

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 5f42224be9049a01b1cf751b2703a9aae227648f..b7c8cdc11f84e02f16f5c295524a06420917056e 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -28,9 +28,10 @@ class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxImage;
 
 GWorldPtr      wxMacCreateGWorld( int width , int height , int depth ) ;
 class WXDLLEXPORT wxImage;
 
 GWorldPtr      wxMacCreateGWorld( int width , int height , int depth ) ;

-void           wxMacDestroyGWorld( GWorldPtr gw ) ;
+void               wxMacDestroyGWorld( GWorldPtr gw ) ;

 PicHandle      wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ) ;
 PicHandle      wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ) ;

-void           wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;
+CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize  ) ;
+void               wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;

 CTabHandle     wxMacCreateColorTable( int numColors ) ;
 
 // A mask is a mono bitmap used for drawing bitmaps
 CTabHandle     wxMacCreateColorTable( int numColors ) ;
 
 // A mask is a mono bitmap used for drawing bitmaps


@@ -101,8 +102,8 @@ class WXDLLEXPORT wxBitmapHandler: public wxBitmapHandlerBase
   DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 public:
   wxBitmapHandler() { m_name = ""; m_extension = ""; m_type = 0; };
   DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 public:
   wxBitmapHandler() { m_name = ""; m_extension = ""; m_type = 0; };

-#ifdef __WXMAC_X__
-  virtual ~wxBitmapHandler() {}  // Added min for Mac X
+#ifdef __DARWIN__
+  virtual ~wxBitmapHandler() { }

 #endif
 
   virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
 #endif
 
   virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);