projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove string conversion functions and use the wx provided ones.
[wxWidgets.git]
/
src
/
xrc
/
xh_gauge.cpp
diff --git
a/src/xrc/xh_gauge.cpp
b/src/xrc/xh_gauge.cpp
index c529b21cbf7c36e8ad1125511015e23b825f7bfd..99ce99a3637530936c2708365459f0638e2cce01 100644
(file)
--- a/
src/xrc/xh_gauge.cpp
+++ b/
src/xrc/xh_gauge.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_gauge.cpp
+// Name:
src/xrc/
xh_gauge.cpp
// Purpose: XRC resource for wxGauge
// Author: Bob Mitchell
// Created: 2000/03/21
// Purpose: XRC resource for wxGauge
// Author: Bob Mitchell
// Created: 2000/03/21
@@
-8,10
+8,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "xh_gauge.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"
@@
-22,16
+18,23
@@
#if wxUSE_XRC && wxUSE_GAUGE
#include "wx/xrc/xh_gauge.h"
#if wxUSE_XRC && wxUSE_GAUGE
#include "wx/xrc/xh_gauge.h"
-#include "wx/gauge.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/gauge.h"
+#endif
+
+static const long DEFAULT_RANGE = 100;
IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
wxGaugeXmlHandler::wxGaugeXmlHandler()
IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
wxGaugeXmlHandler::wxGaugeXmlHandler()
-
:
wxXmlResourceHandler()
+
:
wxXmlResourceHandler()
{
XRC_ADD_STYLE(wxGA_HORIZONTAL);
XRC_ADD_STYLE(wxGA_VERTICAL);
{
XRC_ADD_STYLE(wxGA_HORIZONTAL);
XRC_ADD_STYLE(wxGA_VERTICAL);
+#if WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxGA_PROGRESSBAR);
XRC_ADD_STYLE(wxGA_PROGRESSBAR);
+#endif // WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxGA_SMOOTH); // windows only
AddWindowStyles();
}
XRC_ADD_STYLE(wxGA_SMOOTH); // windows only
AddWindowStyles();
}
@@
-42,7
+45,7
@@
wxObject *wxGaugeXmlHandler::DoCreateResource()
control->Create(m_parentAsWindow,
GetID(),
control->Create(m_parentAsWindow,
GetID(),
- GetLong(wxT("range"),
wxGAUGE_
DEFAULT_RANGE),
+ GetLong(wxT("range"), DEFAULT_RANGE),
GetPosition(), GetSize(),
GetStyle(),
wxDefaultValidator,
GetPosition(), GetSize(),
GetStyle(),
wxDefaultValidator,