made some wxHtmlEntitiesParser's methods public -- turned out they are useful

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index a696eb125a06f05cb5fbb3ecb3d62909ff064a43..7cc0160c274ee1e7966ed2eae4336df8711f7188 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -13,11 +13,9 @@
 #define _WX_BITMAP_H_
 
 #ifdef __GNUG__
 #define _WX_BITMAP_H_
 
 #ifdef __GNUG__

-#pragma interface "bitmap.h"
+  #pragma interface "bitmap.h"

 #endif
 
 #endif
 

-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"

 #include "wx/palette.h"
 
 // Bitmap
 #include "wx/palette.h"
 
 // Bitmap


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


@@ -61,13 +60,14 @@ 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:
   WXHBITMAP m_maskBitmap;
 };
 
   inline WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; }
   inline void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }
 protected:
   WXHBITMAP m_maskBitmap;
 };
 

-enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict } ;
+enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict , kMacBitmapTypeIcon } ;

 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {


@@ -90,24 +90,25 @@ public:
        int                                             m_bitmapType ;
        PicHandle                       m_hPict ;
        WXHBITMAP     m_hBitmap;
        int                                             m_bitmapType ;
        PicHandle                       m_hPict ;
        WXHBITMAP     m_hBitmap;

+       WXHICON m_hIcon ;

   wxMask *      m_bitmapMask; // Optional mask
 };
 
 #define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
 
   wxMask *      m_bitmapMask; // Optional mask
 };
 
 #define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
 

-class WXDLLEXPORT wxBitmapHandler: public wxObject
+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);
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth, int desiredHeight);
 #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,
       int desiredWidth, int desiredHeight);

-  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
+  virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);

 
   inline void SetName(const wxString& name) { m_name = name; }
   inline void SetExtension(const wxString& ext) { m_extension = ext; }
 
   inline void SetName(const wxString& name) { m_name = name; }
   inline void SetExtension(const wxString& ext) { m_extension = ext; }


@@ -123,7 +124,7 @@ protected:
 
 #define M_BITMAPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
 
 
 #define M_BITMAPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
 

-class WXDLLEXPORT wxBitmap: public wxGDIObject
+class WXDLLEXPORT wxBitmap: public wxBitmapBase

 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)
 
 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)
 


@@ -140,41 +141,56 @@ public:
   wxBitmap(const char bits[], int width, int height, int depth = 1);
 
   // Initialize with XPM data
   wxBitmap(const char bits[], int width, int height, int depth = 1);
 
   // Initialize with XPM data

-  wxBitmap(const char **data);
-  wxBitmap(char **data);
+  bool CreateFromXpm(const char **bits);
+  wxBitmap(const char **bits);
+  wxBitmap(char **bits);

 
   // Load a file or resource
 
   // Load a file or resource

-  wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_PICT_RESOURCE);
+  wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_PICT_RESOURCE);

 
   // Constructor for generalised creation from data
 
   // Constructor for generalised creation from data

-  wxBitmap(void *data, long type, int width, int height, int depth = 1);
+  wxBitmap(void *data, wxBitmapType type, 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);
 
   // 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(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); }
+  virtual bool Create(void *data, wxBitmapType type, int width, int height, int depth = 1);
+  virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
+  virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
+
+  // copies the contents and mask of the given (colour) icon to the bitmap
+  virtual bool CopyFromIcon(const wxIcon& icon);
+
+  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; }


@@ -185,19 +201,22 @@ public:
   static void InsertHandler(wxBitmapHandler *handler);
   static bool RemoveHandler(const wxString& name);
   static wxBitmapHandler *FindHandler(const wxString& name);
   static void InsertHandler(wxBitmapHandler *handler);
   static bool RemoveHandler(const wxString& name);
   static wxBitmapHandler *FindHandler(const wxString& name);

-  static wxBitmapHandler *FindHandler(const wxString& extension, long bitmapType);
-  static wxBitmapHandler *FindHandler(long bitmapType);
+  static wxBitmapHandler *FindHandler(const wxString& extension, wxBitmapType type);
+  static wxBitmapHandler *FindHandler(wxBitmapType type);

 
   static void InitStandardHandlers();
   static void CleanUpHandlers();
 protected:
 
   static void InitStandardHandlers();
   static void CleanUpHandlers();
 protected:

-  static wxList sm_handlers;

 
   // 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;
+  void SetHICON(WXHICON ico);
+  inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); }

   
   

+  PicHandle GetPict() const;
+

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