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

use wx_static_cast() instead of static_cast<> on an off chance that some compiler still doesn't have the latter; fix svn properties for the new file

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-23 16:19:16 +00:00
parent a4c76fe11e
commit e50f48d518
4 changed files with 2670 additions and 2669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/aui/auibar.cpp
View File

@@ -5,7 +5,7 @@
// Author: Benjamin I. Williams // Author: Benjamin I. Williams
// Modified by: // Modified by:
// Created: 2005-05-17 // Created: 2005-05-17
// RCS-ID: $Id: dockart.cpp 48848 2007-09-21 10:19:53Z SC $ // RCS-ID: $Id$
// Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved // Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
// Licence: wxWindows Library Licence, Version 3.1 // Licence: wxWindows Library Licence, Version 3.1
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -208,7 +208,7 @@ wxAuiDefaultToolBarArt::~wxAuiDefaultToolBarArt()
wxAuiToolBarArt* wxAuiDefaultToolBarArt::Clone() wxAuiToolBarArt* wxAuiDefaultToolBarArt::Clone()
{ {
return static_cast<wxAuiToolBarArt*>(new wxAuiDefaultToolBarArt); return wx_static_cast(wxAuiToolBarArt*, new wxAuiDefaultToolBarArt);
} }
void wxAuiDefaultToolBarArt::SetFlags(unsigned int flags) void wxAuiDefaultToolBarArt::SetFlags(unsigned int flags)

2
src/aui/auibook.cpp
View File

@@ -1006,7 +1006,7 @@ wxAuiSimpleTabArt::~wxAuiSimpleTabArt()
wxAuiTabArt* wxAuiSimpleTabArt::Clone() wxAuiTabArt* wxAuiSimpleTabArt::Clone()
{ {
return static_cast<wxAuiTabArt*>(new wxAuiSimpleTabArt); return wx_static_cast(wxAuiTabArt*, new wxAuiSimpleTabArt);
} }

6
src/aui/framemanager.cpp
View File

@@ -761,7 +761,7 @@ void wxAuiManager::UpdateHintWindowConfig()
{ {
if (w->IsKindOf(CLASSINFO(wxFrame))) if (w->IsKindOf(CLASSINFO(wxFrame)))
{ {
wxFrame* f = static_cast<wxFrame*>(w); wxFrame* f = wx_static_cast(wxFrame*, w);
can_do_transparent = f->CanSetTransparent(); can_do_transparent = f->CanSetTransparent();
break; break;
} }
@@ -1005,7 +1005,7 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info)
// meshes better with the look and feel of the control than ours, // meshes better with the look and feel of the control than ours,
// so turn wxAuiManager's gripper off, and the toolbar's on. // so turn wxAuiManager's gripper off, and the toolbar's on.
wxAuiToolBar* tb = static_cast<wxAuiToolBar*>(pinfo.window); wxAuiToolBar* tb = wx_static_cast(wxAuiToolBar*, pinfo.window);
pinfo.SetFlag(wxAuiPaneInfo::optionGripper, false); pinfo.SetFlag(wxAuiPaneInfo::optionGripper, false);
tb->SetGripperVisible(true); tb->SetGripperVisible(true);
} }
@@ -3823,7 +3823,7 @@ void wxAuiManager::OnFindManager(wxAuiManagerEvent& evt)
// if we are managing a child frame, get the 'real' manager // if we are managing a child frame, get the 'real' manager
if (window->IsKindOf(CLASSINFO(wxAuiFloatingFrame))) if (window->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
{ {
wxAuiFloatingFrame* float_frame = static_cast<wxAuiFloatingFrame*>(window); wxAuiFloatingFrame* float_frame = wx_static_cast(wxAuiFloatingFrame*, window);
evt.SetManager(float_frame->GetOwnerManager()); evt.SetManager(float_frame->GetOwnerManager());
return; return;
} }

9
src/aui/tabmdi.cpp
View File

@@ -134,7 +134,7 @@ wxAuiTabArt* wxAuiMDIParentFrame::GetArtProvider()
wxAuiNotebook* wxAuiMDIParentFrame::GetNotebook() const wxAuiNotebook* wxAuiMDIParentFrame::GetNotebook() const
{ {
return static_cast<wxAuiNotebook*>(m_pClientWindow); return wx_static_cast(wxAuiNotebook*, m_pClientWindow);
} }
@@ -808,8 +808,8 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
void wxAuiMDIClientWindow::OnPageClose(wxAuiNotebookEvent& evt) void wxAuiMDIClientWindow::OnPageClose(wxAuiNotebookEvent& evt)
{ {
wxAuiMDIChildFrame* wnd; wxAuiMDIChildFrame*
wnd = static_cast<wxAuiMDIChildFrame*>(GetPage(evt.GetSelection())); wnd = wx_static_cast(wxAuiMDIChildFrame*, GetPage(evt.GetSelection()));
wnd->Close(); wnd->Close();
@@ -832,5 +832,6 @@ void wxAuiMDIClientWindow::OnSize(wxSizeEvent& evt)
((wxAuiMDIChildFrame *)GetPage(pos))->ApplyMDIChildFrameRect(); ((wxAuiMDIChildFrame *)GetPage(pos))->ApplyMDIChildFrameRect();
} }
#endif //wxUSE_AUI
#endif // wxUSE_MDI #endif // wxUSE_MDI
#endif // wxUSE_AUI