X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf532053942f79a2ca0e093b361724ad6a4d8c77..44f08a22919e354325a9e4a08e759a98d27683ed:/src/msw/slider95.cpp diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index 7afdc6357f..36e29a5da7 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "slider95.h" #endif @@ -37,7 +37,72 @@ #include #endif +#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 // Slider wxSlider95::wxSlider95() @@ -59,18 +124,16 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { + // default is no border if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT ) style |= wxBORDER_NONE; - SetName(name); -#if wxUSE_VALIDATORS - SetValidator(validator); -#endif // wxUSE_VALIDATORS + if ( !CreateBase(parent, id, pos, size, style, validator, name) ) + return FALSE; if (parent) parent->AddChild(this); - SetBackgroundColour(parent->GetBackgroundColour()) ; - SetForegroundColour(parent->GetForegroundColour()) ; + InheritAttributes(); m_staticValue = (WXHWND) NULL;; m_staticMin = (WXHWND) NULL;; @@ -80,16 +143,6 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, m_windowStyle = style; m_tickFreq = 0; - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - long msStyle = 0; long wstyle = 0; @@ -176,8 +229,6 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, ::SetWindowText((HWND) m_hWnd, wxEmptyString); - SetFont(parent->GetFont()); - if ( m_windowStyle & wxSL_LABELS ) { // Finally, create max value static item @@ -216,9 +267,13 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, } } - SetSize(x, y, width, height); + SetSize(pos.x, pos.y, size.x, size.y); SetValue(value); + // SetInitialBestSize is not called since we don't call MSWCreateControl + // for this control, so call SetBestSize here instead. + SetBestSize(size); + return TRUE; } @@ -329,11 +384,6 @@ void wxSlider95::SetValue(int value) } void wxSlider95::DoGetSize(int *width, int *height) const -{ - GetSize(width, height); -} - -void wxSlider95::GetSize(int *width, int *height) const { RECT rect; rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1; @@ -349,8 +399,10 @@ void wxSlider95::GetSize(int *width, int *height) const if (m_staticValue) wxFindMaxSize(m_staticValue, &rect); - *width = rect.right - rect.left; - *height = rect.bottom - rect.top; + if ( width ) + *width = rect.right - rect.left; + if ( height ) + *height = rect.bottom - rect.top; } void wxSlider95::GetPosition(int *x, int *y) const @@ -453,7 +505,9 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags) (int) min_len, cy, TRUE); x_offset += (int)(min_len + cx); - int slider_length = (int)(w1 - x_offset - max_len - cx); + // slider_length = (total width available) - (width used so far) + // - (width of max label) - (border) + int slider_length = (int)(w1 - (x_offset-x) - max_len - cx); int slider_height = h1; if (slider_height < 0 ) @@ -485,7 +539,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags) } if ( w1 < 0 ) - w1 = 200; + w1 = 100; if ( h1 < 0 ) h1 = 20; @@ -508,13 +562,6 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags) { 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 @@ -530,7 +577,9 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags) (int) min_len, cy, TRUE); y_offset += cy; - int slider_length = (int)(h1 - y_offset - cy - cy); + // slider_length = (total height available) - (height used so far) + // - (height of max label) - (border) + int slider_length = (int)(h1 - (y_offset-y) - cy - cy); int slider_width = w1; if (slider_width < 0 ) @@ -563,13 +612,94 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags) if ( w1 < 0 ) w1 = 20; if ( h1 < 0 ) - h1 = 200; + h1 = 100; ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE); } } } + +// A reimplementaion of the mess above changed a bit to just determine the min +// size needed. It would certainly be nice to refactor this and DoSetSize +// somehow. +wxSize wxSlider95::DoGetBestSize() const +{ + wxSize rv; + wxChar buf[300]; + int cx; + int cy; + int cyf; + int min_len = 0; + int max_len = 0; + + wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont()); + + if ( !HasFlag(wxSL_VERTICAL)) + { + rv = wxSize(100, 20); // default size for the slider itself + + if (HasFlag(wxSL_LABELS)) // do we need to add more for the labels? + { + ::GetWindowText((HWND) m_staticMin, buf, 300); + GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont()); + rv.x += min_len + cx; + + ::GetWindowText((HWND) m_staticMax, buf, 300); + GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont()); + rv.x += max_len + cx; + + 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) ; + + rv.x += new_width + cx; + rv.y = wxMax(valueHeight, rv.y); + } + } + } + else // ! wxSL_HORIZONTAL + { + rv = wxSize(20, 100); // default size for the slider itself + + if (HasFlag(wxSL_LABELS)) // do we need to add more for the labels? + { + ::GetWindowText((HWND) m_staticMin, buf, 300); + GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont()); + rv.y += cy; + + ::GetWindowText((HWND) m_staticMax, buf, 300); + GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont()); + rv.y += cy; + + if (m_staticValue) + { + int new_width = (int)(wxMax(min_len, max_len)); + int valueHeight = (int)cyf; + new_width += cx; + + // The height needs to be a bit bigger under Win95 if + // using native 3D effects. + valueHeight = (int) (valueHeight * 1.5) ; + rv.y += valueHeight; + rv.x = wxMax(new_width, rv.x); + } + } + } + return rv; +} + + void wxSlider95::SetRange(int minValue, int maxValue) { m_rangeMin = minValue;