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

force showing 0 in the spin control instead of leaving it empty as the native spin button seems to be content to do

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-06-26 12:20:50 +00:00
parent 58772e4992
commit eeea41abbc
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/spinctrl.h
View File

@@ -65,7 +65,7 @@ public:
virtual ~wxSpinCtrl(); virtual ~wxSpinCtrl();
virtual void SetValue(int val) { wxSpinButton::SetValue(val); } virtual void SetValue(int val);
virtual int GetValue() const; virtual int GetValue() const;
virtual bool SetFont(const wxFont &font); virtual bool SetFont(const wxFont &font);
virtual void SetFocus(); virtual void SetFocus();

24
src/msw/spinctrl.cpp
View File

@@ -431,16 +431,34 @@ void wxSpinCtrl::SetValue(const wxString& text)
} }
} }
void wxSpinCtrl::SetValue(int val)
{
wxSpinButton::SetValue(val);
// normally setting the value of the spin button is enough as it updates
// its buddy control automatically ...
if ( wxGetWindowText(m_hwndBuddy).empty() )
{
// ... but sometimes it doesn't, notably when the value is 0 and the
// text control is currently empty, the spin button seems to be happy
// to leave it like this, while we really want to always show the
// current value in the control, so do it manually
::SetWindowText(GetBuddyHwnd(), wxString::Format(_T("%ld"), val));
}
}
int wxSpinCtrl::GetValue() const int wxSpinCtrl::GetValue() const
{ {
wxString val = wxGetWindowText(m_hwndBuddy); wxString val = wxGetWindowText(m_hwndBuddy);
long n; long n;
if ( (wxSscanf(val, wxT("%lu"), &n) != 1) ) if ( (wxSscanf(val, wxT("%ld"), &n) != 1) )
n = INT_MIN; n = INT_MIN;
if (n < m_min) n = m_min; if ( n < m_min )
if (n > m_max) n = m_max; n = m_min;
if ( n > m_max )
n = m_max;
return n; return n;
} }