Fix horizontal mouse wheel scrolling in wxGTK.

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

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index c9c0e666214de5d2e6518da54297f757c409c2bc..763b9597f937dfe71b27cb95881d455924e400b8 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxBitmapBase
 // Author:      VaclavSlavik
 // Created:     2001/04/11
 // Purpose:     wxBitmapBase
 // Author:      VaclavSlavik
 // Created:     2001/04/11

-// RCS-ID:      $Id$

 // Copyright:   (c) 2001, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2001, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -20,17 +19,54 @@
 #ifndef WX_PRECOMP
     #include "wx/colour.h"
     #include "wx/icon.h"
 #ifndef WX_PRECOMP
     #include "wx/colour.h"
     #include "wx/icon.h"

+    #include "wx/image.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

+#if wxUSE_IMAGE && wxUSE_LIBPNG && wxUSE_STREAMS
+    #define wxHAS_PNG_LOAD
+
+    #include "wx/mstream.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // wxVariant support
 // ----------------------------------------------------------------------------
 
 #if wxUSE_VARIANT
 // ----------------------------------------------------------------------------
 // wxVariant support
 // ----------------------------------------------------------------------------
 
 #if wxUSE_VARIANT

-IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT)
-IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT)
+IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxBitmap,WXDLLEXPORT)
+IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxIcon,WXDLLEXPORT)

 #endif
 
 #endif
 

+#if wxUSE_EXTENDED_RTTI
+//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxBitmap>)
+//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxIcon>)
+#endif
+
+// ----------------------------------------------------------------------------
+// wxBitmapHelpers
+// ----------------------------------------------------------------------------
+
+// wxOSX has a native version and doesn't use this one.
+
+#ifndef __WXOSX__
+
+/* static */
+wxBitmap wxBitmapHelpers::NewFromPNGData(const void* data, size_t size)
+{
+    wxBitmap bitmap;
+
+#ifdef wxHAS_PNG_LOAD
+    wxMemoryInputStream is(data, size);
+    wxImage image(is, wxBITMAP_TYPE_PNG);
+    if ( image.IsOk() )
+        bitmap = wxBitmap(image);
+#endif // wxHAS_PNG_LOAD
+
+    return bitmap;
+}
+
+#endif // !__WXOSX__
+

 // ----------------------------------------------------------------------------
 // wxBitmapBase
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxBitmapBase
 // ----------------------------------------------------------------------------


@@ -41,22 +77,21 @@ IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT)
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/palette.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/palette.h"

-    #include "wx/image.h"

     #include "wx/module.h"
 #endif // WX_PRECOMP
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject)
     #include "wx/module.h"
 #endif // WX_PRECOMP
 
 
 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);
 }


@@ -126,28 +161,13 @@ void wxBitmapBase::CleanUpHandlers()
     }
 }
 
     }
 }
 

-bool wxBitmapHandlerBase::Create(wxBitmap*, const void*, long, int, int, int)
-{
-    return false;
-}
-
-bool wxBitmapHandlerBase::LoadFile(wxBitmap*, const wxString&, long, int, int)
-{
-    return false;
-}
-
-bool wxBitmapHandlerBase::SaveFile(const wxBitmap*, const wxString&, int, const wxPalette*)
-{
-    return false;
-}
-

 class wxBitmapBaseModule: public wxModule
 {
 DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
 public:
     wxBitmapBaseModule() {}
 class wxBitmapBaseModule: public wxModule
 {
 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)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)


@@ -166,11 +186,11 @@ wxBitmap::wxBitmap(const char* const* bits)
 
 #if wxUSE_IMAGE && wxUSE_XPM
     wxImage image(bits);
 
 #if wxUSE_IMAGE && wxUSE_XPM
     wxImage image(bits);

-    wxCHECK2_MSG(image.Ok(), return, wxT("invalid bitmap data"));
+    wxCHECK2_MSG(image.IsOk(), return, wxT("invalid bitmap data"));

 
     *this = wxBitmap(image);
 #else
 
     *this = wxBitmap(image);
 #else

-    wxFAIL_MSG(_T("creating bitmaps from XPMs not supported"));
+    wxFAIL_MSG(wxT("creating bitmaps from XPMs not supported"));

 #endif // wxUSE_IMAGE && wxUSE_XPM
 }
 #endif // !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__))
 #endif // wxUSE_IMAGE && wxUSE_XPM
 }
 #endif // !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__))