projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed focus assert
[wxWidgets.git]
/
src
/
univ
/
slider.cpp
diff --git
a/src/univ/slider.cpp
b/src/univ/slider.cpp
index 9bffd276ac2bd14f8986880439028cb283bcf335..bae3e993b51f7760253d1b419ec3273fd0a52816 100644
(file)
--- a/
src/univ/slider.cpp
+++ b/
src/univ/slider.cpp
@@
-916,7
+916,7
@@
bool wxSlider::OnPageScroll(int pageInc)
// wxStdSliderButtonInputHandler
// ----------------------------------------------------------------------------
// wxStdSliderButtonInputHandler
// ----------------------------------------------------------------------------
-bool wxStdSliderButtonInputHandler::HandleKey(wx
Control *control
,
+bool wxStdSliderButtonInputHandler::HandleKey(wx
InputConsumer *consumer
,
const wxKeyEvent& event,
bool pressed)
{
const wxKeyEvent& event,
bool pressed)
{
@@
-956,19
+956,19
@@
bool wxStdSliderButtonInputHandler::HandleKey(wxControl *control,
if ( !!action )
{
if ( !!action )
{
- con
trol
->PerformAction(action);
+ con
sumer
->PerformAction(action);
return TRUE;
}
}
return TRUE;
}
}
- return wxStdInputHandler::HandleKey(con
trol
, event, pressed);
+ return wxStdInputHandler::HandleKey(con
sumer
, event, pressed);
}
}
-bool wxStdSliderButtonInputHandler::HandleMouse(wx
Control *control
,
+bool wxStdSliderButtonInputHandler::HandleMouse(wx
InputConsumer *consumer
,
const wxMouseEvent& event)
{
const wxMouseEvent& event)
{
- wxSlider *slider = wxStaticCast(con
trol
, wxSlider);
+ wxSlider *slider = wxStaticCast(con
sumer->GetInputWindow()
, wxSlider);
if ( slider->GetThumb().HandleMouse(event) )
{
if ( slider->GetThumb().HandleMouse(event) )
{
@@
-976,13
+976,13
@@
bool wxStdSliderButtonInputHandler::HandleMouse(wxControl *control,
return FALSE;
}
return FALSE;
}
- return wxStdInputHandler::HandleMouse(con
trol
, event);
+ return wxStdInputHandler::HandleMouse(con
sumer
, event);
}
}
-bool wxStdSliderButtonInputHandler::HandleMouseMove(wx
Control *control
,
+bool wxStdSliderButtonInputHandler::HandleMouseMove(wx
InputConsumer *consumer
,
const wxMouseEvent& event)
{
const wxMouseEvent& event)
{
- wxSlider *slider = wxStaticCast(con
trol
, wxSlider);
+ wxSlider *slider = wxStaticCast(con
sumer->GetInputWindow()
, wxSlider);
if ( slider->GetThumb().HandleMouseMove(event) )
{
if ( slider->GetThumb().HandleMouseMove(event) )
{
@@
-990,10
+990,10
@@
bool wxStdSliderButtonInputHandler::HandleMouseMove(wxControl *control,
return FALSE;
}
return FALSE;
}
- return wxStdInputHandler::HandleMouseMove(con
trol
, event);
+ return wxStdInputHandler::HandleMouseMove(con
sumer
, event);
}
}
-bool wxStdSliderButtonInputHandler::HandleFocus(wx
Control *control
,
+bool wxStdSliderButtonInputHandler::HandleFocus(wx
InputConsumer *consumer
,
const wxFocusEvent& event)
{
// slider's appearance changes when it gets/loses focus
const wxFocusEvent& event)
{
// slider's appearance changes when it gets/loses focus