#include "wx/scrolbar.h"
#include "wx/msw/private.h"
+#include "wx/settings.h"
#if wxUSE_EXTENDED_RTTI
WX_DEFINE_FLAGS( wxScrollBarStyle )
wxFLAGS_MEMBER(wxBORDER_RAISED)
wxFLAGS_MEMBER(wxBORDER_STATIC)
wxFLAGS_MEMBER(wxBORDER_NONE)
-
+
// old style border flags
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
wxFLAGS_MEMBER(wxDOUBLE_BORDER)
wxFLAGS_MEMBER(wxRAISED_BORDER)
wxFLAGS_MEMBER(wxSTATIC_BORDER)
- wxFLAGS_MEMBER(wxNO_BORDER)
+ wxFLAGS_MEMBER(wxBORDER)
// standard window styles
wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
wxFLAGS_MEMBER(wxCLIP_CHILDREN)
wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
+ wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
wxFLAGS_MEMBER(wxVSCROLL)
wxFLAGS_MEMBER(wxHSCROLL)
IMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl,"wx/scrolbar.h")
wxBEGIN_PROPERTIES_TABLE(wxScrollBar)
- wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent )
+ wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxScrollEvent )
wxPROPERTY( ThumbPosition , int , SetThumbPosition, GetThumbPosition, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( ThumbSize , int , SetThumbSize, GetThumbSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( PageSize , int , SetPageSize, GetPageSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY_FLAGS( WindowStyle , wxScrollBarStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+ wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY( ThumbSize , int , SetThumbSize, GetThumbSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY( PageSize , int , SetPageSize, GetPageSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY_FLAGS( WindowStyle , wxScrollBarStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
wxEND_PROPERTIES_TABLE()
wxBEGIN_HANDLERS_TABLE(wxScrollBar)
const wxValidator& validator,
const wxString& name)
{
- if (!parent)
- return FALSE;
- parent->AddChild(this);
- SetName(name);
-#if wxUSE_VALIDATORS
- SetValidator(validator);
-#endif // wxUSE_VALIDATORS
-
- if ((style & wxBORDER_MASK) == wxBORDER_DEFAULT)
- style |= wxNO_BORDER;
-
- SetBackgroundColour(parent->GetBackgroundColour()) ;
- SetForegroundColour(parent->GetForegroundColour()) ;
- m_windowStyle = style;
-
- if ( id == -1 )
- m_windowId = (int)NewControlId();
- else
- m_windowId = id;
-
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
-
- if (width == -1)
- {
- if (style & wxHORIZONTAL)
- width = 140;
- else
- width = 14;
- }
- if (height == -1)
- {
- if (style & wxVERTICAL)
- height = 140;
- else
- height = 14;
- }
-
- WXDWORD exStyle = 0;
- WXDWORD wstyle = MSWGetStyle(style, & exStyle) ;
-
- // Now create scrollbar
- DWORD _direction = (style & wxHORIZONTAL) ?
- SBS_HORZ: SBS_VERT;
- HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxT("scrollbar"),
- _direction | wstyle,
- 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
- wxGetInstance(), NULL);
-
- m_pageSize = 1;
- m_viewSize = 1;
- m_objectSize = 1;
+ if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+ return false;
- ::SetScrollRange(scroll_bar, SB_CTL, 0, 1, FALSE);
- ::SetScrollPos(scroll_bar, SB_CTL, 0, FALSE);
- ShowWindow(scroll_bar, SW_SHOW);
+ if (!MSWCreateControl(wxT("ScrollBar"), wxEmptyString, pos, size))
+ return false;
- SetFont(parent->GetFont());
+ SetScrollbar(0, 1, 2, 1, false);
- m_hWnd = (WXHWND)scroll_bar;
-
- // Subclass again for purposes of dialog editing mode
- SubclassWin((WXHWND) scroll_bar);
-
- SetSize(x, y, width, height);
-
- return TRUE;
+ return true;
}
wxScrollBar::~wxScrollBar(void)
int position,
maxPos, trackPos = pos;
+ wxUnusedVar(trackPos);
+
// when we're dragging the scrollbar we can't use pos parameter because it
// is limited to 16 bits
// JACS: now always using GetScrollInfo, since there's no reason
case SB_ENDSCROLL:
nScrollInc = 0;
- scrollEvent = wxEVT_SCROLL_ENDSCROLL;
+ scrollEvent = wxEVT_SCROLL_CHANGED;
break;
default:
SetThumbPosition(position);
}
else if ( scrollEvent != wxEVT_SCROLL_THUMBRELEASE &&
- scrollEvent != wxEVT_SCROLL_ENDSCROLL )
+ scrollEvent != wxEVT_SCROLL_CHANGED )
{
// don't process the event if there is no displacement,
// unless this is a thumb release or end scroll event.
- return FALSE;
+ return false;
}
wxScrollEvent event(scrollEvent, m_windowId);
::SetScrollInfo((HWND) GetHWND(), SB_CTL, &info, refresh);
#else
- ::SetScrollPos((HWND)m_hWnd, SB_CTL, position, TRUE);
- ::SetScrollRange((HWND)m_hWnd, SB_CTL, 0, range1, TRUE);
+ ::SetScrollPos((HWND)m_hWnd, SB_CTL, position, refresh);
+ ::SetScrollRange((HWND)m_hWnd, SB_CTL, 0, range1, refresh);
#endif
}
+void wxScrollBar::Command(wxCommandEvent& event)
+{
+ SetThumbPosition(event.GetInt());
+ ProcessCommand(event);
+}
+
+wxSize wxScrollBar::DoGetBestSize() const
+{
+ int w = 100;
+ int h = 100;
-WXHBRUSH wxScrollBar::OnCtlColor(WXHDC WXUNUSED(pDC), WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
- WXUINT WXUNUSED(message), WXWPARAM WXUNUSED(wParam), WXLPARAM WXUNUSED(lParam))
+ if ( IsVertical() )
+ {
+ w = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+ }
+ else
+ {
+ h = wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
+ }
+
+ wxSize best(w, h);
+ CacheBestSize(best);
+ return best;
+}
+
+WXDWORD wxScrollBar::MSWGetStyle(long style, WXDWORD *exstyle) const
{
- return 0;
+ // we never have an external border
+ WXDWORD msStyle = wxControl::MSWGetStyle
+ (
+ (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
+ );
+
+ // SBS_HORZ is 0 anyhow, but do mention it explicitly for clarity
+ msStyle |= style & wxSB_HORIZONTAL ? SBS_HORZ : SBS_VERT;
+
+ return msStyle;
}
-void wxScrollBar::Command(wxCommandEvent& event)
+WXHBRUSH wxScrollBar::MSWControlColor(WXHDC pDC, WXHWND hWnd)
{
- SetThumbPosition(event.m_commandInt);
- ProcessCommand(event);
+ // unless we have an explicitly set bg colour, use default (gradient under
+ // XP) brush instead of GetBackgroundColour() one as the base class would
+ //
+ // note that fg colour isn't used for a scrollbar
+ return UseBgCol() ? wxControl::MSWControlColor(pDC, hWnd) : NULL;
}
#endif // wxUSE_SCROLLBAR
projects / wxWidgets.git / blobdiff