Corrections to take into account that range in the API has an end position

[wxWidgets.git] / src / msw / dib.cpp

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 9b1c1a6160f7c51b3417989432a05b6dab866e5b..ee17d5d2b1a48b4a8d8bf469d151b8834c1fb192 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -30,15 +30,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_WXDIB
+

 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/intl.h"
+    #include "wx/bitmap.h"
+    #include "wx/image.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#if wxUSE_WXDIB
-
-#include "wx/bitmap.h"
-#include "wx/intl.h"

 #include "wx/file.h"
 
 #include <stdio.h>
 #include "wx/file.h"
 
 #include <stdio.h>


@@ -48,7 +49,6 @@
     #include <memory.h>
 #endif
 
     #include <memory.h>
 #endif
 

-#include "wx/image.h"

 #include "wx/msw/dib.h"
 
 #ifdef __WXWINCE__
 #include "wx/msw/dib.h"
 
 #ifdef __WXWINCE__


@@ -800,4 +800,3 @@ wxImage wxDIB::ConvertToImage() const
 #endif // wxUSE_IMAGE
 
 #endif // wxUSE_WXDIB
 #endif // wxUSE_IMAGE
 
 #endif // wxUSE_WXDIB

-