X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8562f5520233a37151f453f91a82cb9c4636510..689471fc3ab6adf5649894eca8b3c6513081f012:/src/mac/carbon/bitmap.cpp

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 1a59104b9e..ff66eaff0f 100644
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -10,13 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
+#pragma implementation "bitmapbase.h"
 #pragma implementation "bitmap.h"
 #endif
 
-#include "wx/wx.h"
-#include "wx/setup.h"
-#include "wx/utils.h"
-#include "wx/palette.h"
+#include "wx/defs.h"
+
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/log.h"
@@ -26,9 +25,11 @@
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase , wxGDIObject )
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandlerBase, wxObject ) 
 #endif
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
     #include <ApplicationServices/ApplicationServices.h>
 #else
     #include <PictUtils.h>
@@ -239,7 +240,13 @@ wxBitmapRefData::~wxBitmapRefData()
   }
 }
 
-wxList wxBitmap::sm_handlers;
+wxList wxBitmapBase::sm_handlers;
+
+
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+{
+    Ref(icon) ;
+}
 
 wxBitmap::wxBitmap()
 {
@@ -834,7 +841,7 @@ PicHandle wxBitmap::GetPict() const
 
    if( mask )
    {
-#ifdef __UNIX__
+#ifdef __DARWIN__
        RGBColor trans = white;
 #else
        RGBBackColor( &gray );