// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl)
-
-#if WXWIN_COMPATIBILITY
-BEGIN_EVENT_TABLE(wxSliderMSW, wxControl)
- EVT_SCROLL(wxSliderMSW::OnScroll)
-END_EVENT_TABLE()
-#endif
-
#endif
// Slider
-wxSliderMSW::wxSliderMSW(void)
+wxSliderMSW::wxSliderMSW()
{
m_staticValue = 0;
m_staticMin = 0;
m_tickFreq = 0;
if ( id == -1 )
- m_windowId = (int)NewControlId();
+ m_windowId = (int)NewControlId();
else
- m_windowId = id;
+ m_windowId = id;
int x = pos.x;
int y = pos.y;
// GetFont()->RealizeResource();
if (GetFont().GetResourceHandle())
{
- if ( m_staticMin )
- SendMessage((HWND)m_staticMin,WM_SETFONT,
- (WPARAM)GetFont().GetResourceHandle(),0L);
- if ( m_staticMax )
- SendMessage((HWND)m_staticMax,WM_SETFONT,
+ if ( m_staticMin )
+ SendMessage((HWND)m_staticMin,WM_SETFONT,
+ (WPARAM)GetFont().GetResourceHandle(),0L);
+ if ( m_staticMax )
+ SendMessage((HWND)m_staticMax,WM_SETFONT,
(WPARAM)GetFont().GetResourceHandle(),0L);
- if (m_staticValue)
- SendMessage((HWND)m_staticValue,WM_SETFONT,
+ if (m_staticValue)
+ SendMessage((HWND)m_staticValue,WM_SETFONT,
(WPARAM)GetFont().GetResourceHandle(),0L);
}
}
return TRUE;
}
-void wxSliderMSW::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
+bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
+ WXWORD pos, WXHWND control)
{
int position = ::GetScrollPos((HWND)control, SB_CTL);
wxEventType scrollEvent = wxEVT_NULL;
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:
+ 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;
+ nScrollInc = (signed short)pos - position;
#else
- nScrollInc = pos - position;
+ nScrollInc = pos - position;
#endif
- scrollEvent = wxEVT_SCROLL_THUMBTRACK;
- break;
+ scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+ break;
- default:
- nScrollInc = 0;
- return;
+ default:
+ nScrollInc = 0;
}
- if (nScrollInc != 0)
+ if (nScrollInc == 0)
{
+ // no event...
+ return FALSE;
+ }
- int newPos = position + nScrollInc;
-
- if (!(newPos < GetMin() || newPos > GetMax()))
- {
- SetValue(newPos);
+ int newPos = position + nScrollInc;
- wxScrollEvent event(scrollEvent, m_windowId);
- event.SetPosition(newPos);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
- }
+ if ( (newPos < GetMin()) || (newPos > GetMax()) )
+ {
+ // out of range - but we did process it
+ return TRUE;
}
-}
-void wxSliderMSW::MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control)
-{
- MSWOnVScroll(wParam, pos, control);
+ SetValue(newPos);
+
+ wxScrollEvent event(scrollEvent, m_windowId);
+ event.SetPosition(newPos);
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent(event);
+
+ wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+ cevent.SetEventObject( this );
+
+ return GetEventHandler()->ProcessEvent( cevent );
}
-wxSliderMSW::~wxSliderMSW(void)
+wxSliderMSW::~wxSliderMSW()
{
if (m_staticMin)
DestroyWindow((HWND) m_staticMin);
DestroyWindow((HWND) m_staticValue);
}
-int wxSliderMSW::GetValue(void) const
+int wxSliderMSW::GetValue() const
{
return ::GetScrollPos((HWND) GetHWND(), SB_CTL);
}
*y = point.y;
}
-void wxSliderMSW::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int x1 = x;
int y1 = y;
if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
{
- if ( m_windowStyle & wxSL_LABELS )
- {
+ if ( m_windowStyle & wxSL_LABELS )
+ {
int min_len = 0;
GetWindowText((HWND) m_staticMin, buf, 300);
if (m_staticValue)
{
int new_width = (int)(wxMax(min_len, max_len));
- int valueHeight = (int)cyf;
+ int valueHeight = (int)cyf;
#ifdef __WIN32__
// For some reason, under Win95, the text edit control has
// a lot of space before the first character
MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
}
- else
- {
- // No labels
- if ( w1 < 0 )
- w1 = 200;
- if ( h1 < 0 )
- h1 = 20;
- MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
- }
+ else
+ {
+ // No labels
+ if ( w1 < 0 )
+ w1 = 200;
+ if ( h1 < 0 )
+ h1 = 20;
+ MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
+ }
}
else
{
- if ( m_windowStyle & wxSL_LABELS )
- {
+ if ( m_windowStyle & wxSL_LABELS )
+ {
int min_len;
GetWindowText((HWND) m_staticMin, buf, 300);
GetTextExtent(buf, &min_len, &cyf,NULL,NULL,& this->GetFont());
if (m_staticValue)
{
int new_width = (int)(wxMax(min_len, max_len));
- int valueHeight = (int)cyf;
+ int valueHeight = (int)cyf;
/*** Suggested change by George Tasker - remove this block...
#ifdef __WIN32__
// For some reason, under Win95, the text edit control has
MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
}
- else
- {
- // No labels
- if ( w1 < 0 )
- w1 = 20;
- if ( h1 < 0 )
- h1 = 200;
- MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
- }
+ else
+ {
+ // No labels
+ if ( w1 < 0 )
+ w1 = 20;
+ if ( h1 < 0 )
+ h1 = 200;
+ MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
+ }
}
}
char buf[40];
if ( m_staticMin )
{
- sprintf(buf, "%d", m_rangeMin);
- SetWindowText((HWND) m_staticMin, buf);
+ sprintf(buf, "%d", m_rangeMin);
+ SetWindowText((HWND) m_staticMin, buf);
}
if ( m_staticMax )
}
WXHBRUSH wxSliderMSW::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
- WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+ WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
if ( nCtlColor == CTLCOLOR_SCROLLBAR )
- return 0;
+ return 0;
// Otherwise, it's a static
if (GetParent()->GetTransparentBackground())
m_pageSize = pageSize;
}
-int wxSliderMSW::GetPageSize(void) const
+int wxSliderMSW::GetPageSize() const
{
return m_pageSize;
}
-void wxSliderMSW::ClearSel(void)
+void wxSliderMSW::ClearSel()
{
}
-void wxSliderMSW::ClearTicks(void)
+void wxSliderMSW::ClearTicks()
{
}
m_lineSize = lineSize;
}
-int wxSliderMSW::GetLineSize(void) const
+int wxSliderMSW::GetLineSize() const
{
return m_lineSize;
}
-int wxSliderMSW::GetSelEnd(void) const
+int wxSliderMSW::GetSelEnd() const
{
return 0;
}
-int wxSliderMSW::GetSelStart(void) const
+int wxSliderMSW::GetSelStart() const
{
return 0;
}
{
}
-int wxSliderMSW::GetThumbLength(void) const
+int wxSliderMSW::GetThumbLength() const
{
return 0;
}
bool wxSliderMSW::ContainsHWND(WXHWND hWnd) const
{
- return ( hWnd == GetStaticMin() || hWnd == GetStaticMax() || hWnd == GetEditValue() );
+ return ( hWnd == GetStaticMin() || hWnd == GetStaticMax() || hWnd == GetEditValue() );
}
-#if WXWIN_COMPATIBILITY
-// Backward compatibility
-void wxSliderMSW::OnScroll(wxScrollEvent& event)
-{
- wxEventType oldEvent = event.GetEventType();
- event.SetEventType( wxEVT_COMMAND_SLIDER_UPDATED );
- if ( !GetEventHandler()->ProcessEvent(event) )
- {
- event.SetEventType( oldEvent );
- if (!GetParent()->GetEventHandler()->ProcessEvent(event))
- event.Skip();
- }
-}
-#endif
-
void wxSliderMSW::Command (wxCommandEvent & event)
{
SetValue (event.GetInt());
bool wxSliderMSW::Show(bool show)
{
- wxWindow::Show(show);
+ wxWindow::Show(show);
int cshow;
if (show)
cshow = SW_HIDE;
if(m_staticValue)
- ShowWindow((HWND) m_staticValue, (BOOL)cshow);
+ ShowWindow((HWND) m_staticValue, (BOOL)cshow);
if(m_staticMin)
- ShowWindow((HWND) m_staticMin, (BOOL)cshow);
+ ShowWindow((HWND) m_staticMin, (BOOL)cshow);
if(m_staticMax)
- ShowWindow((HWND) m_staticMax, (BOOL)cshow);
+ ShowWindow((HWND) m_staticMax, (BOOL)cshow);
return TRUE;
}
projects / wxWidgets.git / blobdiff