Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OS/2 specific compilation fix for wxCStrData handling.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2007-04-06 17:10:03 +00:00
parent 7c2b62db91
commit 1f3d991197
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/dynlib.cpp
View File

@@ -120,7 +120,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
#elif defined(__WXPM__) || defined(__EMX__) #elif defined(__WXPM__) || defined(__EMX__)
char err[256] = ""; 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 #else // this should be the only remaining branch eventually
m_handle = RawLoad(libname, flags); m_handle = RawLoad(libname, flags);
#endif #endif
@@ -177,7 +177,7 @@ void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr ) if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
symbol = (void *)symAddress; symbol = (void *)symAddress;
#elif defined(__WXPM__) || defined(__EMX__) #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 #else
symbol = RawGetSymbol(m_handle, name); symbol = RawGetSymbol(m_handle, name);
#endif #endif

6
src/common/filefn.cpp
View File

@@ -1075,7 +1075,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
return false; return false;
} }
#elif defined(__OS2__) #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; return false;
#elif defined(__PALMOS__) #elif defined(__PALMOS__)
// TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/ // 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__) #if defined(__VMS__)
return false; //to be changed since rmdir exists in VMS7.x return false; //to be changed since rmdir exists in VMS7.x
#elif defined(__OS2__) #elif defined(__OS2__)
return (::DosDeleteDir((PSZ)dir.c_str()) == 0); return (::DosDeleteDir(dir.c_str()) == 0);
#elif defined(__WXWINCE__) #elif defined(__WXWINCE__)
return (RemoveDirectory(dir) != 0); return (RemoveDirectory(dir) != 0);
#elif defined(__WXPALMOS__) #elif defined(__WXPALMOS__)
@@ -1582,7 +1582,7 @@ bool wxSetWorkingDirectory(const wxString& d)
if (d.length() == 2) if (d.length() == 2)
return true; return true;
} }
return (::DosSetCurrentDir((PSZ)d.c_str()) == 0); return (::DosSetCurrentDir(d.c_str()) == 0);
#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__) #elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
return (chdir(wxFNSTRINGCAST d.fn_str()) == 0); return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
#elif defined(__WINDOWS__) #elif defined(__WINDOWS__)