X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c0a2c5c3eb089b70bcbe05325f1043b49358f13..8def743e8fcd51ba3e68cb6b59154d3557e18f79:/src/msw/spinctrl.cpp diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp index 2ee0255f6c..e8f8323ff3 100644 --- a/src/msw/spinctrl.cpp +++ b/src/msw/spinctrl.cpp @@ -33,29 +33,37 @@ #include "wx/wx.h" #endif +#if wxUSE_SPINCTRL + #if defined(__WIN95__) #include "wx/spinctrl.h" #include "wx/msw/private.h" -#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) +#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) #include #endif +#include // for INT_MIN + // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl) + +BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton) + EVT_SPIN(-1, wxSpinCtrl::OnSpinChange) +END_EVENT_TABLE() // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- -// the margin between the up-down control and its buddy -static const int MARGIN_BETWEEN = 5; +// the margin between the up-down control and its buddy (can be arbitrary, +// choose what you like - or may be decide during run-time depending on the +// font size?) +static const int MARGIN_BETWEEN = 1; // ============================================================================ // implementation @@ -67,6 +75,7 @@ static const int MARGIN_BETWEEN = 5; bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, + const wxString& value, const wxPoint& pos, const wxSize& size, long style, @@ -76,12 +85,19 @@ bool wxSpinCtrl::Create(wxWindow *parent, // before using DoGetBestSize(), have to set style to let the base class // know whether this is a horizontal or vertical control (we're always // vertical) - SetWindowStyle(style | wxSP_VERTICAL); + style |= wxSP_VERTICAL; + SetWindowStyle(style); // calculate the sizes: the size given is the toal size for both controls // and we need to fit them both in the given width (height is the same) wxSize sizeText(size), sizeBtn(size); sizeBtn.x = wxSpinButton::DoGetBestSize().x; + if ( sizeText.x <= 0 ) + { + // DEFAULT_ITEM_WIDTH is the default width for the text control + sizeText.x = DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN + sizeBtn.x; + } + sizeText.x -= sizeBtn.x + MARGIN_BETWEEN; if ( sizeText.x <= 0 ) { @@ -101,27 +117,18 @@ bool wxSpinCtrl::Create(wxWindow *parent, SetValue(initial); // create the text window - if ( sizeText.y <= 0 ) - { - // make it the same height as the button then - int x, y; - wxSpinButton::DoGetSize(&x, &y); - - sizeText.y = y; - } - m_hwndBuddy = (WXHWND)::CreateWindowEx ( - WS_EX_CLIENTEDGE, // sunken border - _T("EDIT"), // window class - NULL, // no window title - WS_CHILD | WS_VISIBLE | WS_BORDER, // style - pos.x, pos.y, // position - sizeText.x, sizeText.y, // size - GetHwndOf(parent), // parent - (HMENU)-1, // control id - wxGetInstance(), // app instance - NULL // unused client data + WS_EX_CLIENTEDGE, // sunken border + _T("EDIT"), // window class + NULL, // no window title + WS_CHILD | WS_BORDER, // style (will be shown later) + pos.x, pos.y, // position + 0, 0, // size (will be set later) + GetHwndOf(parent), // parent + (HMENU)-1, // control id + wxGetInstance(), // app instance + NULL // unused client data ); if ( !m_hwndBuddy ) @@ -132,22 +139,147 @@ bool wxSpinCtrl::Create(wxWindow *parent, } // should have the same font as the other controls - WXHANDLE hFont = GetParent()->GetFont().GetResourceHandle(); - ::SendMessage((HWND)m_hwndBuddy, WM_SETFONT, (WPARAM)hFont, TRUE); + SetFont(GetParent()->GetFont()); + + // set the size of the text window - can do it only now, because we + // couldn't call DoGetBestSize() before as font wasn't set + if ( sizeText.y <= 0 ) + { + int cx, cy; + wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); + + sizeText.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); + } + + DoMoveWindow(pos.x, pos.y, + sizeText.x + sizeBtn.x + MARGIN_BETWEEN, sizeText.y); + + (void)::ShowWindow((HWND)m_hwndBuddy, SW_SHOW); // associate the text window with the spin button - (void)SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0); + (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0); + + if ( !value.IsEmpty() ) + { + SetValue(value); + } + + return TRUE; +} + +// ---------------------------------------------------------------------------- +// wxTextCtrl-like methods +// ---------------------------------------------------------------------------- + +void wxSpinCtrl::SetValue(const wxString& text) +{ + if ( !::SetWindowText((HWND)m_hwndBuddy, text.c_str()) ) + { + wxLogLastError("SetWindowText(buddy)"); + } +} + +int wxSpinCtrl::GetValue() const +{ + wxString val = wxGetWindowText(m_hwndBuddy); + + long n; + if ( (wxSscanf(val, wxT("%lu"), &n) != 1) ) + n = INT_MIN; + + return n; +} + +// ---------------------------------------------------------------------------- +// forward some methods to subcontrols +// ---------------------------------------------------------------------------- + +bool wxSpinCtrl::SetFont(const wxFont& font) +{ + if ( !wxWindowBase::SetFont(font) ) + { + // nothing to do + return FALSE; + } + + WXHANDLE hFont = GetFont().GetResourceHandle(); + (void)::SendMessage((HWND)m_hwndBuddy, WM_SETFONT, (WPARAM)hFont, TRUE); + + return TRUE; +} + +bool wxSpinCtrl::Show(bool show) +{ + if ( !wxControl::Show(show) ) + { + return FALSE; + } + + ::ShowWindow((HWND)m_hwndBuddy, show ? SW_SHOW : SW_HIDE); return TRUE; } +bool wxSpinCtrl::Enable(bool enable) +{ + if ( !wxControl::Enable(enable) ) + { + return FALSE; + } + + ::EnableWindow((HWND)m_hwndBuddy, enable); + + return TRUE; +} + +void wxSpinCtrl::SetFocus() +{ + ::SetFocus((HWND)m_hwndBuddy); +} + +// ---------------------------------------------------------------------------- +// event processing +// ---------------------------------------------------------------------------- + +void wxSpinCtrl::OnSpinChange(wxSpinEvent& eventSpin) +{ + wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, GetId()); + event.SetEventObject(this); + event.SetInt(eventSpin.GetPosition()); + + (void)GetEventHandler()->ProcessEvent(event); + + if ( eventSpin.GetSkipped() ) + { + event.Skip(); + } +} + // ---------------------------------------------------------------------------- // size calculations // ---------------------------------------------------------------------------- +wxSize wxSpinCtrl::DoGetBestSize() const +{ + wxSize sizeBtn = wxSpinButton::DoGetBestSize(); + sizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN; + + int y; + wxGetCharSize(GetHWND(), NULL, &y, &GetFont()); + y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(y); + + if ( sizeBtn.y < y ) + { + // make the text tall enough + sizeBtn.y = y; + } + + return sizeBtn; +} + void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height) { - int widthBtn = DoGetBestSize().x; + int widthBtn = wxSpinButton::DoGetBestSize().x; int widthText = width - widthBtn - MARGIN_BETWEEN; if ( widthText <= 0 ) { @@ -167,3 +299,7 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height) } #endif // __WIN95__ + +#endif + // wxUSE_SPINCTRL +