typo in style definition fixed

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 7cc0160c274ee1e7966ed2eae4336df8711f7188..1760cca7b8b7412ed0a557e1691bec4c5398bbea 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -27,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


@@ -87,10 +81,10 @@ public:
   wxPalette     m_bitmapPalette;
   int           m_quality;
 
   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
 };
 
   wxMask *      m_bitmapMask; // Optional mask
 };
 


@@ -135,7 +129,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);


@@ -195,17 +189,7 @@ 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:
 
   // TODO: Implementation
 protected:
 
   // TODO: Implementation


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