get rid of public constants for various XRC defaults, there's no need for them outside of XRC loader

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-10-01 19:54:57 +00:00
parent c80f436e83
commit 033508e1b1
8 changed files with 39 additions and 56 deletions

View File

@@ -813,7 +813,7 @@ objects. If sizer child is used, it sets
@beginTable @beginTable
@hdr3col{property, type, description} @hdr3col{property, type, description}
@row3col{range, integer, @row3col{range, integer,
Maximum value of the gauge (default: wxGAUGE_DEFAULT_RANGE).} Maximum value of the gauge (default: 100).}
@row3col{value, integer, @row3col{value, integer,
Initial value of the control (default: 0).} Initial value of the control (default: 0).}
@row3col{shadow, @ref xrc_format_type_dimension, @row3col{shadow, @ref xrc_format_type_dimension,
@@ -1258,11 +1258,11 @@ HTML markup. Note that the markup has to be escaped:
@beginTable @beginTable
@hdr3col{property, type, description} @hdr3col{property, type, description}
@row3col{value, integer, @row3col{value, integer,
Initial value of the control (default: wxSL_DEFAULT_VALUE).} Initial value of the control (default: 0).}
@row3col{min, integer, @row3col{min, integer,
Minimum allowed value (default: wxSL_DEFAULT_MIN).} Minimum allowed value (default: 0).}
@row3col{max, integer, @row3col{max, integer,
Maximum allowed value (default: wxSL_DEFAULT_MAX).} Maximum allowed value (default: 100).}
@row3col{pagesize, integer, @row3col{pagesize, integer,
Line size; number of steps the slider moves when the user moves Line size; number of steps the slider moves when the user moves
pages up or down (default: unset).} pages up or down (default: unset).}
@@ -1287,11 +1287,11 @@ HTML markup. Note that the markup has to be escaped:
@beginTable @beginTable
@hdr3col{property, type, description} @hdr3col{property, type, description}
@row3col{value, integer, @row3col{value, integer,
Initial value of the control (default: wxSP_DEFAULT_VALUE).} Initial value of the control (default: 0).}
@row3col{min, integer, @row3col{min, integer,
Minimum allowed value (default: wxSP_DEFAULT_MIN).} Minimum allowed value (default: 0).}
@row3col{max, integer, @row3col{max, integer,
Maximum allowed value (default: wxSP_DEFAULT_MAX).} Maximum allowed value (default: 100).}
@endTable @endTable

View File

@@ -17,16 +17,12 @@
class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
enum
{
wxGAUGE_DEFAULT_RANGE = 100
};
public: public:
wxGaugeXmlHandler(); wxGaugeXmlHandler();
virtual wxObject *DoCreateResource(); virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node); virtual bool CanHandle(wxXmlNode *node);
DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
}; };
#endif // wxUSE_XRC && wxUSE_GAUGE #endif // wxUSE_XRC && wxUSE_GAUGE

View File

@@ -17,18 +17,12 @@
class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
enum
{
wxSL_DEFAULT_VALUE = 0,
wxSL_DEFAULT_MIN = 0,
wxSL_DEFAULT_MAX = 100
};
public: public:
wxScrollBarXmlHandler(); wxScrollBarXmlHandler();
virtual wxObject *DoCreateResource(); virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node); virtual bool CanHandle(wxXmlNode *node);
DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
}; };
#endif // wxUSE_XRC && wxUSE_SCROLLBAR #endif // wxUSE_XRC && wxUSE_SCROLLBAR

View File

@@ -17,18 +17,12 @@
class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
enum
{
wxSL_DEFAULT_VALUE = 0,
wxSL_DEFAULT_MIN = 0,
wxSL_DEFAULT_MAX = 100
};
public: public:
wxSliderXmlHandler(); wxSliderXmlHandler();
virtual wxObject *DoCreateResource(); virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node); virtual bool CanHandle(wxXmlNode *node);
DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
}; };
#endif // wxUSE_XRC && wxUSE_SLIDER #endif // wxUSE_XRC && wxUSE_SLIDER

View File

