don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -116,8 +116,8 @@ void wxSplitterWindow::Init()
|
||||
|
||||
m_splitMode = wxSPLIT_VERTICAL;
|
||||
m_permitUnsplitAlways = true;
|
||||
m_windowOne = (wxWindow *) NULL;
|
||||
m_windowTwo = (wxWindow *) NULL;
|
||||
m_windowOne = NULL;
|
||||
m_windowTwo = NULL;
|
||||
m_dragMode = wxSPLIT_DRAG_NONE;
|
||||
m_oldX = 0;
|
||||
m_oldY = 0;
|
||||
@@ -294,7 +294,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
|
||||
// We remove the first window from the view
|
||||
wxWindow *removedWindow = m_windowOne;
|
||||
m_windowOne = m_windowTwo;
|
||||
m_windowTwo = (wxWindow *) NULL;
|
||||
m_windowTwo = NULL;
|
||||
OnUnsplit(removedWindow);
|
||||
wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
|
||||
eventUnsplit.m_data.win = removedWindow;
|
||||
@@ -305,7 +305,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
|
||||
{
|
||||
// We remove the second window from the view
|
||||
wxWindow *removedWindow = m_windowTwo;
|
||||
m_windowTwo = (wxWindow *) NULL;
|
||||
m_windowTwo = NULL;
|
||||
OnUnsplit(removedWindow);
|
||||
wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
|
||||
eventUnsplit.m_data.win = removedWindow;
|
||||
@@ -731,7 +731,7 @@ void wxSplitterWindow::Initialize(wxWindow *window)
|
||||
window->Show();
|
||||
|
||||
m_windowOne = window;
|
||||
m_windowTwo = (wxWindow *) NULL;
|
||||
m_windowTwo = NULL;
|
||||
DoSetSashPosition(0);
|
||||
}
|
||||
|
||||
@@ -801,13 +801,13 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
|
||||
if ( toRemove == NULL || toRemove == m_windowTwo)
|
||||
{
|
||||
win = m_windowTwo ;
|
||||
m_windowTwo = (wxWindow *) NULL;
|
||||
m_windowTwo = NULL;
|
||||
}
|
||||
else if ( toRemove == m_windowOne )
|
||||
{
|
||||
win = m_windowOne ;
|
||||
m_windowOne = m_windowTwo;
|
||||
m_windowTwo = (wxWindow *) NULL;
|
||||
m_windowTwo = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user