X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f605ccf3fcce969d9a634bf1cf6aa4f13f74d2e..bcd3832a828d146855028f75379749a4569d3318:/src/msw/slider95.cpp diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index 992b61e96e..950348d781 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -5,11 +5,11 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "slider95.h" #endif @@ -33,11 +33,76 @@ #include "wx/msw/slider95.h" #include "wx/msw/private.h" -#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) +#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) #include #endif -IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) +#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(wxNO_BORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxNO_FULL_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 , , 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 // Slider wxSlider95::wxSlider95() @@ -59,6 +124,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { + if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT ) + style |= wxBORDER_NONE; + SetName(name); #if wxUSE_VALIDATORS SetValidator(validator); @@ -90,15 +158,14 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, long msStyle = 0; long wstyle = 0; - if ( m_windowStyle & wxCLIP_SIBLINGS ) - msStyle |= WS_CLIPSIBLINGS; - if ( m_windowStyle & wxSL_LABELS ) { - msStyle |= WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER; + msStyle |= SS_CENTER; - bool want3D; - WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ; + WXDWORD exStyle = 0; + long valueStyle = m_windowStyle & ~wxBORDER_MASK; + valueStyle |= wxBORDER_SUNKEN; + msStyle |= MSWGetStyle(valueStyle, & exStyle) ; m_staticValue = (WXHWND) CreateWindowEx ( @@ -109,23 +176,23 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, ); // Now create min static control - wxSprintf(wxBuffer, wxT("%d"), minValue); + 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"), wxBuffer, + 0, wxT("STATIC"), minLabel, wstyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), wxGetInstance(), NULL ); } - msStyle = 0; + WXDWORD exStyle = 0; - if ( m_windowStyle & wxCLIP_SIBLINGS ) - msStyle |= WS_CLIPSIBLINGS; + msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ; if (m_windowStyle & wxSL_VERTICAL) msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ; @@ -153,7 +220,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, HWND scroll_bar = CreateWindowEx ( - MakeExtendedStyle(m_windowStyle), TRACKBAR_CLASS, wxBuffer, + exStyle, TRACKBAR_CLASS, wxEmptyString, msStyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL @@ -172,14 +239,15 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, SubclassWin(GetHWND()); - ::SetWindowText((HWND) m_hWnd, wxT("")); + ::SetWindowText((HWND) m_hWnd, wxEmptyString); SetFont(parent->GetFont()); if ( m_windowStyle & wxSL_LABELS ) { // Finally, create max value static item - wxSprintf(wxBuffer, wxT("%d"), maxValue); + wxString maxLabel; + maxLabel.Printf(wxT("%d"), maxValue); wstyle = STATIC_FLAGS; if ( m_windowStyle & wxCLIP_SIBLINGS ) @@ -187,7 +255,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, m_staticMax = (WXHWND) CreateWindowEx ( - 0, wxT("STATIC"), wxBuffer, + 0, wxT("STATIC"), maxLabel, wstyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), wxGetInstance(), NULL @@ -250,10 +318,17 @@ bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, break; case SB_THUMBTRACK: - case SB_THUMBPOSITION: scrollEvent = wxEVT_SCROLL_THUMBTRACK; break; + case SB_THUMBPOSITION: + scrollEvent = wxEVT_SCROLL_THUMBRELEASE; + break; + + case SB_ENDSCROLL: + scrollEvent = wxEVT_SCROLL_ENDSCROLL; + break; + default: // unknown scroll event? return FALSE; @@ -312,8 +387,9 @@ void wxSlider95::SetValue(int value) if (m_staticValue) { - wxSprintf(wxBuffer, wxT("%d"), value); - ::SetWindowText((HWND) m_staticValue, wxBuffer); + wxString str; + str.Printf(wxT("%d"), value); + ::SetWindowText((HWND) m_staticValue, str); } } @@ -583,9 +659,13 @@ void wxSlider95::SetRange(int minValue, int maxValue) WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { +#ifndef __WXWINCE__ if ( nCtlColor == CTLCOLOR_SCROLLBAR ) return 0; - +#else + if ( nCtlColor != CTLCOLOR_STATIC ) + return 0; +#endif // Otherwise, it's a static return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam); }