Fix or add some DoGetBestSize's

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index 928ec45a0387ad3ed45ed27621d4191bf1009131..51befcee29c44c7b280efb910d7924e88f0f147f 100644 (file)
--- 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 45f1d7b86990d3c4d18d6c86546a371fd1909a3a..accbf868897740be66a9be6542979a246ae99045 100644 (file)
--- 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 45f1d7b86990d3c4d18d6c86546a371fd1909a3a..accbf868897740be66a9be6542979a246ae99045 100644 (file)
--- 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 33319d6811196b1fde9de3f8c5f93a438f30b680..6e3a01a249357441c9a697a3a2bd944cf727f524 100644 (file)
--- 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 7c9e6eab8ad0b9a2bc7c186efa83de3ea07794a3..1c723f2f21c62d958baa5b4eb95e10ffb7ec3475 100644 (file)
--- 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;