/////////////////////////////////////////////////////////////////////////////
-// Name: numdlgg.cpp
+// Name: src/generic/numdlgg.cpp
// Purpose: wxGetNumberFromUser implementation
// Author: Vadim Zeitlin
// Modified by:
// Created: 23.07.99
// RCS-ID: $Id$
// Copyright: (c) Vadim Zeitlin
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "numdlgg.cpp"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
long min,
long max,
const wxPoint& pos)
- : wxDialog(parent, -1, caption,
- pos, wxDefaultSize,
- wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL )
+ : wxDialog(GetParentForModalDialog(parent),
+ wxID_ANY, caption,
+ pos, wxDefaultSize)
{
m_value = value;
m_max = max;
wxBeginBusyCursor();
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
-
+#if wxUSE_STATTEXT
// 1) text message
topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
+#endif
// 2) prompt and text ctrl
wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL );
+
+#if wxUSE_STATTEXT
// prompt if any
- if (!prompt.IsEmpty())
- inputsizer->Add( new wxStaticText( this, -1, prompt ), 0, wxCENTER | wxLEFT, 10 );
+ if (!prompt.empty())
+ inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 );
+#endif
+
// spin ctrl
wxString valStr;
valStr.Printf(wxT("%ld"), m_value);
- m_spinctrl = new wxSpinCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) );
-#if wxUSE_SPINCTRL
- m_spinctrl->SetRange((int)m_min, (int)m_max);
-#endif
+ m_spinctrl = new wxSpinCtrl(this, wxID_ANY, valStr, wxDefaultPosition, wxSize( 140, wxDefaultCoord ), wxSP_ARROW_KEYS, (int)m_min, (int)m_max, (int)m_value);
inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
// add both
- topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
-
-#if wxUSE_STATLINE
- // 3) static line
- topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
-#endif
+ topsizer->Add( inputsizer, 0, wxEXPAND | wxLEFT|wxRIGHT, 5 );
- // 4) buttons
- topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );
+ // 3) buttons if any
+ wxSizer *buttonSizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL);
+ if ( buttonSizer )
+ {
+ topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder());
+ }
SetSizer( topsizer );
- SetAutoLayout( TRUE );
+ SetAutoLayout( true );
topsizer->SetSizeHints( this );
topsizer->Fit( this );
{
#if !wxUSE_SPINCTRL
wxString tmp = m_spinctrl->GetValue();
- if ( wxSscanf(tmp, _T("%ld"), &m_value) != 1 )
+ if ( wxSscanf(tmp, wxT("%ld"), &m_value) != 1 )
EndModal(wxID_CANCEL);
else
#else
if ( m_value < m_min || m_value > m_max )
{
// not a number or out of range
+ m_value = -1;
EndModal(wxID_CANCEL);
}
wxNumberEntryDialog dialog(parent, msg, prompt, title,
value, min, max, pos);
if (dialog.ShowModal() == wxID_OK)
- return dialog.GetValue();
-
+ return dialog.GetValue();
+
return -1;
}