VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

[wxWidgets.git] / src / msw / xpmhand.cpp

diff --git a/src/msw/xpmhand.cpp b/src/msw/xpmhand.cpp
index 0432f686b9023077e15930e0d6fb96d1b64619e4..89e5cf85ba53de96b611da16fe5ca50ba4913c0f 100644 (file)
--- a/src/msw/xpmhand.cpp
+++ b/src/msw/xpmhand.cpp
@@ -39,7 +39,7 @@
 
 #if wxUSE_XPM_IN_MSW
 #define FOR_MSW 1
 
 #if wxUSE_XPM_IN_MSW
 #define FOR_MSW 1

-#include "../src/xpm/xpm34.h"
+#include "../xpm/xpm34.h"

 #endif
 
 #include "wx/xpmhand.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;
     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)
       {
       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;
             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)
                 &ximage, (XImage *) NULL, (XpmAttributes *) NULL);
             
             if (dc)