fixed typo in wxString::swap() which was completely broken

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 84e7153375ece20bac7abac68973c4d1e520ffa3..02f03186fc72a43119d61fd69d827656d1be53ef 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


@@ -29,12 +27,6 @@ class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxImage;
 
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxImage;
 

-GWorldPtr      wxMacCreateGWorld( int width , int height , int depth ) ;
-void           wxMacDestroyGWorld( GWorldPtr gw ) ;
-PicHandle      wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ) ;
-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
 // transparently.
 class WXDLLEXPORT wxMask: public wxObject
 // A mask is a mono bitmap used for drawing bitmaps
 // transparently.
 class WXDLLEXPORT wxMask: public wxObject


@@ -69,7 +61,7 @@ protected:
   WXHBITMAP m_maskBitmap;
 };
 
   WXHBITMAP m_maskBitmap;
 };
 

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

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


@@ -89,27 +81,28 @@ public:
   wxPalette     m_bitmapPalette;
   int           m_quality;
 
   wxPalette     m_bitmapPalette;
   int           m_quality;
 

-       int                                             m_bitmapType ;
-       PicHandle                       m_hPict ;
-       WXHBITMAP     m_hBitmap;
+       int                     m_bitmapType ;
+       WXHMETAFILE     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; }


@@ -125,7 +118,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)
 


@@ -136,20 +129,21 @@ public:
 
   // Copy constructors
   inline wxBitmap(const wxBitmap& bitmap)
 
   // Copy constructors
   inline wxBitmap(const wxBitmap& bitmap)

-  { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }
+  { Ref(bitmap); }

 
   // Initialize with raw data.
   wxBitmap(const char bits[], int width, int height, int depth = 1);
 
   // Initialize with XPM data
 
   // Initialize with raw 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);


@@ -165,9 +159,12 @@ public:
   wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
   virtual bool Create(int width, int height, int depth = -1);
   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(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;
 
   bool Ok() const;
   int GetWidth() const;


@@ -189,29 +186,20 @@ public:
   int GetBitmapType() const;
   
   inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
   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; }
-
-  // Format handling
-  static inline wxList& GetHandlers() { return sm_handlers; }
-  static void AddHandler(wxBitmapHandler *handler);
-  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);
+  inline bool operator == (const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
+  inline bool operator != (const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }

 
   static void InitStandardHandlers();
 
   static void InitStandardHandlers();

-  static void CleanUpHandlers();

 protected:
 protected:

-  static wxList sm_handlers;

 
   // TODO: Implementation
 public:
   void SetHBITMAP(WXHBITMAP bmp);
   WXHBITMAP GetHBITMAP() const;
 
   // TODO: Implementation
 public:
   void SetHBITMAP(WXHBITMAP bmp);
   WXHBITMAP GetHBITMAP() const;

+  void SetHICON(WXHICON ico);
+  inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); }

   
   

-  PicHandle GetPict() const;
+  WXHMETAFILE GetPict() const;

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