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 ee9ae2df71fce1b6795e126e060de0d571cda7aa..3319054f5e9c26da82919402f73b586fad904a36 100644 (file)
--- a/src/palmos/dib.cpp
+++ b/src/palmos/dib.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/dib.cpp
 // Purpose:     implements wxDIB class
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/dib.cpp
 // Purpose:     implements wxDIB class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10.13.04
 // Modified by:
 // Created:     10.13.04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Copyright:   (c) William Osborne

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -24,18 +24,18 @@
     #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 "wx/file.h"
 

-#include "wx/image.h"

 #include "wx/palmos/dib.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/palmos/dib.h"
 
 // ----------------------------------------------------------------------------


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

-