fixing osx_cocoa

[wxWidgets.git] / src / common / bmpbase.cpp

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index bf581183f0a7e04ccbc2a22025ab658b911d70a1..34bf85608ed8911b2be3e0a6d818d06f1a0e4a19 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -15,34 +15,53 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"
+#endif // WX_PRECOMP
+
+// ----------------------------------------------------------------------------
+// wxVariant support
+// ----------------------------------------------------------------------------
+
+#if wxUSE_VARIANT
+IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxBitmap,WXDLLEXPORT)
+IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxIcon,WXDLLEXPORT)
+#endif
+
+#if wxUSE_EXTENDED_RTTI
+//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxBitmap>)
+//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxIcon>)
+#endif
+

 // ----------------------------------------------------------------------------
 // wxBitmapBase
 // ----------------------------------------------------------------------------
 
 #if wxUSE_BITMAP_BASE
 
 // ----------------------------------------------------------------------------
 // wxBitmapBase
 // ----------------------------------------------------------------------------
 
 #if wxUSE_BITMAP_BASE
 

-#include "wx/bitmap.h"
-

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/palette.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/palette.h"

-    #include "wx/icon.h"
-    #include "wx/image.h"

     #include "wx/module.h"
 #endif // WX_PRECOMP
 
     #include "wx/module.h"
 #endif // WX_PRECOMP
 

+

 IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject)
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject)

-IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandlerBase,wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxObject)

 
 wxList wxBitmapBase::sm_handlers;
 
 
 wxList wxBitmapBase::sm_handlers;
 

-void wxBitmapBase::AddHandler(wxBitmapHandlerBase *handler)
+void wxBitmapBase::AddHandler(wxBitmapHandler *handler)

 {
     sm_handlers.Append(handler);
 }
 
 {
     sm_handlers.Append(handler);
 }
 

-void wxBitmapBase::InsertHandler(wxBitmapHandlerBase *handler)
+void wxBitmapBase::InsertHandler(wxBitmapHandler *handler)

 {
     sm_handlers.Insert(handler);
 }
 {
     sm_handlers.Insert(handler);
 }


@@ -117,11 +136,66 @@ class wxBitmapBaseModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
 public:
     wxBitmapBaseModule() {}
 DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
 public:
     wxBitmapBaseModule() {}

-    bool OnInit() { wxBitmap::InitStandardHandlers(); return true; };
-    void OnExit() { wxBitmap::CleanUpHandlers(); };
+    bool OnInit() { wxBitmap::InitStandardHandlers(); return true; }
+    void OnExit() { wxBitmap::CleanUpHandlers(); }

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
 
 #endif // wxUSE_BITMAP_BASE
 
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
 
 #endif // wxUSE_BITMAP_BASE
 

+// ----------------------------------------------------------------------------
+// wxBitmap common
+// ----------------------------------------------------------------------------
+
+#if !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__))
+
+wxBitmap::wxBitmap(const char* const* bits)
+{
+    wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
+
+#if wxUSE_IMAGE && wxUSE_XPM
+    wxImage image(bits);
+    wxCHECK2_MSG(image.IsOk(), return, wxT("invalid bitmap data"));
+
+    *this = wxBitmap(image);
+#else
+    wxFAIL_MSG(wxT("creating bitmaps from XPMs not supported"));
+#endif // wxUSE_IMAGE && wxUSE_XPM
+}
+#endif // !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__))
+
+// ----------------------------------------------------------------------------
+// wxMaskBase
+// ----------------------------------------------------------------------------
+
+bool wxMaskBase::Create(const wxBitmap& bitmap, const wxColour& colour)
+{
+    FreeData();
+
+    return InitFromColour(bitmap, colour);
+}
+
+#if wxUSE_PALETTE
+
+bool wxMaskBase::Create(const wxBitmap& bitmap, int paletteIndex)
+{
+    wxPalette *pal = bitmap.GetPalette();
+
+    wxCHECK_MSG( pal, false,
+                 wxT("Cannot create mask from palette index of a bitmap without palette") );
+
+    unsigned char r,g,b;
+    pal->GetRGB(paletteIndex, &r, &g, &b);
+
+    return Create(bitmap, wxColour(r, g, b));
+}
+
+#endif // wxUSE_PALETTE
+
+bool wxMaskBase::Create(const wxBitmap& bitmap)
+{
+    FreeData();
+
+    return InitFromMonoBitmap(bitmap);
+}