adaptions to m_peer methods

[wxWidgets.git] / src / msw / slider95.cpp

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 50b340c87b668c181e0f019bdc6724e5ccbf729d..49038728576b4b2b0412c30a6bca8e1ff122cfdb 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -93,7 +93,7 @@ wxBEGIN_PROPERTIES_TABLE(wxSlider95)
        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( 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
+    wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style

 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxSlider95)
 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxSlider95)


@@ -121,21 +121,19 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos,
            const wxSize& size, long style,
            int value, int minValue, int maxValue,
            const wxPoint& pos,
            const wxSize& size, long style,

-           const wxValidator& wxVALIDATOR_PARAM(validator),
+           const wxValidator& validator,

            const wxString& name)
 {
            const wxString& name)
 {

+    // default is no border

     if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
         style |= wxBORDER_NONE;
 
     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);
 
 
     if (parent) parent->AddChild(this);
 

-    SetBackgroundColour(parent->GetBackgroundColour()) ;
-    SetForegroundColour(parent->GetForegroundColour()) ;
+    InheritAttributes();

 
     m_staticValue = (WXHWND) NULL;;
     m_staticMin = (WXHWND) NULL;;
 
     m_staticValue = (WXHWND) NULL;;
     m_staticMin = (WXHWND) NULL;;


@@ -145,16 +143,6 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
     m_windowStyle = style;
     m_tickFreq = 0;
 
     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;
 
     long msStyle = 0;
     long wstyle = 0;
 


@@ -279,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);
 
     SetValue(value);
 

+    // SetInitialBestSize is not called since we don't call MSWCreateControl
+    // for this control, so call SetBestSize here instead.
+    SetBestSize(size);
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -477,7 +469,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     int cy;
     int cyf;
 
     int cy;
     int cyf;
 

-    wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
+    wxGetCharSize(GetHWND(), &cx, &cy, this->GetFont());

 
     if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
     {
 
     if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
     {


@@ -486,12 +478,12 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             int min_len = 0;
 
             ::GetWindowText((HWND) m_staticMin, buf, 300);
             int min_len = 0;
 
             ::GetWindowText((HWND) m_staticMin, buf, 300);

-            GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &min_len, &cyf);

 
             int max_len = 0;
 
             ::GetWindowText((HWND) m_staticMax, buf, 300);
 
             int max_len = 0;
 
             ::GetWindowText((HWND) m_staticMax, buf, 300);

-            GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &max_len, &cyf);

             if (m_staticValue)
             {
                 int new_width = (int)(wxMax(min_len, max_len));
             if (m_staticValue)
             {
                 int new_width = (int)(wxMax(min_len, max_len));


@@ -547,7 +539,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             }
 
             if ( w1 < 0 )
             }
 
             if ( w1 < 0 )

-                w1 = 200;
+                w1 = 100;

             if ( h1 < 0 )
                 h1 = 20;
 
             if ( h1 < 0 )
                 h1 = 20;
 


@@ -560,11 +552,11 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         {
             int min_len;
             ::GetWindowText((HWND) m_staticMin, buf, 300);
         {
             int min_len;
             ::GetWindowText((HWND) m_staticMin, buf, 300);

-            GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &min_len, &cyf);

 
             int max_len;
             ::GetWindowText((HWND) m_staticMax, buf, 300);
 
             int max_len;
             ::GetWindowText((HWND) m_staticMax, buf, 300);

-            GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &max_len, &cyf);

 
             if (m_staticValue)
             {
 
             if (m_staticValue)
             {


@@ -620,13 +612,94 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             if ( w1 < 0 )
                 w1 = 20;
             if ( h1 < 0 )
             if ( w1 < 0 )
                 w1 = 20;
             if ( h1 < 0 )

-                h1 = 200;
+                h1 = 100;

 
             ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
         }
     }
 }
 
 
             ::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);
+            rv.x += min_len + cx;
+
+            ::GetWindowText((HWND) m_staticMax, buf, 300);
+            GetTextExtent(buf, &max_len, &cyf);
+            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);
+            rv.y += cy;
+
+            ::GetWindowText((HWND) m_staticMax, buf, 300);
+            GetTextExtent(buf, &max_len, &cyf);
+            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;
 void wxSlider95::SetRange(int minValue, int maxValue)
 {
     m_rangeMin = minValue;