!__WX_DC_BLIT_FIXED__ case

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

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index c9c0e666214de5d2e6518da54297f757c409c2bc..82bb30b7ab3a596cc25ad97a33758e3aac54be9c 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -20,6 +20,7 @@
 #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
 
 // ----------------------------------------------------------------------------


@@ -41,7 +42,6 @@ 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
 
     #include "wx/module.h"
 #endif // WX_PRECOMP
 


@@ -146,8 +146,8 @@ 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)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)