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

more changes to make wx compile without implicit wxString->char* conversion (for STL build)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-20 07:44:45 +00:00
parent d38f70b249
commit e0a050e347
55 changed files with 183 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/mdi.cpp
View File

@@ -199,7 +199,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
msflags &= ~WS_HSCROLL;
if ( !wxWindow::MSWCreate(wxMDIFrameClassName,
title,
title.wx_str(),
pos, size,
msflags,
exflags) )
@@ -711,7 +711,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
mcs.szClass = style & wxFULL_REPAINT_ON_RESIZE
? wxMDIChildFrameClassName
: wxMDIChildFrameClassNameNoRedraw;
mcs.szTitle = title;
mcs.szTitle = title.wx_str();
mcs.hOwner = wxGetInstance();
if (x != wxDefaultCoord)
mcs.x = x;
@@ -1430,14 +1430,14 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
{
success = true;
::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
(UINT)subMenu, _("&Window"));
(UINT)subMenu, _("&Window").wx_str());
break;
}
}
if ( !success )
{
::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window"));
::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window").wx_str());
}
}