projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxMultiChoiceDialog uses now wxCheckListBox if possible, wxListBox if not
[wxWidgets.git]
/
src
/
univ
/
spinbutt.cpp
diff --git
a/src/univ/spinbutt.cpp
b/src/univ/spinbutt.cpp
index 08edc83639520e7a41bcba9bee07b103669f1598..e3adb55cc1265407015a89aa025edc0d6b820c18 100644
(file)
--- a/
src/univ/spinbutt.cpp
+++ b/
src/univ/spinbutt.cpp
@@
-17,11
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "spinbutt.h"
- #pragma implementation "univspinbutt.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#include "wx/wxprec.h"
#ifdef __BORLANDC__
@@
-101,13
+96,13
@@
bool wxSpinButton::Create(wxWindow *parent,
if ( !wxSpinButtonBase::Create(parent, id, pos, size, style,
wxDefaultValidator, name) )
if ( !wxSpinButtonBase::Create(parent, id, pos, size, style,
wxDefaultValidator, name) )
- return
FALSE
;
+ return
false
;
SetBestSize(size);
CreateInputHandler(wxINP_HANDLER_SPINBTN);
SetBestSize(size);
CreateInputHandler(wxINP_HANDLER_SPINBTN);
- return
TRUE
;
+ return
true
;
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-167,7
+162,7
@@
bool wxSpinButton::ChangeValue(int inc)
{
// nothing changed - most likely because we are already at min/max
// value
{
// nothing changed - most likely because we are already at min/max
// value
- return
FALSE
;
+ return
false
;
}
wxSpinEvent event(inc > 0 ? wxEVT_SCROLL_LINEUP : wxEVT_SCROLL_LINEDOWN,
}
wxSpinEvent event(inc > 0 ? wxEVT_SCROLL_LINEUP : wxEVT_SCROLL_LINEDOWN,
@@
-178,7
+173,7
@@
bool wxSpinButton::ChangeValue(int inc)
if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )
{
// programm has vetoed the event
if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )
{
// programm has vetoed the event
- return
FALSE
;
+ return
false
;
}
m_value = valueNew;
}
m_value = valueNew;
@@
-187,7
+182,7
@@
bool wxSpinButton::ChangeValue(int inc)
event.SetEventType(wxEVT_SCROLL_THUMBTRACK);
(void)GetEventHandler()->ProcessEvent(event);
event.SetEventType(wxEVT_SCROLL_THUMBTRACK);
(void)GetEventHandler()->ProcessEvent(event);
- return
TRUE
;
+ return
true
;
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-357,7
+352,7
@@
bool wxSpinButton::PerformAction(const wxControlAction& action,
else
return wxControl::PerformAction(action, numArg, strArg);
else
return wxControl::PerformAction(action, numArg, strArg);
- return
TRUE
;
+ return
true
;
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-390,11
+385,11
@@
bool wxStdSpinButtonInputHandler::HandleKey(wxInputConsumer *consumer,
break;
}
break;
}
- if ( !
!action
)
+ if ( !
action.IsEmpty()
)
{
consumer->PerformAction(action);
{
consumer->PerformAction(action);
- return
TRUE
;
+ return
true
;
}
}
}
}
@@
-409,7
+404,7
@@
bool wxStdSpinButtonInputHandler::HandleMouse(wxInputConsumer *consumer,
if ( spinbtn->GetArrows().HandleMouse(event) )
{
// don't refresh, everything is already done
if ( spinbtn->GetArrows().HandleMouse(event) )
{
// don't refresh, everything is already done
- return
FALSE
;
+ return
false
;
}
return wxStdInputHandler::HandleMouse(consumer, event);
}
return wxStdInputHandler::HandleMouse(consumer, event);
@@
-423,7
+418,7
@@
bool wxStdSpinButtonInputHandler::HandleMouseMove(wxInputConsumer *consumer,
if ( spinbtn->GetArrows().HandleMouseMove(event) )
{
// processed by the arrows
if ( spinbtn->GetArrows().HandleMouseMove(event) )
{
// processed by the arrows
- return
FALSE
;
+ return
false
;
}
return wxStdInputHandler::HandleMouseMove(consumer, event);
}
return wxStdInputHandler::HandleMouseMove(consumer, event);