compiles with or without wxSpinCtrl now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -50,6 +50,11 @@
|
|||||||
// this is where wxGetNumberFromUser() is declared
|
// this is where wxGetNumberFromUser() is declared
|
||||||
#include "wx/generic/textdlgg.h"
|
#include "wx/generic/textdlgg.h"
|
||||||
|
|
||||||
|
#if !wxUSE_SPINCTRL
|
||||||
|
// wxTextCtrl will do instead of wxSpinCtrl if we don't have it
|
||||||
|
#define wxSpinCtrl wxTextCtrl
|
||||||
|
#endif
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// private classes
|
// private classes
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -151,7 +156,14 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
|
|||||||
|
|
||||||
void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event))
|
void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
|
#if !wxUSE_SPINCTRL
|
||||||
|
wxString tmp = m_spinctrl->GetValue();
|
||||||
|
if ( wxSscanf(tmp, _T("%ld"), &m_value) != 1 )
|
||||||
|
m_value = -1;
|
||||||
|
else
|
||||||
|
#else
|
||||||
m_value = m_spinctrl->GetValue();
|
m_value = m_spinctrl->GetValue();
|
||||||
|
#endif
|
||||||
if ( m_value < m_min || m_value > m_max )
|
if ( m_value < m_min || m_value > m_max )
|
||||||
{
|
{
|
||||||
// not a number or out of range
|
// not a number or out of range
|
||||||
|
Reference in New Issue
Block a user