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

Unicode fixes for OS/2 (all inside #ifdef __WXPM__ blocks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2005-04-27 01:17:45 +00:00
parent edf1dfa16d
commit 18ed8e0032
4 changed files with 10 additions and 10 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), libname.c_str(), &m_handle); DosLoadModule(err, sizeof(err), (PSZ)libname.c_str(), &m_handle);
#else #else
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, name.c_str(), (PFN*)symbol ); DosQueryProcAddr( m_handle, 1L, (PSZ)name.c_str(), (PFN*)symbol );
#else #else
symbol = RawGetSymbol(m_handle, name); symbol = RawGetSymbol(m_handle, name);
#endif #endif

4
src/common/filefn.cpp
View File

@@ -1011,7 +1011,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
return false; return false;
} }
#elif defined(__OS2__) #elif defined(__OS2__)
if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 ) if ( ::DosCopy((PSZ)file1.c_str(), (PSZ)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/
@@ -1236,7 +1236,7 @@ bool wxDirExists(const wxChar *pszPathName)
return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY); return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
#elif defined(__OS2__) #elif defined(__OS2__)
return (::DosSetCurrentDir(WXSTRINGCAST strPath)); return (::DosSetCurrentDir((PSZ)(WXSTRINGCAST strPath)));
#else // !__WIN32__ #else // !__WIN32__
wxStructStat st; wxStructStat st;

6
src/generic/busyinfo.cpp
View File

@@ -52,7 +52,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
int nParentWidth = parent->GetClientSize().x; int nParentWidth = parent->GetClientSize().x;
int nColor; int nColor;
SetBackgroundColour("WHITE"); SetBackgroundColour(wxT("WHITE"));
nColor = (LONG)GetBackgroundColour().GetPixel(); nColor = (LONG)GetBackgroundColour().GetPixel();
::WinSetPresParam( GetHwnd() ::WinSetPresParam( GetHwnd()
@@ -60,7 +60,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
,sizeof(LONG) ,sizeof(LONG)
,(PVOID)&nColor ,(PVOID)&nColor
); );
panel->SetBackgroundColour("WHITE"); panel->SetBackgroundColour(wxT("WHITE"));
nColor = (LONG)panel->GetBackgroundColour().GetPixel(); nColor = (LONG)panel->GetBackgroundColour().GetPixel();
::WinSetPresParam( GetHwndOf(panel) ::WinSetPresParam( GetHwndOf(panel)
@@ -81,7 +81,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
,nHeight ,nHeight
,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE
); );
text->SetBackgroundColour("WHITE"); text->SetBackgroundColour(wxT("WHITE"));
nColor = (LONG)text->GetBackgroundColour().GetPixel(); nColor = (LONG)text->GetBackgroundColour().GetPixel();
::WinSetPresParam( GetHwndOf(text) ::WinSetPresParam( GetHwndOf(text)

6
src/generic/statusbr.cpp
View File

@@ -364,13 +364,13 @@ void wxStatusBarGeneric::InitColours()
m_hilightPen = wxPen(hilightColour, 1, wxSOLID); m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
#elif defined(__WXPM__) #elif defined(__WXPM__)
m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID); m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);
m_hilightPen = wxPen("WHITE", 1, wxSOLID); m_hilightPen = wxPen(_T("WHITE"), 1, wxSOLID);
wxColour vColour; wxColour vColour;
vColour.Set(wxString("LIGHT GREY")); vColour.Set(wxString(_T("LIGHT GREY")));
SetBackgroundColour(vColour); SetBackgroundColour(vColour);
vColour.Set(wxString("BLACK")); vColour.Set(wxString(_T("BLACK")));
SetForegroundColour(vColour); SetForegroundColour(vColour);
#else #else
m_mediumShadowPen = wxPen("GREY", 1, wxSOLID); m_mediumShadowPen = wxPen("GREY", 1, wxSOLID);