Backed-out PNG8 patch (no time to look at why

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

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index 9824dafd2a4f473746692d5f45dd67322ae21055..45879e284c40c3a6e08c8ace1cde985d98cd3cd6 100644 (file)
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:       wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "slidrmsw.h"
 #endif
 
 #pragma implementation "slidrmsw.h"
 #endif
 


@@ -50,6 +50,9 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

+    if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+        style |= wxBORDER_NONE;
+

   SetName(name);
 #if wxUSE_VALIDATORS
   SetValidator(validator);
   SetName(name);
 #if wxUSE_VALIDATORS
   SetValidator(validator);


@@ -66,7 +69,7 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   m_lineSize = 1;
   m_windowStyle = style;
 
   m_lineSize = 1;
   m_windowStyle = style;
 

-  if ( id == -1 )
+  if ( id == wxID_ANY )

       m_windowId = (int)NewControlId();
   else
     m_windowId = id;
       m_windowId = (int)NewControlId();
   else
     m_windowId = id;


@@ -77,14 +80,11 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   int height = size.y;
 
   // non-Win95 implementation
   int height = size.y;
 
   // non-Win95 implementation

-  
-  long msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;

 
 

-   if ( m_windowStyle & wxCLIP_SIBLINGS )
-        msStyle |= WS_CLIPSIBLINGS;
+  long msStyle = SS_CENTER;

 
 

-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+  WXDWORD exStyle = 0;
+  msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;

 
   m_staticValue = (WXHWND) CreateWindowEx(exStyle, wxT("STATIC"), NULL,
                            msStyle,
 
   m_staticValue = (WXHWND) CreateWindowEx(exStyle, wxT("STATIC"), NULL,
                            msStyle,


@@ -92,11 +92,12 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
                            wxGetInstance(), NULL);
 
   // Now create min static control
                            wxGetInstance(), NULL);
 
   // Now create min static control

-  wxSprintf(wxBuffer, wxT("%d"), minValue);
+  wxString buf;
+  buf.Printf(wxT("%d"), minValue);

   DWORD wstyle = STATIC_FLAGS;
   if ( m_windowStyle & wxCLIP_SIBLINGS )
         wstyle |= WS_CLIPSIBLINGS;
   DWORD wstyle = STATIC_FLAGS;
   if ( m_windowStyle & wxCLIP_SIBLINGS )
         wstyle |= WS_CLIPSIBLINGS;

-  m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
+  m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), buf,

                          wstyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);
                          wstyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);


@@ -107,7 +108,7 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   else
     msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 
   else
     msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 

-  HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("SCROLLBAR"), wxBuffer,
+  HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxEmptyString,

                          msStyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                          wxGetInstance(), NULL);
                          msStyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                          wxGetInstance(), NULL);


@@ -126,11 +127,11 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   SubclassWin(GetHWND());
 
   // Finally, create max value static item
   SubclassWin(GetHWND());
 
   // Finally, create max value static item

-  wxSprintf(wxBuffer, wxT("%d"), maxValue);
+  buf.Printf(wxT("%d"), maxValue);

   wstyle = STATIC_FLAGS;
   if ( m_windowStyle & wxCLIP_SIBLINGS )
         wstyle |= WS_CLIPSIBLINGS;
   wstyle = STATIC_FLAGS;
   if ( m_windowStyle & wxCLIP_SIBLINGS )
         wstyle |= WS_CLIPSIBLINGS;

-  m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
+  m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), buf,

                          wstyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);
                          wstyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                          wxGetInstance(), NULL);


@@ -157,7 +158,7 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   SetSize(x, y, width, height);
   SetValue(value);
 
   SetSize(x, y, width, height);
   SetValue(value);
 

-  return TRUE;
+  return true;

 }
 
 bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
 }
 
 bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,


@@ -216,7 +217,7 @@ bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     if (nScrollInc == 0)
     {
         // no event...
     if (nScrollInc == 0)
     {
         // no event...

-        return FALSE;
+        return false;

     }
 
     int newPos = position + nScrollInc;
     }
 
     int newPos = position + nScrollInc;


@@ -224,7 +225,7 @@ bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     if ( (newPos < GetMin()) || (newPos > GetMax()) )
     {
         // out of range - but we did process it
     if ( (newPos < GetMin()) || (newPos > GetMax()) )
     {
         // out of range - but we did process it

-        return TRUE;
+        return true;

     }
 
     SetValue(newPos);
     }
 
     SetValue(newPos);


