projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0 -> 0u to keep gcc happy
[wxWidgets.git]
/
src
/
univ
/
spinbutt.cpp
diff --git
a/src/univ/spinbutt.cpp
b/src/univ/spinbutt.cpp
index 9721e5062c46fd1595a4beadee98eb68e35ac56a..a9428daa3072ccbe9d93754dea6bfadb77cbca4c 100644
(file)
--- a/
src/univ/spinbutt.cpp
+++ b/
src/univ/spinbutt.cpp
@@
-17,8
+17,8
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if
def __GNUG__
- #pragma implementation "spinbut
base
.h"
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+ #pragma implementation "spinbut
t
.h"
#pragma implementation "univspinbutt.h"
#endif
#pragma implementation "univspinbutt.h"
#endif
@@
-144,14
+144,14
@@
int wxSpinButton::NormalizeValue(int value) const
if ( value > m_max )
{
if ( GetWindowStyleFlag() & wxSP_WRAP )
if ( value > m_max )
{
if ( GetWindowStyleFlag() & wxSP_WRAP )
- value = m_min + (value - m_max
) % (m_max - m_min
);
+ value = m_min + (value - m_max
- 1) % (m_max - m_min + 1
);
else
value = m_max;
}
else if ( value < m_min )
{
if ( GetWindowStyleFlag() & wxSP_WRAP )
else
value = m_max;
}
else if ( value < m_min )
{
if ( GetWindowStyleFlag() & wxSP_WRAP )
- value = m_max - (m_min - value
) % (m_max - m_min
);
+ value = m_max - (m_min - value
- 1) % (m_max - m_min + 1
);
else
value = m_min;
}
else
value = m_min;
}
@@
-370,7
+370,7
@@
wxStdSpinButtonInputHandler(wxInputHandler *inphand)
{
}
{
}
-bool wxStdSpinButtonInputHandler::HandleKey(wx
Control *control
,
+bool wxStdSpinButtonInputHandler::HandleKey(wx
InputConsumer *consumer
,
const wxKeyEvent& event,
bool pressed)
{
const wxKeyEvent& event,
bool pressed)
{
@@
-392,19
+392,19
@@
bool wxStdSpinButtonInputHandler::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 wxStdSpinButtonInputHandler::HandleMouse(wx
Control *control
,
+bool wxStdSpinButtonInputHandler::HandleMouse(wx
InputConsumer *consumer
,
const wxMouseEvent& event)
{
const wxMouseEvent& event)
{
- wxSpinButton *spinbtn = wxStaticCast(con
trol
, wxSpinButton);
+ wxSpinButton *spinbtn = wxStaticCast(con
sumer->GetInputWindow()
, wxSpinButton);
if ( spinbtn->GetArrows().HandleMouse(event) )
{
if ( spinbtn->GetArrows().HandleMouse(event) )
{
@@
-412,13
+412,13
@@
bool wxStdSpinButtonInputHandler::HandleMouse(wxControl *control,
return FALSE;
}
return FALSE;
}
- return wxStdInputHandler::HandleMouse(con
trol
, event);
+ return wxStdInputHandler::HandleMouse(con
sumer
, event);
}
}
-bool wxStdSpinButtonInputHandler::HandleMouseMove(wx
Control *control
,
+bool wxStdSpinButtonInputHandler::HandleMouseMove(wx
InputConsumer *consumer
,
const wxMouseEvent& event)
{
const wxMouseEvent& event)
{
- wxSpinButton *spinbtn = wxStaticCast(con
trol
, wxSpinButton);
+ wxSpinButton *spinbtn = wxStaticCast(con
sumer->GetInputWindow()
, wxSpinButton);
if ( spinbtn->GetArrows().HandleMouseMove(event) )
{
if ( spinbtn->GetArrows().HandleMouseMove(event) )
{
@@
-426,7
+426,7
@@
bool wxStdSpinButtonInputHandler::HandleMouseMove(wxControl *control,
return FALSE;
}
return FALSE;
}
- return wxStdInputHandler::HandleMouseMove(con
trol
, event);
+ return wxStdInputHandler::HandleMouseMove(con
sumer
, event);
}
}