corrections for Mac OS X

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 92eda5882ded333bc64f2815f3722f0bc7019365..84e7153375ece20bac7abac68973c4d1e520ffa3 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -27,11 +27,12 @@ class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxBitmapHandler;
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxCursor;

+class WXDLLEXPORT wxImage;

 
 

-GWorldPtr      wxMacCreateGWorld( int height , int widtdh , int depth ) ;
-void                           wxMacDestroyGWorld( GWorldPtr gw ) ;
+GWorldPtr      wxMacCreateGWorld( int width , int height , int depth ) ;
+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 ) ;
+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


@@ -61,6 +62,7 @@ public:
   bool Create(const wxBitmap& bitmap);
 
   // Implementation
   bool Create(const wxBitmap& bitmap);
 
   // Implementation

+  bool PointMasked(int x, int y);

   inline WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; }
   inline void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }
 protected:
   inline WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; }
   inline void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }
 protected:


@@ -100,6 +102,9 @@ class WXDLLEXPORT wxBitmapHandler: public wxObject
   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
+#endif

 
   virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
 
   virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,


@@ -138,6 +143,7 @@ public:
 
   // Initialize with XPM data
   wxBitmap(const char **data);
 
   // Initialize with XPM data
   wxBitmap(const char **data);

+  wxBitmap(char **data);

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


@@ -147,30 +153,41 @@ public:
 
   // If depth is omitted, will create a bitmap compatible with the display
   wxBitmap(int width, int height, int depth = -1);
 
   // 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();
   ~wxBitmap();

+  
+  wxImage ConvertToImage() const;
+
+  // get the given part of bitmap
+  wxBitmap GetSubBitmap( const wxRect& rect ) const;

 
   virtual bool Create(int width, int height, int depth = -1);
   virtual bool Create(void *data, long type, int width, int height, int depth = 1);
   virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
   virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
 
 
   virtual bool Create(int width, int height, int depth = -1);
   virtual bool Create(void *data, long type, int width, int height, int depth = 1);
   virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
   virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
 

-  inline bool Ok() const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
-  inline int GetWidth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }
-  inline int GetHeight() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_height : 0); }
-  inline int GetDepth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_depth : 0); }
-  inline int GetQuality() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_quality : 0); }
+  bool Ok() const;
+  int GetWidth() const;
+  int GetHeight() const;
+  int GetDepth() const;
+  int GetQuality() const;

   void SetWidth(int w);
   void SetHeight(int h);
   void SetDepth(int d);
   void SetQuality(int q);
   void SetOk(bool isOk);
 
   void SetWidth(int w);
   void SetHeight(int h);
   void SetDepth(int d);
   void SetQuality(int q);
   void SetOk(bool isOk);
 

-  inline wxPalette* GetPalette() const { return (M_BITMAPDATA ? (& M_BITMAPDATA->m_bitmapPalette) : (wxPalette*) NULL); }
+  wxPalette* GetPalette() const;

   void SetPalette(const wxPalette& palette);
 
   void SetPalette(const wxPalette& palette);
 

-  inline wxMask *GetMask() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_bitmapMask : (wxMask*) NULL); }
+  wxMask *GetMask() const;

   void SetMask(wxMask *mask) ;
 
   void SetMask(wxMask *mask) ;
 

+  int GetBitmapType() const;
+  

   inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
   inline bool operator == (const wxBitmap& bitmap) { return m_refData == bitmap.m_refData; }
   inline bool operator != (const wxBitmap& bitmap) { return m_refData != bitmap.m_refData; }
   inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
   inline bool operator == (const wxBitmap& bitmap) { return m_refData == bitmap.m_refData; }
   inline bool operator != (const wxBitmap& bitmap) { return m_refData != bitmap.m_refData; }


@@ -192,7 +209,10 @@ protected:
   // TODO: Implementation
 public:
   void SetHBITMAP(WXHBITMAP bmp);
   // TODO: Implementation
 public:
   void SetHBITMAP(WXHBITMAP bmp);

-  inline WXHBITMAP GetHBITMAP() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hBitmap : 0); }
+  WXHBITMAP GetHBITMAP() const;
+  
+  PicHandle GetPict() const;
+

   bool FreeResource(bool force = FALSE);
 };
 #endif
   bool FreeResource(bool force = FALSE);
 };
 #endif