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

Avoid using negative width in generic wxTimePickerCtrl.

Browse Source 
If there is not enough space for the text, make it of size 0, not negative.

Closes #16960.
This commit is contained in:
Vadim Zeitlin
2015-04-22 14:14:14 +02:00
parent eb4aab5639
commit 5f003c9ffb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/generic/timectrlg.cpp
View File

@@ -26,6 +26,7 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/textctrl.h" #include "wx/textctrl.h"
#include "wx/utils.h" // wxMax()
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/timectrl.h" #include "wx/timectrl.h"
@@ -657,7 +658,7 @@ void wxTimePickerCtrlGeneric::DoMoveWindow(int x, int y, int width, int height)
return; return;
const int widthBtn = m_impl->m_btn->GetSize().x; const int widthBtn = m_impl->m_btn->GetSize().x;
const int widthText = width - widthBtn - HMARGIN_TEXT_SPIN; const int widthText = wxMax(width - widthBtn - HMARGIN_TEXT_SPIN, 0);
m_impl->m_text->SetSize(0, 0, widthText, height); m_impl->m_text->SetSize(0, 0, widthText, height);
m_impl->m_btn->SetSize(widthText + HMARGIN_TEXT_SPIN, 0, widthBtn, height); m_impl->m_btn->SetSize(widthText + HMARGIN_TEXT_SPIN, 0, widthBtn, height);