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

Avoid passing wxChar* to API functions (patch #1830017).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2007-11-11 22:35:20 +00:00
parent c22bb3442e
commit 932762afbf
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/os2/toplevel.cpp
View File

@@ -484,8 +484,8 @@ bool wxTopLevelWindowOS2::CreateFrame( const wxString& rsTitle,
hFrame = ::WinCreateStdWindow( hParent hFrame = ::WinCreateStdWindow( hParent
,ulStyleFlags // frame-window style ,ulStyleFlags // frame-window style
,(PULONG)&lFlags // window style ,(PULONG)&lFlags // window style
,wxFrameClassName // class name ,wxString(wxFrameClassName).c_str() // class name
,rsTitle.c_str() // window title ,rsTitle.c_str() // window title
,0L // default client style ,0L // default client style
,NULLHANDLE // resource in executable file ,NULLHANDLE // resource in executable file
,0 // resource id ,0 // resource id

3
src/os2/window.cpp
View File

@@ -2941,6 +2941,7 @@ bool wxWindowOS2::OS2Create( PSZ zClass,
long lControlId = 0L; long lControlId = 0L;
wxWindowCreationHook vHook(this); wxWindowCreationHook vHook(this);
wxString sClassName((wxChar*)zClass); wxString sClassName((wxChar*)zClass);
wxString sTitle(zTitle ? zTitle : wxEmptyString);
OS2GetCreateWindowCoords( rPos OS2GetCreateWindowCoords( rPos
,rSize ,rSize
@@ -2969,7 +2970,7 @@ bool wxWindowOS2::OS2Create( PSZ zClass,
} }
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)OS2GetParent() m_hWnd = (WXHWND)::WinCreateWindow( (HWND)OS2GetParent()
,sClassName.c_str() ,sClassName.c_str()
,(zTitle ? zTitle : wxEmptyString) ,sTitle.c_str()
,(ULONG)dwStyle ,(ULONG)dwStyle
,(LONG)0L ,(LONG)0L
,(LONG)0L ,(LONG)0L