ensure minimal mime support in wxHTML even without wxMimeTypesMananger

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

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 0bf15e77225c7c3eb8ae3e6d3c5130ab3b278c73..22584d6655df0bf8828430ca7d03c7e4837a02e7 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -77,7 +77,7 @@ license is as follows:
 #  include "wx/defs.h"
 #endif
 
-#if wxUSE_IMAGE && wxUSE_XPM
+#if wxUSE_XPM
 
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
@@ -129,7 +129,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
 
     // 2. write the header:
     char tmpbuf[200];
-    // VS: 200b is safe upper bound for anything produced by sprintf bellow
+    // VS: 200b is safe upper bound for anything produced by sprintf below
     //     (101 bytes the string, neither %i can expand into more than 10 chars)
     sprintf(tmpbuf, 
                "/* XPM */\n"
@@ -208,9 +208,17 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     tmp = wxT("};\n");
     stream.Write(tmp.mb_str(), 3);
 
+    // Clean up:
     delete[] symbols;
     delete[] symbols_data;
 
+    // FIXME: it will be better to use macros-based wxHashTable & DeleteContents(TRUE)
+    table.BeginFind();
+    while ((node = table.Next()) != NULL)
+    {
+        delete (wxHNode *) node->GetData();
+    }
+
     return TRUE;
 }
 
@@ -222,4 +230,4 @@ bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 
 #endif  // wxUSE_STREAMS
 
-#endif // wxUSE_XPM && wxUSE_IMAGE
+#endif // wxUSE_XPM