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

replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-02 02:39:52 +00:00
parent 6fc905e0e1
commit 5c33522fca
174 changed files with 347 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/menu.cpp
View File

@@ -469,7 +469,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
}
mii.cch = itemText.length();
mii.dwTypeData = wx_const_cast(wxChar *, itemText.wx_str());
mii.dwTypeData = const_cast<wxChar *>(itemText.wx_str());
if (flags & MF_POPUP)
{
@@ -489,7 +489,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
// item and this looks downright ugly
//
// so instead draw it ourselves in MSWOnDrawItem()
mii.dwItemData = wx_reinterpret_cast(ULONG_PTR, pItem);
mii.dwItemData = reinterpret_cast<ULONG_PTR>(pItem);
if ( pItem->IsCheckable() )
{
mii.hbmpChecked =
@@ -760,7 +760,7 @@ void wxMenu::SetTitle(const wxString& label)
info.fMask = MIIM_TYPE;
info.fType = MFT_STRING;
info.cch = m_title.length();
info.dwTypeData = wx_const_cast(wxChar *, m_title.wx_str());
info.dwTypeData = const_cast<wxChar *>(m_title.wx_str());
if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) )
{
wxLogLastError(wxT("SetMenuItemInfo"));
@@ -930,7 +930,7 @@ WXHMENU wxMenuBar::Create()
if ( m_hMenu != 0 )
return m_hMenu;
wxToolMenuBar * const bar = wx_static_cast(wxToolMenuBar *, GetToolBar());
wxToolMenuBar * const bar = static_cast<wxToolMenuBar *>(GetToolBar());
if ( !bar )
return NULL;
@@ -1080,7 +1080,7 @@ void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
info.fMask = MIIM_TYPE;
info.fType = MFT_STRING;
info.cch = label.length();
info.dwTypeData = wx_const_cast(wxChar *, label.wx_str());
info.dwTypeData = const_cast<wxChar *>(label.wx_str());
if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, &info) )
{
wxLogLastError(wxT("SetMenuItemInfo"));