X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d56fb8fcdb469bdef549319b2d81ab4b02b5a67..a174f139e105c38ae852104eb6a894b3a0d88e07:/src/msw/scrolbar.cpp

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index 007c98067f..5cfec12c46 100644
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        scrolbar.cpp
+// Name:        msw/scrolbar.cpp
 // Purpose:     wxScrollBar
 // Author:      Julian Smart
 // Modified by:
@@ -10,19 +10,20 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "scrolbar.h"
+    #pragma implementation "scrolbar.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_SCROLLBAR
+
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
-#include "wx/utils.h"
+    #include "wx/utils.h"
 #endif
 
 #include "wx/scrolbar.h"
@@ -51,7 +52,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 #if wxUSE_VALIDATORS
     SetValidator(validator);
 #endif // wxUSE_VALIDATORS
-    
+
     SetBackgroundColour(parent->GetBackgroundColour()) ;
     SetForegroundColour(parent->GetForegroundColour()) ;
     m_windowStyle = style;
@@ -81,11 +82,16 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
         height = 14;
     }
 
+    DWORD wstyle = WS_VISIBLE | WS_CHILD;
+
+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+      wstyle |= WS_CLIPSIBLINGS;
+
     // Now create scrollbar
     DWORD _direction = (style & wxHORIZONTAL) ?
                         SBS_HORZ: SBS_VERT;
     HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(style), wxT("SCROLLBAR"), wxT("scrollbar"),
-                         _direction | WS_CHILD | WS_VISIBLE,
+                         _direction | wstyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                          wxGetInstance(), NULL);
 
@@ -262,8 +268,8 @@ In version 4.0 or later, the maximum value that a scroll bar can report
 If the scroll bar has a page size greater than one, the maximum scrolling position
 is less than the maximum range value. You can use the following formula to calculate
 the maximum scrolling position:
-  
-MaxScrollPos = MaxRangeValue - (PageSize - 1) 
+
+MaxScrollPos = MaxRangeValue - (PageSize - 1)
 */
 
 #if WXWIN_COMPATIBILITY
@@ -326,8 +332,8 @@ void wxScrollBar::GetValues(int *viewStart, int *viewLength, int *objectLength,
 }
 #endif
 
-WXHBRUSH wxScrollBar::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+WXHBRUSH wxScrollBar::OnCtlColor(WXHDC WXUNUSED(pDC), WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
+            WXUINT WXUNUSED(message), WXWPARAM WXUNUSED(wParam), WXLPARAM WXUNUSED(lParam))
 {
   return 0;
 }
@@ -352,3 +358,5 @@ void wxScrollBar::OnScroll(wxScrollEvent& event)
     }
 }
 #endif
+
+#endif // wxUSE_SCROLLBAR