// Created: 29.01.01
// RCS-ID: $Id$
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License: wxWindows license
+// License: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "spinctlg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || defined(__WXMAC__) || \
- defined(__WXUNIVERSAL__)
+// There are port-specific versions for MSW, GTK, OS/2 and Mac, so exclude the
+// contents of this file in those cases
+#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__) || \
+ defined(__WXMAC__)) || defined(__WXUNIVERSAL__)
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#endif //WX_PRECOMP
+#if wxUSE_SPINCTRL
+
#include "wx/spinbutt.h"
#include "wx/spinctrl.h"
{
public:
wxSpinCtrlText(wxSpinCtrl *spin, const wxString& value)
- : wxTextCtrl(spin->GetParent(), -1, value)
+ : wxTextCtrl(spin->GetParent(), wxID_ANY, value)
{
m_spin = spin;
+
+ // remove the default minsize, the spinctrl will have one instead
+ SetSizeHints(wxDefaultCoord,wxDefaultCoord);
}
protected:
{
// Hand button down events to wxSpinCtrl. Doesn't work.
if (event.GetEventType() == wxEVT_LEFT_DOWN && m_spin->ProcessEvent( event ))
- return TRUE;
+ return true;
return wxTextCtrl::ProcessEvent( event );
}
};
BEGIN_EVENT_TABLE(wxSpinCtrlText, wxTextCtrl)
- EVT_TEXT(-1, wxSpinCtrlText::OnTextChange)
+ EVT_TEXT(wxID_ANY, wxSpinCtrlText::OnTextChange)
END_EVENT_TABLE()
// ----------------------------------------------------------------------------
m_spin = spin;
SetWindowStyle(style | wxSP_VERTICAL);
+
+ // remove the default minsize, the spinctrl will have one instead
+ SetSizeHints(wxDefaultCoord,wxDefaultCoord);
}
protected:
- void OnSpinButton(wxSpinEvent& event)
+ void OnSpinButton(wxSpinEvent& eventSpin)
{
- m_spin->SetTextValue(event.GetPosition());
+ m_spin->SetTextValue(eventSpin.GetPosition());
- event.Skip();
+ wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
+ event.SetEventObject(m_spin);
+ event.SetInt(eventSpin.GetPosition());
+
+ m_spin->GetEventHandler()->ProcessEvent(event);
+
+ eventSpin.Skip();
}
private:
};
BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
- EVT_SPIN(-1, wxSpinCtrlButton::OnSpinButton)
+ EVT_SPIN(wxID_ANY, wxSpinCtrlButton::OnSpinButton)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
int initial,
const wxString& name)
{
- if ( !wxControl::Create(parent, id, pos, size, style,
+ if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style,
wxDefaultValidator, name) )
{
- return FALSE;
+ return false;
}
// the string value overrides the numeric one (for backwards compatibility
initial = l;
}
- SetBackgroundColour(*wxRED);
m_text = new wxSpinCtrlText(this, value);
m_btn = new wxSpinCtrlButton(this, style);
m_btn->SetRange(min, max);
m_btn->SetValue(initial);
-#ifdef __WXMAC__
- wxSize csize = size ;
- if ( size.y == -1 ) {
- csize.y = m_text->GetSize().y ;
- }
- DoSetSize(pos.x, pos.y, csize.x, csize.y);
-#else
- DoSetSize(pos.x, pos.y, size.x, size.y);
-#endif
+ SetBestSize(size);
+ Move(pos);
+
// have to disable this window to avoid interfering it with message
// processing to the text and the button... but pretend it is enabled to
- // make IsEnabled() return TRUE
- wxControl::Enable(FALSE); // don't use non virtual Disable() here!
- m_isEnabled = TRUE;
+ // make IsEnabled() return true
+ wxControl::Enable(false); // don't use non virtual Disable() here!
+ m_isEnabled = true;
// we don't even need to show this window itself - and not doing it avoids
// that it overwrites the text control
- wxControl::Show(FALSE);
-#ifndef __WXMAC__
- m_isShown = TRUE;
-#endif
- return TRUE;
+ wxControl::Show(false);
+ m_isShown = true;
+ return true;
}
wxSpinCtrl::~wxSpinCtrl()
{
- // delete the controls now, don't leave them alive even though they woudl
+ // delete the controls now, don't leave them alive even though they would
// still be eventually deleted by our parent - but it will be too late, the
// user code expects them to be gone now
delete m_text;
+ m_text = NULL ;
delete m_btn;
+ m_btn = NULL ;
}
// ----------------------------------------------------------------------------
// geometry
// ----------------------------------------------------------------------------
-wxSize wxSpinCtrl::DoGetBestClientSize() const
+wxSize wxSpinCtrl::DoGetBestSize() const
{
wxSize sizeBtn = m_btn->GetBestSize(),
sizeText = m_text->GetBestSize();
wxCoord wText = width - sizeBtn.x;
m_text->SetSize(x, y, wText, height);
- m_btn->SetSize(x + wText + MARGIN, y, -1, height);
+ m_btn->SetSize(x + wText + MARGIN, y, wxDefaultCoord, height);
}
// ----------------------------------------------------------------------------
bool wxSpinCtrl::Enable(bool enable)
{
if ( !wxControl::Enable(enable) )
- return FALSE;
+ return false;
m_btn->Enable(enable);
m_text->Enable(enable);
- return TRUE;
+ return true;
}
bool wxSpinCtrl::Show(bool show)
{
if ( !wxControl::Show(show) )
- return FALSE;
+ return false;
// under GTK Show() is called the first time before we are fully
// constructed
m_text->Show(show);
}
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
if ( !m_text->GetValue().ToLong(&l) )
{
// not a number at all
- return FALSE;
+ return false;
}
if ( l < GetMin() || l > GetMax() )
{
// out of range
- return FALSE;
+ return false;
}
*val = l;
- return TRUE;
+ return true;
}
int wxSpinCtrl::GetValue() const
m_text->SetSelection(0, -1);
// and give focus to the control!
- m_text->SetFocus();
+ // m_text->SetFocus(); Why???? TODO.
}
void wxSpinCtrl::SetValue(int val)
m_btn->SetRange(min, max);
}
+void wxSpinCtrl::SetSelection(long from, long to)
+{
+ wxCHECK_RET( m_text, _T("invalid call to wxSpinCtrl::SetSelection") );
+
+ m_text->SetSelection(from, to);
+}
+
+#endif // wxUSE_SPINCTRL
#endif // !wxPort-with-native-spinctrl
projects / wxWidgets.git / blobdiff