PyCrust updates

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 9308aca1c32910175a460786b7cb76633eb173d9..47ff793ac0781f095be5ffe0eeb2861686b39757 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


@@ -30,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


@@ -103,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);


@@ -137,7 +136,7 @@ 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 raw data.
   wxBitmap(const char bits[], int width, int height, int depth = 1);


@@ -197,19 +196,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; }
 
   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 InitStandardHandlers();

-  static void CleanUpHandlers();

 protected:
 protected:

-  static wxList sm_handlers;

 
   // TODO: Implementation
 public:
 
   // TODO: Implementation
 public: