AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

APplied patch [ 705301 ] Don't send event for wxSplitter::Unsplit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2003-04-05 10:33:10 +00:00
parent ddea7eb614
commit a2f9a63688
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/filedlgg.cpp
View File

@ -1206,6 +1206,8 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
mainsizer->Add( choicesizer, 0, wxEXPAND );
}
// FIXME - memory leaks!!
m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
while (tokens.HasMoreTokens())
{

10
src/generic/splitter.cpp
View File

@ -358,7 +358,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
m_needUpdating = TRUE;
}
}
else if ( event.LeftDClick() )
else if ( event.LeftDClick() && m_windowTwo )
{
OnDoubleClickSash(x, y);
}
@ -892,7 +892,7 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
return FALSE;
}
OnUnsplit(win);
win->Show(FALSE);
DoSetSashPosition(0);
SizeWindows();
@ -1062,6 +1062,8 @@ int wxSplitterWindow::OnSashPositionChanging(int newSashPosition)
// the sash if the minimum pane size is zero.
void wxSplitterWindow::OnDoubleClickSash(int x, int y)
{
wxCHECK_RET(m_windowTwo, wxT("splitter: no window to remove"));
// new code should handle events instead of using the virtual functions
wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, this);
event.m_data.pt.x = x;
@ -1070,7 +1072,9 @@ void wxSplitterWindow::OnDoubleClickSash(int x, int y)
{
if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways )
{
Unsplit();
wxWindow* win = m_windowTwo;
if (Unsplit(win))
OnUnsplit(win);
}
}
//else: blocked by user