1. deprecate redundantly sounding wxArtProvider::FooProvider() to just Foo()

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

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index a500a84a9774a47fbc600c3e20a3798b92fc1cf8..9cf6d614f9a3dd2084d5204df4b5499179be0c1c 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -16,17 +16,21 @@
 
 #if wxUSE_IMAGE
 
 
 #if wxUSE_IMAGE
 

+#include "wx/imagbmp.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif

     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/bitmap.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/bitmap.h"

-    #include "wx/module.h"
+    #include "wx/palette.h"
+    #include "wx/intl.h"

 #endif
 
 #endif
 

-#include "wx/imagbmp.h"

 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"

-#include "wx/intl.h"

 #include "wx/quantize.h"
 
 // For memcpy
 #include "wx/quantize.h"
 
 // For memcpy


@@ -38,10 +42,6 @@
 #endif
 #endif
 
 #endif
 #endif
 

-#ifdef __WXMSW__
-#include "wx/msw/wrapwin.h"
-#endif
-

 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------