X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/983d2e14141fe848dffd97f1cb2d833a87c3c453..9af08eb82665ca5d28b28af50f345396a3cff717:/src/msw/slider95.cpp diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index 6c811b81e0..8d091ca80a 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -1,50 +1,146 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: slider95.cpp +// Name: msw/slider95.cpp // Purpose: wxSlider95, using the Win95 trackbar control // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart +// Copyright: (c) Julian Smart 1998 +// Vadim Zeitlin 2004 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +// ============================================================================ +// declarations +// ============================================================================ + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "slider95.h" #endif +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_SLIDER #ifndef WX_PRECOMP -#include "wx/utils.h" -#include "wx/brush.h" -#include "wx/slider.h" + #include "wx/brush.h" #endif -#ifdef __WIN95__ - -#include "wx/msw/slider95.h" -#include "wx/msw/private.h" +#include "wx/slider.h" +#include "wx/msw/subwin.h" -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) +#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) #include #endif -IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +// indices of labels in wxSlider95::m_labels +enum +{ + SliderLabel_Min, + SliderLabel_Max, + SliderLabel_Value, + SliderLabel_Last +}; + +// the gap between the slider and the labels, in pixels +static const int HGAP = 5; + +// ---------------------------------------------------------------------------- +// XTI +// ---------------------------------------------------------------------------- + +#if wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxSliderStyle ) + +wxBEGIN_FLAGS( wxSliderStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxBORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + + wxFLAGS_MEMBER(wxSL_HORIZONTAL) + wxFLAGS_MEMBER(wxSL_VERTICAL) + wxFLAGS_MEMBER(wxSL_AUTOTICKS) + wxFLAGS_MEMBER(wxSL_LABELS) + wxFLAGS_MEMBER(wxSL_LEFT) + wxFLAGS_MEMBER(wxSL_TOP) + wxFLAGS_MEMBER(wxSL_RIGHT) + wxFLAGS_MEMBER(wxSL_BOTTOM) + wxFLAGS_MEMBER(wxSL_BOTH) + wxFLAGS_MEMBER(wxSL_SELRANGE) + +wxEND_FLAGS( wxSliderStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider95, wxControl,"wx/scrolbar.h") + +wxBEGIN_PROPERTIES_TABLE(wxSlider95) + wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent ) + wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent ) + + wxPROPERTY( Value , int , SetValue, GetValue , 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( Maximum , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxSlider95) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_8( wxSlider95 , wxWindow* , Parent , wxWindowID , Id , int , Value , int , Minimum , int , Maximum , wxPoint , Position , wxSize , Size , long , WindowStyle ) +#else +IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl) +#endif + +// ============================================================================ +// wxSlider95 implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// construction +// ---------------------------------------------------------------------------- -// Slider -wxSlider95::wxSlider95() +void wxSlider95::Init() { - m_staticValue = (WXHWND) NULL; - m_staticMin = (WXHWND) NULL; - m_staticMax = (WXHWND) NULL; + m_labels = NULL; + m_pageSize = 1; m_lineSize = 1; m_rangeMax = 0; @@ -52,178 +148,111 @@ wxSlider95::wxSlider95() m_tickFreq = 0; } -bool wxSlider95::Create(wxWindow *parent, wxWindowID id, - int value, int minValue, int maxValue, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) +bool +wxSlider95::Create(wxWindow *parent, + wxWindowID id, + int value, + int minValue, + int maxValue, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { - if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT ) - style |= wxBORDER_NONE; - - SetName(name); -#if wxUSE_VALIDATORS - SetValidator(validator); -#endif // wxUSE_VALIDATORS - - if (parent) parent->AddChild(this); + // initialize everything + if ( !CreateControl(parent, id, pos, size, style, validator, name) ) + return false; - SetBackgroundColour(parent->GetBackgroundColour()) ; - SetForegroundColour(parent->GetForegroundColour()) ; + // ensure that we have correct values for GetLabelsSize() + m_rangeMin = minValue; + m_rangeMax = maxValue; - m_staticValue = (WXHWND) NULL;; - m_staticMin = (WXHWND) NULL;; - m_staticMax = (WXHWND) NULL;; - m_pageSize = 1; - m_lineSize = 1; - m_windowStyle = style; - m_tickFreq = 0; + // create the labels first, so that our DoGetBestSize() could take them + // into account + // + // note that we could simply create 3 wxStaticTexts here but it could + // result in some observable side effects at wx level (e.g. the parent of + // wxSlider would have 3 more children than expected) and so we prefer not + // to do it like this + if ( m_windowStyle & wxSL_LABELS ) + { + m_labels = new wxSubwindows(SliderLabel_Last); - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + HWND hwndParent = GetHwndOf(parent); + for ( size_t n = 0; n < SliderLabel_Last; n++ ) + { + (*m_labels)[n] = ::CreateWindow + ( + wxT("STATIC"), + NULL, + WS_CHILD | WS_VISIBLE | SS_CENTER, + 0, 0, 0, 0, + hwndParent, + (HMENU)NewControlId(), + wxGetInstance(), + NULL + ); + } - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; + m_labels->SetFont(GetFont()); + } - long msStyle = 0; - long wstyle = 0; + // now create the main control too + if ( !MSWCreateControl(TRACKBAR_CLASS, wxEmptyString, pos, size) ) + return false; - if ( m_windowStyle & wxSL_LABELS ) - { - msStyle |= SS_CENTER; - - WXDWORD exStyle = 0; - long valueStyle = m_windowStyle & ~wxBORDER_MASK; - valueStyle |= wxBORDER_SUNKEN; - msStyle |= MSWGetStyle(valueStyle, & exStyle) ; - - m_staticValue = (WXHWND) CreateWindowEx - ( - exStyle, wxT("STATIC"), NULL, - msStyle, - 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), - wxGetInstance(), NULL - ); - - // Now create min static control - wxString minLabel; - minLabel.Printf(wxT("%d"), minValue); - wstyle = STATIC_FLAGS; - if ( m_windowStyle & wxCLIP_SIBLINGS ) - msStyle |= WS_CLIPSIBLINGS; - m_staticMin = (WXHWND) CreateWindowEx - ( - 0, wxT("STATIC"), minLabel, - wstyle, - 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), - wxGetInstance(), NULL - ); - } + // and initialize everything + SetRange(minValue, maxValue); + SetValue(value); + SetPageSize((maxValue - minValue)/10); - WXDWORD exStyle = 0; + return true; +} - msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ; +WXDWORD wxSlider95::MSWGetStyle(long style, WXDWORD *exstyle) const +{ + WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle); - if (m_windowStyle & wxSL_VERTICAL) - msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ; - else - msStyle = TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ; + // TBS_HORZ is 0 anyhow, but do mention it explicitly for clarity + msStyle |= style & wxSL_VERTICAL ? TBS_VERT : TBS_HORZ; - if ( m_windowStyle & wxSL_AUTOTICKS ) + if ( style & wxSL_AUTOTICKS ) msStyle |= TBS_AUTOTICKS ; - if ( m_windowStyle & wxSL_LEFT ) + // again, TBS_RIGHT is 0 but do include it for clarity + if ( style & wxSL_LEFT ) msStyle |= TBS_LEFT; - else if ( m_windowStyle & wxSL_RIGHT ) + else if ( style & wxSL_RIGHT ) msStyle |= TBS_RIGHT; - else if ( m_windowStyle & wxSL_TOP ) + else if ( style & wxSL_TOP ) msStyle |= TBS_TOP; - else if ( m_windowStyle & wxSL_BOTTOM ) + else if ( style & wxSL_BOTTOM ) msStyle |= TBS_BOTTOM; - else if ( m_windowStyle & wxSL_BOTH ) + else if ( style & wxSL_BOTH ) msStyle |= TBS_BOTH; - else if ( ! (m_windowStyle & wxSL_AUTOTICKS) ) + else if ( !(style & wxSL_AUTOTICKS) ) msStyle |= TBS_NOTICKS; - if ( m_windowStyle & wxSL_SELRANGE ) + if ( style & wxSL_SELRANGE ) msStyle |= TBS_ENABLESELRANGE; - HWND scroll_bar = CreateWindowEx - ( - exStyle, TRACKBAR_CLASS, wxT(""), - msStyle, - 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, - wxGetInstance(), NULL - ); - - m_rangeMax = maxValue; - m_rangeMin = minValue; - - m_pageSize = (int)((maxValue-minValue)/10); - - ::SendMessage(scroll_bar, TBM_SETRANGE, TRUE, MAKELONG(minValue, maxValue)); - ::SendMessage(scroll_bar, TBM_SETPOS, TRUE, (LPARAM)value); - ::SendMessage(scroll_bar, TBM_SETPAGESIZE, 0, (LPARAM)m_pageSize); - - m_hWnd = (WXHWND)scroll_bar; - - SubclassWin(GetHWND()); - - ::SetWindowText((HWND) m_hWnd, wxT("")); - - SetFont(parent->GetFont()); - - if ( m_windowStyle & wxSL_LABELS ) - { - // Finally, create max value static item - wxString maxLabel; - maxLabel.Printf(wxT("%d"), maxValue); - wstyle = STATIC_FLAGS; - - if ( m_windowStyle & wxCLIP_SIBLINGS ) - msStyle |= WS_CLIPSIBLINGS; - - m_staticMax = (WXHWND) CreateWindowEx - ( - 0, wxT("STATIC"), maxLabel, - wstyle, - 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), - wxGetInstance(), NULL - ); - - - if (GetFont().Ok()) - { - if (GetFont().GetResourceHandle()) - { - if ( m_staticMin ) - ::SendMessage((HWND) m_staticMin, WM_SETFONT, - (WPARAM) GetFont().GetResourceHandle(), 0L); - - if ( m_staticMax ) - ::SendMessage((HWND) m_staticMax, WM_SETFONT, - (WPARAM) GetFont().GetResourceHandle(), 0L); - - if (m_staticValue) - ::SendMessage((HWND) m_staticValue, WM_SETFONT, - (WPARAM) GetFont().GetResourceHandle(), 0L); - } - } - } - - SetSize(x, y, width, height); - SetValue(value); + return msStyle; +} - return TRUE; +wxSlider95::~wxSlider95() +{ + delete m_labels; } -bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, - WXWORD WXUNUSED(pos), WXHWND control) +// ---------------------------------------------------------------------------- +// event handling +// ---------------------------------------------------------------------------- + +bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), + WXWORD wParam, + WXWORD WXUNUSED(pos), + WXHWND control) { wxEventType scrollEvent; switch ( wParam ) @@ -266,14 +295,14 @@ bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, default: // unknown scroll event? - return FALSE; + return false; } int newPos = (int) ::SendMessage((HWND) control, TBM_GETPOS, 0, 0); if ( (newPos < GetMin()) || (newPos > GetMax()) ) { // out of range - but we did process it - return TRUE; + return true; } SetValue(newPos); @@ -290,283 +319,190 @@ bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, return GetEventHandler()->ProcessEvent( cevent ); } -wxSlider95::~wxSlider95() +void wxSlider95::Command (wxCommandEvent & event) { - if (m_staticMin) - { - ::DestroyWindow((HWND) m_staticMin); - m_staticMin = (WXHWND) NULL; - } - - if (m_staticMax) - { - ::DestroyWindow((HWND) m_staticMax); - m_staticMax = (WXHWND) NULL; - } - - if (m_staticValue) - { - ::DestroyWindow((HWND) m_staticValue); - m_staticValue = (WXHWND) NULL; - } + SetValue (event.GetInt()); + ProcessCommand (event); } -int wxSlider95::GetValue() const -{ - return ::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0); -} +// ---------------------------------------------------------------------------- +// geometry stuff +// ---------------------------------------------------------------------------- -void wxSlider95::SetValue(int value) +wxRect wxSlider95::GetBoundingBox() const { - ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)value); + // take care not to call our own functions which would call us recursively + int x, y, w, h; + wxSliderBase::DoGetPosition(&x, &y); + wxSliderBase::DoGetSize(&w, &h); - if (m_staticValue) - { - wxString str; - str.Printf(wxT("%d"), value); - ::SetWindowText((HWND) m_staticValue, str); - } + wxRect rect(x, y, w, h); + if ( m_labels ) + rect.Union(m_labels->GetBoundingBox()); + + return rect; } void wxSlider95::DoGetSize(int *width, int *height) const { - GetSize(width, height); + wxRect rect = GetBoundingBox(); + + if ( width ) + *width = rect.width; + if ( height ) + *height = rect.height; } -void wxSlider95::GetSize(int *width, int *height) const +void wxSlider95::DoGetPosition(int *x, int *y) const { - RECT rect; - rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1; + wxRect rect = GetBoundingBox(); - wxFindMaxSize(GetHWND(), &rect); + if ( x ) + *x = rect.x; + if ( y ) + *y = rect.y; +} - if (m_staticMin) - wxFindMaxSize(m_staticMin, &rect); +int wxSlider95::GetLabelsSize(int *width) const +{ + int cy; - if (m_staticMax) - wxFindMaxSize(m_staticMax, &rect); + if ( width ) + { + // find the max label width + int wLabelMin, wLabelMax; + GetTextExtent(Format(m_rangeMin), &wLabelMin, &cy); + GetTextExtent(Format(m_rangeMax), &wLabelMax, &cy); - if (m_staticValue) - wxFindMaxSize(m_staticValue, &rect); + *width = wxMax(wLabelMin, wLabelMax); + } + else + { + cy = GetCharHeight(); + } - *width = rect.right - rect.left; - *height = rect.bottom - rect.top; + return EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); } -void wxSlider95::GetPosition(int *x, int *y) const +void wxSlider95::DoMoveWindow(int x, int y, int width, int height) { - wxWindow *parent = GetParent(); - RECT rect; - rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1; + // all complications below are because we need to position the labels, + // without them everything is easy + if ( !m_labels ) + { + wxSliderBase::DoMoveWindow(x, y, width, height); + return; + } - wxFindMaxSize(GetHWND(), &rect); + if ( HasFlag(wxSL_VERTICAL) ) + { + int wLabel; + int hLabel = GetLabelsSize(&wLabel); - if (m_staticMin) - wxFindMaxSize(m_staticMin, &rect); - if (m_staticMax) - wxFindMaxSize(m_staticMax, &rect); - if (m_staticValue) - wxFindMaxSize(m_staticValue, &rect); + int xLabel = HasFlag(wxSL_LEFT) ? x + width - wLabel : x; - // Since we now have the absolute screen coords, - // if there's a parent we must subtract its top left corner - POINT point; - point.x = rect.left; - point.y = rect.top; - if (parent) - ::ScreenToClient((HWND) parent->GetHWND(), &point); + // position the slider itself along the left/right edge + ::MoveWindow(GetHwnd(), + HasFlag(wxSL_LEFT) ? x : x + wLabel + HGAP, + y + hLabel/2, + width - wLabel - HGAP, + height - hLabel, + TRUE); - // We may be faking the client origin. - // So a window that's really at (0, 30) may appear - // (to wxWin apps) to be at (0, 0). - if (GetParent()) - { - wxPoint pt(GetParent()->GetClientAreaOrigin()); - point.x -= pt.x; - point.y -= pt.y; - } + // position all labels: min at the top, value in the middle and max at + // the bottom + ::MoveWindow((*m_labels)[SliderLabel_Min], + xLabel, y, wLabel, hLabel, TRUE); - *x = point.x; - *y = point.y; -} + ::MoveWindow((*m_labels)[SliderLabel_Value], + xLabel, y + (height - hLabel)/2, wLabel, hLabel, TRUE); -// TODO one day, make sense of all this horros and replace it with a readable -// DoGetBestSize() -void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags) -{ - int x1 = x; - int y1 = y; - int w1 = width; - int h1 = height; + ::MoveWindow((*m_labels)[SliderLabel_Max], + xLabel, y + height - hLabel, wLabel, hLabel, TRUE); + } + else // horizontal + { + int wLabel; + int hLabel = GetLabelsSize(&wLabel); - int currentX, currentY; - GetPosition(¤tX, ¤tY); - if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - x1 = currentX; - if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - y1 = currentY; + int yLabel = HasFlag(wxSL_TOP) ? y + height - hLabel : y; - AdjustForParentClientOrigin(x1, y1, sizeFlags); + // position the slider itself along the top/bottom edge + ::MoveWindow(GetHwnd(), + x, + HasFlag(wxSL_TOP) ? y : y + hLabel, + width, + height - hLabel, + TRUE); - wxChar buf[300]; + // position all labels: min on the left, value in the middle and max to + // the right + ::MoveWindow((*m_labels)[SliderLabel_Min], + x, yLabel, wLabel, hLabel, TRUE); - int x_offset = x; - int y_offset = y; + ::MoveWindow((*m_labels)[SliderLabel_Value], + x + (width - wLabel)/2, yLabel, wLabel, hLabel, TRUE); - int cx; // slider,min,max sizes - int cy; - int cyf; + ::MoveWindow((*m_labels)[SliderLabel_Max], + x + width - wLabel, yLabel, wLabel, hLabel, TRUE); + } +} - wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont()); +wxSize wxSlider95::DoGetBestSize() const +{ + // these values are arbitrary + static const int length = 100; + static const int thickness = 26; - if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL) + wxSize size; + if ( HasFlag(wxSL_VERTICAL) ) { - if ( m_windowStyle & wxSL_LABELS ) - { - int min_len = 0; - - ::GetWindowText((HWND) m_staticMin, buf, 300); - GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont()); - - int max_len = 0; - - ::GetWindowText((HWND) m_staticMax, buf, 300); - GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont()); - if (m_staticValue) - { - int new_width = (int)(wxMax(min_len, max_len)); - int valueHeight = (int)cyf; -#ifdef __WIN32__ - // For some reason, under Win95, the text edit control has - // a lot of space before the first character - new_width += 3*cx; -#endif - // The height needs to be a bit bigger under Win95 if - // using native 3D effects. - valueHeight = (int) (valueHeight * 1.5) ; - ::MoveWindow((HWND) m_staticValue, x_offset, y_offset, - new_width, valueHeight, TRUE); - x_offset += new_width + cx; - } - - MoveWindow((HWND) m_staticMin, x_offset, y_offset, - (int) min_len, cy, TRUE); - x_offset += (int)(min_len + cx); - - int slider_length = (int)(w1 - x_offset - max_len - cx); - - int slider_height = h1; - if (slider_height < 0 ) - slider_height = 20; - - // Slider must have a minimum/default length/height - if (slider_length < 100) - slider_length = 100; - - ::MoveWindow(GetHwnd(), x_offset, y_offset, - slider_length, slider_height, TRUE); - x_offset += slider_length + cx; - - MoveWindow((HWND) m_staticMax, x_offset, y_offset, - (int) max_len, cy, TRUE); - } - else + size.x = thickness; + size.y = length; + + if ( m_labels ) { - // No labels - // If we're prepared to use the existing size, then... - if - ( - width == -1 - && height == -1 - && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO) - ) - { - GetSize(&w1, &h1); - } - - if ( w1 < 0 ) - w1 = 200; - if ( h1 < 0 ) - h1 = 20; - - ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE); + int wLabel; + int hLabel = GetLabelsSize(&wLabel); + + // account for the labels + size.x += HGAP + wLabel; + + // labels are indented relative to the slider itself + size.y += hLabel; } } - else + else // horizontal { - if ( m_windowStyle & wxSL_LABELS ) - { - int min_len; - ::GetWindowText((HWND) m_staticMin, buf, 300); - GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont()); - - int max_len; - ::GetWindowText((HWND) m_staticMax, buf, 300); - GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont()); - - if (m_staticValue) - { - int new_width = (int)(wxMax(min_len, max_len)); - int valueHeight = (int)cyf; -/*** Suggested change by George Tasker - remove this block... -#ifdef __WIN32__ - // For some reason, under Win95, the text edit control has - // a lot of space before the first character - new_width += 3*cx; -#endif - ... and replace with following line: */ - new_width += cx; - - // The height needs to be a bit bigger under Win95 if - // using native 3D effects. - valueHeight = (int) (valueHeight * 1.5) ; + size.x = length; + size.y = thickness; - ::MoveWindow((HWND) m_staticValue, x_offset, y_offset, - new_width, valueHeight, TRUE); - y_offset += valueHeight; - } - - ::MoveWindow((HWND) m_staticMin, x_offset, y_offset, - (int) min_len, cy, TRUE); - y_offset += cy; + if ( m_labels ) + { + // labels add extra height + size.y += GetLabelsSize(); + } + } - int slider_length = (int)(h1 - y_offset - cy - cy); + return size; +} - int slider_width = w1; - if (slider_width < 0 ) - slider_width = 20; +// ---------------------------------------------------------------------------- +// slider-specific methods +// ---------------------------------------------------------------------------- - // Slider must have a minimum/default length - if (slider_length < 100) - slider_length = 100; +int wxSlider95::GetValue() const +{ + return ::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0); +} - ::MoveWindow(GetHwnd(), x_offset, y_offset, - slider_width, slider_length, TRUE); - y_offset += slider_length; +void wxSlider95::SetValue(int value) +{ + ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)value); - ::MoveWindow((HWND) m_staticMax, x_offset, y_offset, - (int)max_len, cy, TRUE); - } - else - { - // No labels - // If we're prepared to use the existing size, then... - if - ( - width == -1 && height == -1 - && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO) - ) - { - GetSize(&w1, &h1); - } - - if ( w1 < 0 ) - w1 = 20; - if ( h1 < 0 ) - h1 = 200; - - ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE); - } + if ( m_labels ) + { + ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value)); } } @@ -577,97 +513,76 @@ void wxSlider95::SetRange(int minValue, int maxValue) ::SendMessage(GetHwnd(), TBM_SETRANGE, TRUE, MAKELONG(minValue, maxValue)); - wxChar buf[40]; - if ( m_staticMin ) + if ( m_labels ) { - wxSprintf(buf, wxT("%d"), m_rangeMin); - ::SetWindowText((HWND) m_staticMin, buf); - } - - if ( m_staticMax ) - { - wxSprintf(buf, wxT("%d"), m_rangeMax); - ::SetWindowText((HWND) m_staticMax, buf); + ::SetWindowText((*m_labels)[SliderLabel_Min], Format(m_rangeMin)); + ::SetWindowText((*m_labels)[SliderLabel_Max], Format(m_rangeMax)); } } -WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) -{ - if ( nCtlColor == CTLCOLOR_SCROLLBAR ) - return 0; - - // Otherwise, it's a static - return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam); -} - -// For trackbars only void wxSlider95::SetTickFreq(int n, int pos) { - m_tickFreq = n; - ::SendMessage( GetHwnd(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos ); + m_tickFreq = n; + ::SendMessage( GetHwnd(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos ); } void wxSlider95::SetPageSize(int pageSize) { - ::SendMessage( GetHwnd(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize ); - m_pageSize = pageSize; + ::SendMessage( GetHwnd(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize ); + m_pageSize = pageSize; } int wxSlider95::GetPageSize() const { - return m_pageSize; + return m_pageSize; } void wxSlider95::ClearSel() { - ::SendMessage( GetHwnd(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0 ); + ::SendMessage(GetHwnd(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0); } void wxSlider95::ClearTicks() { - ::SendMessage( GetHwnd(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0 ); + ::SendMessage(GetHwnd(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0); } void wxSlider95::SetLineSize(int lineSize) { m_lineSize = lineSize; - ::SendMessage( GetHwnd(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize ); + ::SendMessage(GetHwnd(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize); } int wxSlider95::GetLineSize() const { - return (int) ::SendMessage( GetHwnd(), TBM_GETLINESIZE, - (WPARAM) 0, (LPARAM) 0 ); + return (int)::SendMessage(GetHwnd(), TBM_GETLINESIZE, 0, 0); } int wxSlider95::GetSelEnd() const { - return (int) ::SendMessage( GetHwnd(), TBM_SETSELEND, - (WPARAM) 0, (LPARAM) 0 ); + return (int)::SendMessage(GetHwnd(), TBM_SETSELEND, 0, 0); } int wxSlider95::GetSelStart() const { - return (int) ::SendMessage( GetHwnd(), TBM_GETSELSTART, - (WPARAM) 0, (LPARAM) 0 ); + return (int)::SendMessage(GetHwnd(), TBM_GETSELSTART, 0, 0); } void wxSlider95::SetSelection(int minPos, int maxPos) { ::SendMessage(GetHwnd(), TBM_SETSEL, - (WPARAM) TRUE, (LPARAM) MAKELONG( minPos, maxPos) ); + (WPARAM) TRUE /* redraw */, + (LPARAM) MAKELONG( minPos, maxPos) ); } void wxSlider95::SetThumbLength(int len) { - ::SendMessage( GetHwnd(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0 ); + ::SendMessage(GetHwnd(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0); } int wxSlider95::GetThumbLength() const { - return (int) ::SendMessage( GetHwnd(), TBM_GETTHUMBLENGTH, - (WPARAM) 0, (LPARAM) 0 ); + return (int)::SendMessage( GetHwnd(), TBM_GETTHUMBLENGTH, 0, 0); } void wxSlider95::SetTick(int tickPos) @@ -675,45 +590,39 @@ void wxSlider95::SetTick(int tickPos) ::SendMessage( GetHwnd(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos ); } -bool wxSlider95::ContainsHWND(WXHWND hWnd) const +// ---------------------------------------------------------------------------- +// composite control methods +// ---------------------------------------------------------------------------- + +WXHWND wxSlider95::GetStaticMin() const { - return - ( - hWnd == GetStaticMin() - || hWnd == GetStaticMax() - || hWnd == GetEditValue() - ); + return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Min] : NULL; } -void wxSlider95::Command (wxCommandEvent & event) +WXHWND wxSlider95::GetStaticMax() const { - SetValue (event.GetInt()); - ProcessCommand (event); + return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Max] : NULL; } -bool wxSlider95::Show(bool show) +WXHWND wxSlider95::GetEditValue() const { - wxWindow::Show(show); - - int cshow; - if (show) - cshow = SW_SHOW; - else - cshow = SW_HIDE; + return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Value] : NULL; +} - if(m_staticValue) - ShowWindow((HWND) m_staticValue, (BOOL)cshow); +bool wxSlider95::ContainsHWND(WXHWND hWnd) const +{ + return m_labels && m_labels->HasWindow((HWND)hWnd); +} - if(m_staticMin) - ShowWindow((HWND) m_staticMin, (BOOL)cshow); +bool wxSlider95::Show(bool show) +{ + if ( !wxSliderBase::Show(show) ) + return false; - if(m_staticMax) - ShowWindow((HWND) m_staticMax, (BOOL)cshow); + if ( m_labels ) + m_labels->Show(show); - return TRUE; + return true; } -#endif - // __WIN95__ - #endif // wxUSE_SLIDER