Forgot header with OSX prefix

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

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 7d02ebe3724c7c7d9a85ecc54e1203964fc70052..3f1caeaf46a07610a520c1b70674ffc7341f767e 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -80,6 +80,7 @@ license is as follows:
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
 #include "wx/xpmdecod.h"
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
 #include "wx/xpmdecod.h"

+#include "wx/filename.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 


@@ -123,15 +124,15 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     wxString sName;
     if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
     {
     wxString sName;
     if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
     {

-        wxSplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
-                    NULL, &sName, NULL);
+        wxFileName::SplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
+                              NULL, &sName, NULL);

         sName << wxT("_xpm");
     }
 
     if ( !sName.empty() )
         sName << wxT("_xpm");
     }
 
     if ( !sName.empty() )

-        sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
+        sName = wxString(wxT("/* XPM */\nstatic const char *")) + sName;

     else
     else

-        sName = wxT("/* XPM */\nstatic char *xpm_data");
+        sName = wxT("/* XPM */\nstatic const char *xpm_data");

     stream.Write( (const char*) sName.ToAscii(), sName.Len() );
 
     char tmpbuf[200];
     stream.Write( (const char*) sName.ToAscii(), sName.Len() );
 
     char tmpbuf[200];