]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/bmpbase.cpp
Fix warning for unknown menu stock id.
[wxWidgets.git] / src / common / bmpbase.cpp
index 9d9d41ae9f3f910574650fd71f0085df2fbd558b..4a5ca4d8980e9ccb18778da4e5d3f990237c4b22 100644 (file)
     #pragma hdrstop
 #endif
 
+#include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+    #include "wx/icon.h"
+#endif // WX_PRECOMP
+
+// ----------------------------------------------------------------------------
+// wxVariant support
+// ----------------------------------------------------------------------------
+
+#if wxUSE_VARIANT
+IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT)
+IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT)
+#endif
+
 // ----------------------------------------------------------------------------
 // wxBitmapBase
 // ----------------------------------------------------------------------------
 
 #if wxUSE_BITMAP_BASE
 
-#include "wx/bitmap.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
 
+
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject)
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandlerBase,wxObject)
 
@@ -159,4 +173,3 @@ bool wxMaskBase::Create(const wxBitmap& bitmap)
 
     return InitFromMonoBitmap(bitmap);
 }
-