@@ -261,8 +262,9 @@ void wxSliderMSW::SetValue(int value)
   ::SetScrollPos(GetHwnd(), SB_CTL, value, TRUE);
   if (m_staticValue)
   {
   ::SetScrollPos(GetHwnd(), SB_CTL, value, TRUE);
   if (m_staticValue)
   {

-    wxSprintf(wxBuffer, wxT("%d"), value);
-    SetWindowText((HWND) m_staticValue, wxBuffer);
+    wxString buf;
+    buf.Printf(wxT("%d"), value);
+    SetWindowText((HWND) m_staticValue, buf);

   }
 }
 
   }
 }
 


@@ -331,9 +333,9 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
 
   int currentX, currentY;
   GetPosition(&currentX, &currentY);

-  if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+  if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

     x1 = currentX;
     x1 = currentX;

-  if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+  if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

     y1 = currentY;
 
   AdjustForParentClientOrigin(x1, y1, sizeFlags);
     y1 = currentY;
 
   AdjustForParentClientOrigin(x1, y1, sizeFlags);


@@ -347,7 +349,7 @@ void wxSliderMSW::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)
   {


@@ -371,11 +373,11 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
       // a lot of space before the first character
       new_width += 3*cx;
 #endif
       // a lot of space before the first character
       new_width += 3*cx;
 #endif

-      MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE);
+      ::MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE);

       x_offset += new_width + cx;
     }
 
       x_offset += new_width + cx;
     }
 

-    MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE);
+    ::MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE);

     x_offset += (int)(min_len + cx);
 
     int slider_length = (int)(w1 - x_offset - max_len - cx);
     x_offset += (int)(min_len + cx);
 
     int slider_length = (int)(w1 - x_offset - max_len - cx);


@@ -386,10 +388,10 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (slider_length < 100)
       slider_length = 100;
 
     if (slider_length < 100)
       slider_length = 100;
 

-    MoveWindow(GetHwnd(), x_offset, y_offset, slider_length, slider_height, TRUE);
+    ::MoveWindow(GetHwnd(), x_offset, y_offset, slider_length, slider_height, TRUE);

     x_offset += slider_length + cx;
 
     x_offset += slider_length + cx;
 

-    MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
+    ::MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);

     }
     else
     {
     }
     else
     {


@@ -398,7 +400,7 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             w1 = 200;
         if ( h1 < 0 )
             h1 = 20;
             w1 = 200;
         if ( h1 < 0 )
             h1 = 20;

-        MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
+        ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);

     }
   }
   else
     }
   }
   else


@@ -426,11 +428,11 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
  ... and replace with following line: */
       new_width += cx;
 
  ... and replace with following line: */
       new_width += cx;
 

-      MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE);
+      ::MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE);

       y_offset += valueHeight;
     }
 
       y_offset += valueHeight;
     }
 

-    MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE);
+    ::MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE);

     y_offset += cy;
 
     int slider_length = (int)(h1 - y_offset - cy - cy);
     y_offset += cy;
 
     int slider_length = (int)(h1 - y_offset - cy - cy);


@@ -442,10 +444,10 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (slider_length < 100)
       slider_length = 100;
 
     if (slider_length < 100)
       slider_length = 100;
 

-    MoveWindow(GetHwnd(), x_offset, y_offset, slider_width, slider_length, TRUE);
+    ::MoveWindow(GetHwnd(), x_offset, y_offset, slider_width, slider_length, TRUE);

     y_offset += slider_length;
 
     y_offset += slider_length;
 

-    MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
+    ::MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);

     }
     else
     {
     }
     else
     {


@@ -454,7 +456,7 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             w1 = 20;
         if ( h1 < 0 )
             h1 = 200;
             w1 = 20;
         if ( h1 < 0 )
             h1 = 200;

-        MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
+        ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);

     }
   }
 }
     }
   }
 }


@@ -479,16 +481,6 @@ void wxSliderMSW::SetRange(int minValue, int maxValue)
   }
 }
 
   }
 }
 

-WXHBRUSH wxSliderMSW::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-  if ( nCtlColor == CTLCOLOR_SCROLLBAR )
-    return 0;
-
-  // Otherwise, it's a static
-  return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
-}
-

 void wxSliderMSW::SetPageSize(int pageSize)
 {
   m_pageSize = pageSize;
 void wxSliderMSW::SetPageSize(int pageSize)
 {
   m_pageSize = pageSize;


@@ -547,7 +539,7 @@ bool wxSliderMSW::Show(bool show)
         ShowWindow((HWND) m_staticMin, (BOOL)cshow);
     if(m_staticMax)
         ShowWindow((HWND) m_staticMax, (BOOL)cshow);
         ShowWindow((HWND) m_staticMin, (BOOL)cshow);
     if(m_staticMax)
         ShowWindow((HWND) m_staticMax, (BOOL)cshow);

-    return TRUE;
+    return true;

 }
 
 
 }