X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fd284a4a09793c29078296529d3e9db5acd0a0f..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/msw/xpmhand.cpp

diff --git a/src/msw/xpmhand.cpp b/src/msw/xpmhand.cpp
index 0432f686b9..89e5cf85ba 100644
--- a/src/msw/xpmhand.cpp
+++ b/src/msw/xpmhand.cpp
@@ -39,7 +39,7 @@
 
 #if wxUSE_XPM_IN_MSW
 #define FOR_MSW 1
-#include "../src/xpm/xpm34.h"
+#include "../xpm/xpm34.h"
 #endif
 
 #include "wx/xpmhand.h"
@@ -60,7 +60,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla
     if (dc)
     {
       xpmAttr.valuemask = XpmReturnPixels;
-      int errorStatus = XpmReadFileToImage(&dc, WXSTRINGCAST name, &ximage, (XImage **) NULL, &xpmAttr);
+      int errorStatus = XpmReadFileToImage(&dc, wxMBSTRINGCAST name.fn_str(), &ximage, (XImage **) NULL, &xpmAttr);
       DeleteDC(dc);
       if (errorStatus == XpmSuccess)
       {
@@ -108,7 +108,7 @@ bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type
             ximage.height = M_BITMAPHANDLERDATA->m_height;
             ximage.depth = M_BITMAPHANDLERDATA->m_depth; 
             ximage.bitmap = (HBITMAP)M_BITMAPHANDLERDATA->m_hBitmap;
-            int errorStatus = XpmWriteFileFromImage(&dc, WXSTRINGCAST name,
+            int errorStatus = XpmWriteFileFromImage(&dc, wxMBSTRINGCAST name.fn_str(),
                 &ximage, (XImage *) NULL, (XpmAttributes *) NULL);
             
             if (dc)