X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1e4ec87317aa33fae6dbd8c55fbc699432d0026..cf25a599cd5ec86b3e054efb799dfbafe26a0d50:/src/xrc/xh_spin.cpp

diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index 73c96c7a43..5684e74777 100644
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_spin.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,10 +15,17 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_SPINBTN
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_spin.h"
-#include "wx/spinctrl.h"
+
+#if wxUSE_SPINBTN
+
+#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)
 
@@ -46,9 +49,9 @@ wxObject *wxSpinButtonXmlHandler::DoCreateResource()
                     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;
@@ -63,6 +66,8 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
 
 #if wxUSE_SPINCTRL
 
+#include "wx/spinctrl.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlXmlHandler, wxXmlResourceHandler)
 
 wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler()
@@ -72,6 +77,9 @@ wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler()
     XRC_ADD_STYLE(wxSP_VERTICAL);
     XRC_ADD_STYLE(wxSP_ARROW_KEYS);
     XRC_ADD_STYLE(wxSP_WRAP);
+    XRC_ADD_STYLE(wxALIGN_LEFT);
+    XRC_ADD_STYLE(wxALIGN_CENTER);
+    XRC_ADD_STYLE(wxALIGN_RIGHT);
 }
 
 wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
@@ -82,10 +90,10 @@ wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
                     GetID(),
                     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),
+                    GetStyle(wxT("style"), wxSP_ARROW_KEYS | wxALIGN_RIGHT),
+                    GetLong(wxT("min"), DEFAULT_MIN),
+                    GetLong(wxT("max"), DEFAULT_MAX),
+                    GetLong(wxT("value"), DEFAULT_VALUE),
                     GetName());
 
     SetupWindow(control);
@@ -98,4 +106,6 @@ bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxSpinCtrl"));
 }
 
-#endif // wxUSE_XRC && wxUSE_SPINCTRL
+#endif // wxUSE_SPINCTRL
+
+#endif // wxUSE_XRC