Compilation fix for wxCStrData handling.

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

diff --git a/src/os2/dir.cpp b/src/os2/dir.cpp
index e3e7188afd183514b6f96cf75ba2948b7b229d4d..fef52b91b3993047a9d7051f419eb881042cfd69 100644 (file)
--- a/src/os2/dir.cpp
+++ b/src/os2/dir.cpp
@@ -75,7 +75,7 @@ static inline FIND_DATA FindFirst(
     FIND_DATA                   hDir = HDIR_CREATE;
     FIND_ATTR                   rc;
 
-    rc = ::DosFindFirst( (PSZ)rsSpec.c_str()
+    rc = ::DosFindFirst( rsSpec.c_str()
                         ,&hDir
                         ,0x37 // was: FILE_NORMAL
                         ,pFinddata

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index cc0812db2776897d297bd30b2b6ce2c5af283a55..7fb53b78a362e1a573d8df3322aa725f3f9f89d5 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -157,7 +157,7 @@ bool wxShell( const wxString& rCommand )
     SData.PgmName  = (char*)zShell;
 
     sInputs = _T("/C ") + rCommand;
-    SData.PgmInputs     = (BYTE*)sInputs.c_str();
+    SData.PgmInputs     = (BYTE*)sInputs.char_str();
     SData.TermQ         = 0;
     SData.Environment   = 0;
     SData.InheritOpt    = SSF_INHERTOPT_SHELL;

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index 36cb21733e6ba6f22ab5294ca9d9b8a1aac8998d..c50a311691f10f3c4bc540e3b5bda7ff5fc4dc97 100644 (file)
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -156,7 +156,7 @@ long wxExecute( const wxString& rCommand,
                       ,zArgs
                       ,zEnvs
                       ,&vResultCodes
-                      ,(PSZ)rCommand.c_str()
+                      ,rCommand.c_str()
                      );
     if (rc != NO_ERROR)
     {