// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma hdrstop
#endif
+#if wxUSE_SLIDER
+
#ifndef WX_PRECOMP
-#include <stdio.h>
#include "wx/utils.h"
#include "wx/brush.h"
+#include "wx/slider.h"
#endif
#ifdef __WIN95__
#include "wx/msw/slider95.h"
#include "wx/msw/private.h"
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
-#include <commctrl.h>
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
+ #include <commctrl.h>
#endif
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
// Slider
wxSlider95::wxSlider95()
const wxString& name)
{
SetName(name);
+#if wxUSE_VALIDATORS
SetValidator(validator);
+#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;
int width = size.x;
int height = size.y;
- long msStyle ;
+ long msStyle=0 ;
+ long wstyle=0 ;
+
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ msStyle |= WS_CLIPSIBLINGS;
if ( m_windowStyle & wxSL_LABELS )
{
- msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
+ msStyle |= WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
bool want3D;
WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
// Now create min static control
wxSprintf(wxBuffer, wxT("%d"), minValue);
+ wstyle = STATIC_FLAGS;
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ msStyle |= WS_CLIPSIBLINGS;
m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
- STATIC_FLAGS,
+ wstyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL);
}
msStyle = 0;
+
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ msStyle |= WS_CLIPSIBLINGS;
+
if (m_windowStyle & wxSL_VERTICAL)
msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
else
{
// Finally, create max value static item
wxSprintf(wxBuffer, wxT("%d"), maxValue);
+ wstyle = STATIC_FLAGS;
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ msStyle |= WS_CLIPSIBLINGS;
m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
- STATIC_FLAGS,
+ wstyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL);
}
bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
- WXWORD pos, WXHWND control)
+ WXWORD WXUNUSED(pos), WXHWND control)
{
- int position = 0; // Dummy - not used in this mode
-
- int nScrollInc;
- wxEventType scrollEvent = wxEVT_NULL;
+ wxEventType scrollEvent;
switch ( wParam )
{
case SB_TOP:
- nScrollInc = m_rangeMax - position;
scrollEvent = wxEVT_SCROLL_TOP;
break;
case SB_BOTTOM:
- nScrollInc = - position;
scrollEvent = wxEVT_SCROLL_BOTTOM;
break;
case SB_LINEUP:
- nScrollInc = - GetLineSize();
scrollEvent = wxEVT_SCROLL_LINEUP;
break;
case SB_LINEDOWN:
- nScrollInc = GetLineSize();
scrollEvent = wxEVT_SCROLL_LINEDOWN;
break;
case SB_PAGEUP:
- nScrollInc = -GetPageSize();
scrollEvent = wxEVT_SCROLL_PAGEUP;
break;
case SB_PAGEDOWN:
- nScrollInc = GetPageSize();
scrollEvent = wxEVT_SCROLL_PAGEDOWN;
break;
case SB_THUMBTRACK:
case SB_THUMBPOSITION:
-#ifdef __WIN32__
- nScrollInc = (signed short)pos - position;
-#else // Win16
- nScrollInc = pos - position;
-#endif // Win32/16
scrollEvent = wxEVT_SCROLL_THUMBTRACK;
break;
default:
- nScrollInc = 0;
- }
-
- if (scrollEvent == wxEVT_NULL)
- {
- // no event...
- return FALSE;
+ // unknown scroll event?
+ return FALSE;
}
int newPos = (int)::SendMessage((HWND) control, TBM_GETPOS, 0, 0);
GetEventHandler()->ProcessEvent(event);
wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+ cevent.SetInt( newPos );
cevent.SetEventObject( this );
return GetEventHandler()->ProcessEvent( cevent );
int currentX, currentY;
GetPosition(¤tX, ¤tY);
- if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
x1 = currentX;
- if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
y1 = currentY;
AdjustForParentClientOrigin(x1, y1, sizeFlags);
return 0;
// Otherwise, it's a static
- if (GetParent()->GetTransparentBackground())
- SetBkMode((HDC) pDC, TRANSPARENT);
- else
- SetBkMode((HDC) pDC, OPAQUE);
-
- ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
- ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
-
- wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
- return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+ return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
}
// For trackbars only
#endif
// __WIN95__
+#endif // wxUSE_SLIDER