@@ -19,18 +19,12 @@
class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
enum
{
wxSP_DEFAULT_VALUE = 0,
wxSP_DEFAULT_MIN = 0,
wxSP_DEFAULT_MAX = 100
};
public: public:
wxSpinButtonXmlHandler(); wxSpinButtonXmlHandler();
virtual wxObject *DoCreateResource(); virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node); virtual bool CanHandle(wxXmlNode *node);
DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
}; };
#endif // wxUSE_SPINBTN #endif // wxUSE_SPINBTN
@@ -40,18 +34,12 @@ public:
class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
enum
{
wxSP_DEFAULT_VALUE = 0,
wxSP_DEFAULT_MIN = 0,
wxSP_DEFAULT_MAX = 100
};
public: public:
wxSpinCtrlXmlHandler(); wxSpinCtrlXmlHandler();
virtual wxObject *DoCreateResource(); virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node); virtual bool CanHandle(wxXmlNode *node);
DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
}; };
#endif // wxUSE_SPINCTRL #endif // wxUSE_SPINCTRL

View File

@@ -23,6 +23,8 @@
#include "wx/gauge.h" #include "wx/gauge.h"
#endif #endif
static const long DEFAULT_RANGE = 100;
IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler) IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
wxGaugeXmlHandler::wxGaugeXmlHandler() wxGaugeXmlHandler::wxGaugeXmlHandler()
@@ -43,7 +45,7 @@ wxObject *wxGaugeXmlHandler::DoCreateResource()
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
GetLong(wxT("range"), wxGAUGE_DEFAULT_RANGE), GetLong(wxT("range"), DEFAULT_RANGE),
GetPosition(), GetSize(), GetPosition(), GetSize(),
GetStyle(), GetStyle(),
wxDefaultValidator, wxDefaultValidator,

View File

@@ -23,6 +23,11 @@
#include "wx/slider.h" #include "wx/slider.h"
#endif #endif
static const long DEFAULT_VALUE = 0;
static const long DEFAULT_MIN = 0;
static const long DEFAULT_MAX = 100;
IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler) IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler)
wxSliderXmlHandler::wxSliderXmlHandler() wxSliderXmlHandler::wxSliderXmlHandler()
@@ -48,9 +53,9 @@ wxObject *wxSliderXmlHandler::DoCreateResource()
control->Create(m_parentAsWindow, control->Create(m_parentAsWindow,
GetID(), GetID(),
GetLong(wxT("value"), wxSL_DEFAULT_VALUE), GetLong(wxT("value"), DEFAULT_VALUE),
GetLong(wxT("min"), wxSL_DEFAULT_MIN), GetLong(wxT("min"), DEFAULT_MIN),
GetLong(wxT("max"), wxSL_DEFAULT_MAX), GetLong(wxT("max"), DEFAULT_MAX),
GetPosition(), GetSize(), GetPosition(), GetSize(),
GetStyle(), GetStyle(),
wxDefaultValidator, wxDefaultValidator,

View File

@@ -23,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) IMPLEMENT_DYNAMIC_CLASS(wxSpinButtonXmlHandler, wxXmlResourceHandler)
wxSpinButtonXmlHandler::wxSpinButtonXmlHandler() wxSpinButtonXmlHandler::wxSpinButtonXmlHandler()
@@ -45,9 +49,9 @@ wxObject *wxSpinButtonXmlHandler::DoCreateResource()
GetStyle(wxT("style"), wxSP_VERTICAL | wxSP_ARROW_KEYS), GetStyle(wxT("style"), wxSP_VERTICAL | wxSP_ARROW_KEYS),
GetName()); GetName());
control->SetValue(GetLong( wxT("value"), wxSP_DEFAULT_VALUE)); control->SetValue(GetLong( wxT("value"), DEFAULT_VALUE));
control->SetRange(GetLong( wxT("min"), wxSP_DEFAULT_MIN), control->SetRange(GetLong( wxT("min"), DEFAULT_MIN),
GetLong(wxT("max"), wxSP_DEFAULT_MAX)); GetLong(wxT("max"), DEFAULT_MAX));
SetupWindow(control); SetupWindow(control);
return control; return control;
@@ -84,9 +88,9 @@ wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
GetText(wxT("value")), GetText(wxT("value")),
GetPosition(), GetSize(), GetPosition(), GetSize(),
GetStyle(wxT("style"), wxSP_ARROW_KEYS), GetStyle(wxT("style"), wxSP_ARROW_KEYS),
GetLong(wxT("min"), wxSP_DEFAULT_MIN), GetLong(wxT("min"), DEFAULT_MIN),
GetLong(wxT("max"), wxSP_DEFAULT_MAX), GetLong(wxT("max"), DEFAULT_MAX),
GetLong(wxT("value"), wxSP_DEFAULT_VALUE), GetLong(wxT("value"), DEFAULT_VALUE),
GetName()); GetName());
SetupWindow(control); SetupWindow(control);