wxTLW::SetLeft/RightMenu of smart phones documented.

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index d2963ecded00fdf782388a1582897ed18a28767d..4187123630beb5b457efb5adef6683f749bc04a3 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -49,7 +49,7 @@ wxBEGIN_FLAGS( wxSliderStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)

-    
+

     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)


@@ -147,7 +147,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
     if ( m_windowStyle & wxSL_LABELS )
     {
 
     if ( m_windowStyle & wxSL_LABELS )
     {

-        msStyle |= SS_CENTER;
+        msStyle |= SS_CENTER|WS_VISIBLE;

 
         WXDWORD exStyle = 0;
         long valueStyle = m_windowStyle & ~wxBORDER_MASK;
 
         WXDWORD exStyle = 0;
         long valueStyle = m_windowStyle & ~wxBORDER_MASK;


@@ -578,7 +578,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                 (int) min_len, cy, TRUE);
             y_offset += cy;
 
                 (int) min_len, cy, TRUE);
             y_offset += cy;
 

-            //  slider_length = (total height available) - (height used so far) 
+            //  slider_length = (total height available) - (height used so far)

             //                              - (height of max label) - (border)
             int slider_length = (int)(h1 - (y_offset-y) - cy - cy);
 
             //                              - (height of max label) - (border)
             int slider_length = (int)(h1 - (y_offset-y) - cy - cy);
 


@@ -628,18 +628,18 @@ wxSize wxSlider95::DoGetBestSize() const
 {
     wxSize rv;
     wxChar buf[300];
 {
     wxSize rv;
     wxChar buf[300];

-    int cx;    
+    int cx;

     int cy;
     int cyf;
     int min_len = 0;
     int max_len = 0;
     int cy;
     int cyf;
     int min_len = 0;
     int max_len = 0;

-    
+

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

-    
+

     if ( !HasFlag(wxSL_VERTICAL))
     {
         rv = wxSize(100, 20);  // default size for the slider itself
     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);
         if (HasFlag(wxSL_LABELS))  // do we need to add more for the labels?
         {
             ::GetWindowText((HWND) m_staticMin, buf, 300);


@@ -654,7 +654,7 @@ wxSize wxSlider95::DoGetBestSize() const
             {
                 int new_width = (int)(wxMax(min_len, max_len));
                 int valueHeight = (int)cyf;
             {
                 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
 #ifdef __WIN32__
                 // For some reason, under Win95, the text edit control has
                 // a lot of space before the first character


@@ -682,7 +682,7 @@ wxSize wxSlider95::DoGetBestSize() const
             ::GetWindowText((HWND) m_staticMax, buf, 300);
             GetTextExtent(buf, &max_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));
             if (m_staticValue)
             {
                 int new_width = (int)(wxMax(min_len, max_len));


@@ -694,7 +694,7 @@ wxSize wxSlider95::DoGetBestSize() const
                 valueHeight = (int) (valueHeight * 1.5) ;
                 rv.y += valueHeight;
                 rv.x = wxMax(new_width, rv.x);
                 valueHeight = (int) (valueHeight * 1.5) ;
                 rv.y += valueHeight;
                 rv.x = wxMax(new_width, rv.x);

-            }            
+            }

         }
     }
     return rv;
         }
     }
     return rv;


@@ -830,20 +830,16 @@ bool wxSlider95::Show(bool show)
 {
     wxWindow::Show(show);
 
 {
     wxWindow::Show(show);
 

-    int cshow;
-    if (show)
-        cshow = SW_SHOW;
-    else
-        cshow = SW_HIDE;
+    int cshow = show ? SW_SHOW : SW_HIDE;

 
     if(m_staticValue)
 
     if(m_staticValue)

-        ShowWindow((HWND) m_staticValue, (BOOL)cshow);
+        ShowWindow((HWND) m_staticValue, cshow);

 
     if(m_staticMin)
 
     if(m_staticMin)

-        ShowWindow((HWND) m_staticMin, (BOOL)cshow);
+        ShowWindow((HWND) m_staticMin, cshow);

 
     if(m_staticMax)
 
     if(m_staticMax)

-        ShowWindow((HWND) m_staticMax, (BOOL)cshow);
+        ShowWindow((HWND) m_staticMax, cshow);

 
     return true;
 }
 
     return true;
 }