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

fix a couple GTK assertions about setting negative sizes, closes #15891

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2014-01-23 05:47:43 +00:00
parent 6286f9b1ef
commit eb1f6dd806
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/combocmn.cpp
View File

@ -1354,9 +1354,11 @@ void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust
else else
{ {
// If it has border, have textctrl fill the entire text field. // If it has border, have textctrl fill the entire text field.
int w = m_tcArea.width - m_widthCustomPaint;
if (w < 0) w = 0;
m_text->SetSize( m_tcArea.x + m_widthCustomPaint, m_text->SetSize( m_tcArea.x + m_widthCustomPaint,
m_tcArea.y, m_tcArea.y,
m_tcArea.width - m_widthCustomPaint, w,
m_tcArea.height ); m_tcArea.height );
} }
} }

4
src/gtk/collpane.cpp
View File

@ -271,7 +271,9 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev)
// here we need to resize the pane window otherwise, even if the GtkExpander container // here we need to resize the pane window otherwise, even if the GtkExpander container
// is expanded or shrunk, the pane window won't be updated! // is expanded or shrunk, the pane window won't be updated!
m_pPane->SetSize(ev.GetSize().x, ev.GetSize().y - m_szCollapsed.y); int w = ev.GetSize().y - m_szCollapsed.y;
if (w < 0) w = 0;
m_pPane->SetSize(ev.GetSize().x, w);
// we need to explicitly call m_pPane->Layout() or else it won't correctly relayout // we need to explicitly call m_pPane->Layout() or else it won't correctly relayout
// (even if SetAutoLayout(true) has been called on it!) // (even if SetAutoLayout(true) has been called on it!)