// 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__
#include "wx/msw/slidrmsw.h"
#include "wx/msw/private.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl)
-#endif
// Slider
wxSliderMSW::wxSliderMSW()
m_lineSize = 1;
m_rangeMax = 0;
m_rangeMin = 0;
- m_tickFreq = 0;
}
bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
const wxValidator& validator,
const wxString& name)
{
+ if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+ style |= wxBORDER_NONE;
+
SetName(name);
+#if wxUSE_VALIDATORS
SetValidator(validator);
+#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;
m_pageSize = 1;
m_lineSize = 1;
m_windowStyle = style;
- m_tickFreq = 0;
if ( id == -1 )
m_windowId = (int)NewControlId();
int height = size.y;
// non-Win95 implementation
-
- long msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
- bool want3D;
- WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+ long msStyle = SS_CENTER;
- m_staticValue = (WXHWND) CreateWindowEx(exStyle, _T("STATIC"), NULL,
+ WXDWORD exStyle = 0;
+ msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;
+
+ m_staticValue = (WXHWND) CreateWindowEx(exStyle, wxT("STATIC"), NULL,
msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL);
// Now create min static control
- wxSprintf(wxBuffer, _T("%d"), minValue);
- m_staticMin = (WXHWND) CreateWindowEx(0, _T("STATIC"), wxBuffer,
- STATIC_FLAGS,
+ wxString buf;
+ buf.Printf(wxT("%d"), minValue);
+ DWORD wstyle = STATIC_FLAGS;
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ wstyle |= WS_CLIPSIBLINGS;
+ m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), buf,
+ wstyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL);
- // Now create slider
- m_windowId = (int)NewControlId();
-
msStyle = 0;
if (m_windowStyle & wxSL_VERTICAL)
msStyle = SBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
else
msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
- HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), _T("SCROLLBAR"), wxBuffer,
+ HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxEmptyString,
msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
wxGetInstance(), NULL);
SubclassWin(GetHWND());
// Finally, create max value static item
- wxSprintf(wxBuffer, _T("%d"), maxValue);
- m_staticMax = (WXHWND) CreateWindowEx(0, _T("STATIC"), wxBuffer,
- STATIC_FLAGS,
+ buf.Printf(wxT("%d"), maxValue);
+ wstyle = STATIC_FLAGS;
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ wstyle |= WS_CLIPSIBLINGS;
+ m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), buf,
+ wstyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL);
GetEventHandler()->ProcessEvent(event);
wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+ cevent.SetInt( newPos );
cevent.SetEventObject( this );
return GetEventHandler()->ProcessEvent( cevent );
::SetScrollPos(GetHwnd(), SB_CTL, value, TRUE);
if (m_staticValue)
{
- wxSprintf(wxBuffer, _T("%d"), value);
- SetWindowText((HWND) m_staticValue, wxBuffer);
+ wxString buf;
+ buf.Printf(wxT("%d"), value);
+ SetWindowText((HWND) m_staticValue, buf);
}
}
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);
wxChar buf[40];
if ( m_staticMin )
{
- wxSprintf(buf, _T("%d"), m_rangeMin);
+ wxSprintf(buf, wxT("%d"), m_rangeMin);
SetWindowText((HWND) m_staticMin, buf);
}
if ( m_staticMax )
{
- wxSprintf(buf, _T("%d"), m_rangeMax);
+ wxSprintf(buf, wxT("%d"), m_rangeMax);
SetWindowText((HWND) m_staticMax, buf);
}
}
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();
-}
-
-// For trackbars only
-void wxSliderMSW::SetTickFreq(int n, int pos)
-{
+ return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
}
void wxSliderMSW::SetPageSize(int pageSize)
return m_pageSize;
}
-void wxSliderMSW::ClearSel()
-{
-}
-
-void wxSliderMSW::ClearTicks()
-{
-}
-
void wxSliderMSW::SetLineSize(int lineSize)
{
m_lineSize = lineSize;
return m_lineSize;
}
-int wxSliderMSW::GetSelEnd() const
-{
- return 0;
-}
-
-int wxSliderMSW::GetSelStart() const
-{
- return 0;
-}
-
-void wxSliderMSW::SetSelection(int minPos, int maxPos)
-{
-}
-
-void wxSliderMSW::SetThumbLength(int len)
+// Not yet implemented
+void wxSliderMSW::SetThumbLength(int WXUNUSED(lenPixels))
{
}
+// Not yet implemented
int wxSliderMSW::GetThumbLength() const
{
- return 0;
-}
-
-void wxSliderMSW::SetTick(int tickPos)
-{
+ return 0;
}
bool wxSliderMSW::ContainsHWND(WXHWND hWnd) const