Implemented wxTextAttrEx::CombineEx and wxRichTextAttr::Combine

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

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index 6a4f651fc0fbfdb58676deeab88d95f007c644e4..a5fdfa8f15c0a4d44e31d2485c384c4e3f1956f8 100644 (file)
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -103,11 +103,13 @@ license is as follows:
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/hashmap.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
 #endif
 
-#include "wx/stream.h"
 #include "wx/image.h"
-#include "wx/hashmap.h"
 #include <string.h>
 
 #include <ctype.h>