X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/952ae1e88b9092f493b4ea6911a2b60b378d422d..9c136858af7a37b1ed7d5f036f8d6953f7c8d507:/src/common/imagxpm.cpp

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 7ebe0c9edf..485aa239c0 100644
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -107,6 +107,19 @@ bool wxXPMHandler::LoadFile(wxImage *image,
     return TRUE;
 }
 
+
+static char hexArray[] = "0123456789ABCDEF";
+
+static void DecToHex(int dec, char *buf)
+{
+    int firstDigit = (int)(dec/16.0);
+    int secondDigit = (int)(dec - (firstDigit*16.0));
+    buf[0] = hexArray[firstDigit];
+    buf[1] = hexArray[secondDigit];
+    buf[2] = 0;
+}
+
+
 bool wxXPMHandler::SaveFile(wxImage * image,
                             wxOutputStream& stream, bool WXUNUSED(verbose))
 {
@@ -127,13 +140,26 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     for ( k = MaxCixels; cols > k; k *= MaxCixels)
         chars_per_pixel++;
 
-    // 2. write the header:
+    // 2. write the header:    
+    wxString sName;
+    if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
+    {
+        wxSplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
+                    NULL, &sName, NULL);
+        sName << wxT("_xpm");
+    }
+    
+    if ( !sName.IsEmpty() )
+        sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
+    else 
+        sName = wxT("/* XPM */\nstatic char *xpm_data");
+    stream.Write( (const char*) sName.ToAscii(), sName.Len() );
+
     char tmpbuf[200];
     // 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)
+    //     (<101 bytes the string, neither %i can expand into more than 10 chars)
     sprintf(tmpbuf, 
-               "/* XPM */\n"
-               "static char *xpm_data[] = {\n"
+               "[] = {\n"
                "/* columns rows colors chars-per-pixel */\n"
                "\"%i %i %i %i\",\n",
                image->GetWidth(), image->GetHeight(), cols, chars_per_pixel);
@@ -172,19 +198,24 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         unsigned long key = entry->first;
 
         if (key == 0)
-            tmp.Printf(wxT("\"%s c Black\",\n"), sym);
+            sprintf( tmpbuf, "\"%s c Black\",\n", sym);
         else if (key == mask_key)
-            tmp.Printf(wxT("\"%s c None\",\n"), sym);
+            sprintf( tmpbuf, "\"%s c None\",\n", sym);
         else
-            tmp.Printf(wxT("\"%s c #%s%s%s\",\n"), sym,
-                       wxDecToHex((unsigned char)(key >> 16)).c_str(),
-                       wxDecToHex((unsigned char)(key >> 8)).c_str(),
-                       wxDecToHex((unsigned char)(key)).c_str());
-        stream.Write(tmp.mb_str(), tmp.Length());
+        {
+            char rbuf[3];
+            DecToHex( (unsigned char)(key >> 16), rbuf );
+            char gbuf[3];
+            DecToHex( (unsigned char)(key >> 8), gbuf );
+            char bbuf[3];
+            DecToHex( (unsigned char)(key), bbuf );
+            sprintf( tmpbuf, "\"%s c #%s%s%s\",\n", sym, rbuf, gbuf, bbuf );
+        }
+        stream.Write( tmpbuf, strlen(tmpbuf) );
     }
 
     tmp = wxT("/* pixels */\n");
-    stream.Write(tmp.mb_str(), tmp.Length());
+    stream.Write( (const char*) tmp.ToAscii(), tmp.Length() );
 
     unsigned char *data = image->GetData();
     for (j = 0; j < image->GetHeight(); j++)
@@ -203,7 +234,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         tmp_c = '\n'; stream.Write(&tmp_c, 1);
     }
     tmp = wxT("};\n");
-    stream.Write(tmp.mb_str(), 3);
+    stream.Write( (const char*) tmp.ToAscii(), 3 );
 
     // Clean up:
     delete[] symbols;