From 7bdfb981a826d29e292738a27700543fa10d2bfb Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 17 Apr 2004 02:00:24 +0000 Subject: [PATCH] Fix or add some DoGetBestSize's git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/slider95.h | 2 + src/gtk/gauge.cpp | 5 +- src/gtk1/gauge.cpp | 5 +- src/msw/gauge95.cpp | 5 +- src/msw/slider95.cpp | 100 +++++++++++++++++++++++++++++++++----- 5 files changed, 101 insertions(+), 16 deletions(-) diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h index 928ec45a03..51befcee29 100644 --- a/include/wx/msw/slider95.h +++ b/include/wx/msw/slider95.h @@ -99,6 +99,8 @@ protected: int width, int height, int sizeFlags = wxSIZE_AUTO); + virtual wxSize DoGetBestSize() const; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider95) }; diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp index 45f1d7b869..accbf86889 100644 --- a/src/gtk/gauge.cpp +++ b/src/gtk/gauge.cpp @@ -74,7 +74,10 @@ void wxGauge::DoSetGauge() wxSize wxGauge::DoGetBestSize() const { - return wxSize(100, 28); + if (HasFlag(wxGA_HORIZONTAL)) + return wxSize(100, 28); + else + return wxSize(28, 100); } void wxGauge::SetRange( int range ) diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp index 45f1d7b869..accbf86889 100644 --- a/src/gtk1/gauge.cpp +++ b/src/gtk1/gauge.cpp @@ -74,7 +74,10 @@ void wxGauge::DoSetGauge() wxSize wxGauge::DoGetBestSize() const { - return wxSize(100, 28); + if (HasFlag(wxGA_HORIZONTAL)) + return wxSize(100, 28); + else + return wxSize(28, 100); } void wxGauge::SetRange( int range ) diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp index 33319d6811..6e3a01a249 100644 --- a/src/msw/gauge95.cpp +++ b/src/msw/gauge95.cpp @@ -174,7 +174,10 @@ wxSize wxGauge95::DoGetBestSize() const { // VZ: no idea where does 28 come from, it was there before my changes and // as nobody ever complained I guess we can leave it... - return wxSize(100, 28); + if (HasFlag(wxGA_HORIZONTAL)) + return wxSize(100, 28); + else + return wxSize(28,100); } // ---------------------------------------------------------------------------- diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index 7c9e6eab8a..1c723f2f21 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -124,18 +124,16 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, const wxValidator& wxVALIDATOR_PARAM(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;; @@ -145,11 +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; @@ -547,7 +540,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; @@ -620,13 +613,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; -- 2.45.2