diff options
author | Michał Konopacki <konopacki.m@gmail.com> | 2012-08-20 15:12:26 +0200 |
---|---|---|
committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-08-20 15:12:26 +0200 |
commit | 7a4ec2adc4e40a6236ecd76ed5d6492d6ceac15a (patch) | |
tree | e1df82b6fcf9ce34c01b1b06674516747578ef3e /src/ui/scroll.cpp | |
parent | 8666d35f7c3129c101029eae1cd0a5124f35b7de (diff) | |
parent | 8d4a3ed57915af2acf8b3dcd9a8aec5a75806ca6 (diff) | |
download | colobot-7a4ec2adc4e40a6236ecd76ed5d6492d6ceac15a.tar.gz colobot-7a4ec2adc4e40a6236ecd76ed5d6492d6ceac15a.tar.bz2 colobot-7a4ec2adc4e40a6236ecd76ed5d6492d6ceac15a.zip |
Merge remote-tracking branch 'erihel/dev-ui' into dev-ui
Conflicts:
src/ui/button.h
src/ui/color.h
src/ui/compass.h
src/ui/control.h
src/ui/displayinfo.h
src/ui/displaytext.h
src/ui/edit.h
src/ui/editvalue.h
src/ui/gauge.h
src/ui/group.h
src/ui/image.h
src/ui/slider.h
Diffstat (limited to 'src/ui/scroll.cpp')
-rw-r--r-- | src/ui/scroll.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ui/scroll.cpp b/src/ui/scroll.cpp index 051de8d..5526c80 100644 --- a/src/ui/scroll.cpp +++ b/src/ui/scroll.cpp @@ -35,7 +35,7 @@ // Object's constructor. -CScroll::CScroll(CInstanceManager* iMan) : CControl(iMan) +CScroll::CScroll() : CControl() { m_buttonUp = 0; m_buttonDown = 0; @@ -106,7 +106,7 @@ void CScroll::MoveAdjust() pc = (CButton*)m_buttonUp; pc->Create(Math::Point(0.0f, 0.0f), Math::Point(0.0f, 0.0f), 49, EVENT_NULL); pc->SetRepeat(true); - m_eventUp = pc->RetEventMsg(); + m_eventUp = pc->GetEventMsg(); } if ( m_buttonDown == 0 ) @@ -115,7 +115,7 @@ void CScroll::MoveAdjust() pc = (CButton*)m_buttonDown; pc->Create(Math::Point(0.0f, 0.0f), Math::Point(0.0f, 0.0f), 50, EVENT_NULL); pc->SetRepeat(true); - m_eventDown = pc->RetEventMsg(); + m_eventDown = pc->GetEventMsg(); } } @@ -299,7 +299,7 @@ bool CScroll::EventProcess(const Event &event) m_buttonUp != 0 ) { Event newEvent = event; - newEvent.event = m_buttonUp->RetEventMsg(); + newEvent.event = m_buttonUp->GetEventMsg(); m_event->AddEvent(newEvent); } if ( event.event == EVENT_KEYDOWN && @@ -308,7 +308,7 @@ bool CScroll::EventProcess(const Event &event) m_buttonDown != 0 ) { Event newEvent = event; - newEvent.event = m_buttonDown->RetEventMsg(); + newEvent.event = m_buttonDown->GetEventMsg(); m_event->AddEvent(newEvent); } @@ -437,7 +437,7 @@ void CScroll::SetVisibleValue(float value) AdjustGlint(); } -float CScroll::RetVisibleValue() +float CScroll::GetVisibleValue() { return m_visibleValue; } @@ -451,7 +451,7 @@ void CScroll::SetVisibleRatio(float value) AdjustGlint(); } -float CScroll::RetVisibleRatio() +float CScroll::GetVisibleRatio() { return m_visibleRatio; } @@ -462,7 +462,7 @@ void CScroll::SetArrowStep(float step) m_step = step; } -float CScroll::RetArrowStep() +float CScroll::GetArrowStep() { return m_step; } |