X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584bede0618774ad7f62476c9adddeb9776fb737..9ef63a4a59eccce6cd8787f0ed966bfa8365a22e:/include/wx/mac/bitmap.h

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 9308aca1c3..1760cca7b8 100644
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -13,11 +13,9 @@
 #define _WX_BITMAP_H_
 
 #ifdef __GNUG__
-#pragma interface "bitmap.h"
+  #pragma interface "bitmap.h"
 #endif
 
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
 #include "wx/palette.h"
 
 // Bitmap
@@ -29,12 +27,6 @@ class WXDLLEXPORT wxIcon;
 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
@@ -89,10 +81,10 @@ public:
   wxPalette     m_bitmapPalette;
   int           m_quality;
 
-	int						m_bitmapType ;
-	PicHandle			m_hPict ;
-	WXHBITMAP     m_hBitmap;
-	WXHICON m_hIcon ;
+	int			m_bitmapType ;
+	WXHMETAFILE	m_hPict ;
+	WXHBITMAP   m_hBitmap;
+	WXHICON     m_hIcon ;
   wxMask *      m_bitmapMask; // Optional mask
 };
 
@@ -103,8 +95,8 @@ class WXDLLEXPORT wxBitmapHandler: public wxBitmapHandlerBase
   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);
@@ -137,7 +129,7 @@ public:
 
   // 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);
@@ -197,19 +189,8 @@ public:
   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, wxBitmapType type);
-  static wxBitmapHandler *FindHandler(wxBitmapType type);
-
   static void InitStandardHandlers();
-  static void CleanUpHandlers();
 protected:
-  static wxList sm_handlers;
 
   // TODO: Implementation
 public:
@@ -218,7 +199,7 @@ public:
   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);
 };