Merge in from trunk r64802 - r68625

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

diff --git a/src/palmos/dib.cpp b/src/palmos/dib.cpp
index c73eef0219c1dd0522e1c1cebca4c9441c2863c2..3319054f5e9c26da82919402f73b586fad904a36 100644 (file)
--- a/src/palmos/dib.cpp
+++ b/src/palmos/dib.cpp
@@ -6,7 +6,7 @@
 // Created:     10.13.04
 // RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -24,18 +24,18 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_WXDIB
+
 #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
 
-#if wxUSE_WXDIB
-
-#include "wx/bitmap.h"
-#include "wx/intl.h"
 #include "wx/file.h"
 
-#include "wx/image.h"
 #include "wx/palmos/dib.h"
 
 // ----------------------------------------------------------------------------
@@ -167,4 +167,3 @@ wxImage wxDIB::ConvertToImage() const
 #endif // wxUSE_IMAGE
 
 #endif // wxUSE_WXDIB
-