OS/2 specific compilation fix for wxCStrData handling.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 3e78472bce24f1ca5aff05764a66bad2bbf4adc1..ae754bc9c3d2f69eed0aa0a782ec44b7b6f4609d 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -120,7 +120,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 
 #elif defined(__WXPM__) || defined(__EMX__)
     char err[256] = "";
-    DosLoadModule(err, sizeof(err), (PSZ)libname.c_str(), &m_handle);
+    DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);
 #else // this should be the only remaining branch eventually
     m_handle = RawLoad(libname, flags);
 #endif
@@ -177,7 +177,7 @@ void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
     if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
         symbol = (void *)symAddress;
 #elif defined(__WXPM__) || defined(__EMX__)
-    DosQueryProcAddr( m_handle, 1L, (PSZ)name.c_str(), (PFN*)symbol );
+    DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
 #else
     symbol = RawGetSymbol(m_handle, name);
 #endif

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 42bbb0bf07c90b9ce2a92a91f2a881760a78de52..3d2807acc150dae287f4271dcaf72126e5164c8d 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1075,7 +1075,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
         return false;
     }
 #elif defined(__OS2__)
-    if ( ::DosCopy((PSZ)file1.c_str(), (PSZ)file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 )
+    if ( ::DosCopy(file1.c_str(), file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 )
         return false;
 #elif defined(__PALMOS__)
     // TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/
@@ -1267,7 +1267,7 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 #if defined(__VMS__)
     return false; //to be changed since rmdir exists in VMS7.x
 #elif defined(__OS2__)
-    return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
+    return (::DosDeleteDir(dir.c_str()) == 0);
 #elif defined(__WXWINCE__)
     return (RemoveDirectory(dir) != 0);
 #elif defined(__WXPALMOS__)
@@ -1582,7 +1582,7 @@ bool wxSetWorkingDirectory(const wxString& d)
        if (d.length() == 2)
            return true;
     }
-    return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);
+    return (::DosSetCurrentDir(d.c_str()) == 0);
 #elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
     return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
 #elif defined(__WINDOWS__)