1. added wxStatusBarUniv
2. several bug fixes to wxSpinButton/wxSpinCtrl git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -69,13 +69,13 @@ protected:
|
||||
|
||||
event.Skip();
|
||||
}
|
||||
|
||||
|
||||
bool ProcessEvent(wxEvent &event)
|
||||
{
|
||||
// Hand button down events to wxSpinCtrl. Doesn't work.
|
||||
if (event.GetEventType() == wxEVT_LEFT_DOWN && m_spin->ProcessEvent( event ))
|
||||
return TRUE;
|
||||
|
||||
|
||||
return wxTextCtrl::ProcessEvent( event );
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@ public:
|
||||
{
|
||||
m_spin = spin;
|
||||
|
||||
SetWindowStyle(style);
|
||||
SetWindowStyle(style | wxSP_VERTICAL);
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -155,6 +155,17 @@ bool wxSpinCtrl::Create(wxWindow *parent,
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
// the string value overrides the numeric one (for backwards compatibility
|
||||
// reasons and also because it is simpler to satisfy the string value which
|
||||
// comes much sooner in the list of arguments and leave the initial
|
||||
// parameter unspecified)
|
||||
if ( !value.empty() )
|
||||
{
|
||||
long l;
|
||||
if ( value.ToLong(&l) )
|
||||
initial = l;
|
||||
}
|
||||
|
||||
SetBackgroundColour(*wxRED);
|
||||
m_text = new wxSpinCtrlText(this, value);
|
||||
m_btn = new wxSpinCtrlButton(this, style);
|
||||
|
Reference in New Issue
Block a user