projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cast both ints to doubles for the X and Y scale factors
[wxWidgets.git]
/
src
/
xrc
/
xh_spin.cpp
diff --git
a/src/xrc/xh_spin.cpp
b/src/xrc/xh_spin.cpp
index 616537b27cd0e8c2654b64b4fe860c42b16d8cc3..7ac87fe3ab30ce98528a64970783f9dec492186c 100644
(file)
--- a/
src/xrc/xh_spin.cpp
+++ b/
src/xrc/xh_spin.cpp
@@
-8,10
+8,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xh_spin.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-27,6
+23,10
@@
#include "wx/spinbutt.h"
#include "wx/spinbutt.h"
+static const long DEFAULT_VALUE = 0;
+static const long DEFAULT_MIN = 0;
+static const long DEFAULT_MAX = 100;
+
IMPLEMENT_DYNAMIC_CLASS(wxSpinButtonXmlHandler, wxXmlResourceHandler)
wxSpinButtonXmlHandler::wxSpinButtonXmlHandler()
IMPLEMENT_DYNAMIC_CLASS(wxSpinButtonXmlHandler, wxXmlResourceHandler)
wxSpinButtonXmlHandler::wxSpinButtonXmlHandler()
@@
-49,9
+49,9
@@
wxObject *wxSpinButtonXmlHandler::DoCreateResource()
GetStyle(wxT("style"), wxSP_VERTICAL | wxSP_ARROW_KEYS),
GetName());
GetStyle(wxT("style"), wxSP_VERTICAL | wxSP_ARROW_KEYS),
GetName());
- control->SetValue(GetLong( wxT("value"),
wxSP_
DEFAULT_VALUE));
- control->SetRange(GetLong( wxT("min"),
wxSP_
DEFAULT_MIN),
- GetLong(wxT("max"),
wxSP_
DEFAULT_MAX));
+ control->SetValue(GetLong( wxT("value"), DEFAULT_VALUE));
+ control->SetRange(GetLong( wxT("min"), DEFAULT_MIN),
+ GetLong(wxT("max"), DEFAULT_MAX));
SetupWindow(control);
return control;
SetupWindow(control);
return control;
@@
-88,9
+88,9
@@
wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
GetText(wxT("value")),
GetPosition(), GetSize(),
GetStyle(wxT("style"), wxSP_ARROW_KEYS),
GetText(wxT("value")),
GetPosition(), GetSize(),
GetStyle(wxT("style"), wxSP_ARROW_KEYS),
- GetLong(wxT("min"),
wxSP_
DEFAULT_MIN),
- GetLong(wxT("max"),
wxSP_
DEFAULT_MAX),
- GetLong(wxT("value"),
wxSP_
DEFAULT_VALUE),
+ GetLong(wxT("min"), DEFAULT_MIN),
+ GetLong(wxT("max"), DEFAULT_MAX),
+ GetLong(wxT("value"), DEFAULT_VALUE),
GetName());
SetupWindow(control);
GetName());
SetupWindow(control);