projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1. Pause()/Resume() implemented for wxMSW
[wxWidgets.git]
/
src
/
msw
/
scrolbar.cpp
diff --git
a/src/msw/scrolbar.cpp
b/src/msw/scrolbar.cpp
index 87c52ca2736f9b36bef66be1cf0e12aff8bab3ca..bac5e67a093db4de70e7ac16f46220ad28a5f91a 100644
(file)
--- a/
src/msw/scrolbar.cpp
+++ b/
src/msw/scrolbar.cpp
@@
-34,11
+34,11
@@
extern void wxFindMaxSize(HWND hwnd, RECT *rect);
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
-#if WXWIN_COMPATIBILITY
BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
+#if WXWIN_COMPATIBILITY
EVT_SCROLL(wxScrollBar::OnScroll)
EVT_SCROLL(wxScrollBar::OnScroll)
-END_EVENT_TABLE()
#endif
#endif
+END_EVENT_TABLE()
#endif
#endif
@@
-55,8
+55,8
@@
bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
SetName(name);
SetValidator(validator);
SetName(name);
SetValidator(validator);
- SetBackgroundColour(parent->Get
Default
BackgroundColour()) ;
- SetForegroundColour(parent->Get
Default
ForegroundColour()) ;
+ SetBackgroundColour(parent->GetBackgroundColour()) ;
+ SetForegroundColour(parent->GetForegroundColour()) ;
m_windowStyle = style;
if ( id == -1 )
m_windowStyle = style;
if ( id == -1 )
@@
-100,7
+100,7
@@
bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
::SetScrollPos(scroll_bar, SB_CTL, 0, FALSE);
ShowWindow(scroll_bar, SW_SHOW);
::SetScrollPos(scroll_bar, SB_CTL, 0, FALSE);
ShowWindow(scroll_bar, SW_SHOW);
- SetFont(
*
parent->GetFont());
+ SetFont(parent->GetFont());
m_hWnd = (WXHWND)scroll_bar;
m_hWnd = (WXHWND)scroll_bar;
@@
-183,7
+183,7
@@
void wxScrollBar::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
if (new_pos > maxPos)
new_pos = maxPos;
if (new_pos > maxPos)
new_pos = maxPos;
- Set
Value
(new_pos);
+ Set
ThumbPosition
(new_pos);
wxScrollEvent event(scrollEvent, m_windowId);
event.SetPosition(new_pos);
event.SetEventObject( this );
wxScrollEvent event(scrollEvent, m_windowId);
event.SetPosition(new_pos);
event.SetEventObject( this );
@@
-196,7
+196,7
@@
void wxScrollBar::MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control)
MSWOnVScroll(wParam, pos, control);
}
MSWOnVScroll(wParam, pos, control);
}
-void wxScrollBar::SetPosition(int viewStart)
+void wxScrollBar::Set
Thumb
Position(int viewStart)
{
#if defined(__WIN95__)
SCROLLINFO info;
{
#if defined(__WIN95__)
SCROLLINFO info;
@@
-212,7
+212,7
@@
void wxScrollBar::SetPosition(int viewStart)
#endif
}
#endif
}
-int wxScrollBar::GetPosition(void) const
+int wxScrollBar::Get
Thumb
Position(void) const
{
return ::GetScrollPos((HWND)m_hWnd, SB_CTL);
}
{
return ::GetScrollPos((HWND)m_hWnd, SB_CTL);
}
@@
-331,7
+331,7
@@
WXHBRUSH wxScrollBar::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
void wxScrollBar::Command(wxCommandEvent& event)
{
void wxScrollBar::Command(wxCommandEvent& event)
{
- Set
Value
(event.m_commandInt);
+ Set
ThumbPosition
(event.m_commandInt);
ProcessCommand(event);
}
ProcessCommand(event);
}