changed wxFileName::Normalize signature to allow or-combination of flags and reverted...

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

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index b8996eaafed5c92bb627990d7c92143811277e64..22584d6655df0bf8828430ca7d03c7e4837a02e7 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -129,7 +129,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
 
     // 2. write the header:
     char tmpbuf[200];
 
     // 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"
     //     (101 bytes the string, neither %i can expand into more than 10 chars)
     sprintf(tmpbuf, 
                "/* XPM */\n"


@@ -141,7 +141,6 @@ bool wxXPMHandler::SaveFile(wxImage * image,
 
     // 3. create color symbols table:
     wxHashTable table(wxKEY_INTEGER);
 
     // 3. create color symbols table:
     wxHashTable table(wxKEY_INTEGER);

-    table.DeleteContents(TRUE);    

     image->ComputeHistogram(table);
 
     char *symbols_data = new char[cols * (chars_per_pixel+1)];
     image->ComputeHistogram(table);
 
     char *symbols_data = new char[cols * (chars_per_pixel+1)];


@@ -209,9 +208,17 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     tmp = wxT("};\n");
     stream.Write(tmp.mb_str(), 3);
 
     tmp = wxT("};\n");
     stream.Write(tmp.mb_str(), 3);
 

+    // Clean up:

     delete[] symbols;
     delete[] symbols_data;
 
     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;
 }
 
     return TRUE;
 }