changed Refresh to take Rect as client coordinates not window coordinates

[wxWidgets.git] / src / mac / carbon / bitmap.cpp

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 1a59104b9eaf1bddae5348415d36a282de416be5..409d2fb3a82799c6abd6f96ac07250f56c689dc7 100644 (file)
--- 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,6 +25,8 @@
 #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__
@@ -239,7 +240,13 @@ wxBitmapRefData::~wxBitmapRefData()
   }
 }
 
-wxList wxBitmap::sm_handlers;
+wxList wxBitmapBase::sm_handlers;
+
+
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+{
+    Ref(icon) ;
+}
 
 wxBitmap::wxBitmap()
 {