Implemented wxTextAttrEx::CombineEx and wxRichTextAttr::Combine

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

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index ed0ec204b77f790f5a92935e3d103818adfd1aa5..4db167ecbb838b1ecc01afe8be721ec0aa970659 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -16,14 +16,15 @@
 
 #if wxUSE_IMAGE && wxUSE_LIBTIFF
 
+#include "wx/imagtiff.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/bitmap.h"
 #endif
 
-#include "wx/imagtiff.h"
-#include "wx/bitmap.h"
-#include "wx/debug.h"
 extern "C"
 {
     #include "tiff.h"
@@ -31,15 +32,14 @@ extern "C"
 }
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
-#include "wx/intl.h"
 #include "wx/module.h"
 
 #ifndef TIFFLINKAGEMODE
-  #if defined(__WATCOMC__) && defined(__WXMGL__)
-    #define TIFFLINKAGEMODE cdecl
-  #else
-    #define TIFFLINKAGEMODE LINKAGEMODE
-  #endif
+    #if defined(__WATCOMC__) && defined(__WXMGL__)
+        #define TIFFLINKAGEMODE cdecl
+    #else
+        #define TIFFLINKAGEMODE LINKAGEMODE
+    #endif
 #endif
 
 //-----------------------------------------------------------------------------