This should work on SuSE and Mandrake icon themes.

[wxWidgets.git] / src / xrc / xh_spin.cpp

diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index bda1eebf9092f2585d939fd5e79190b945cd1a50..5748e7443a169cdf010e66ceb9b5a9ef8d16ef76 100644 (file)
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_spin.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_spin.cpp

-// Purpose:     XML resource for wxSpinButton
+// Purpose:     XRC resource for wxSpinButton

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$


@@ -24,35 +24,36 @@
 
 #if wxUSE_SPINBTN
 
 
 #if wxUSE_SPINBTN
 

+IMPLEMENT_DYNAMIC_CLASS(wxSpinButtonXmlHandler, wxXmlResourceHandler)
+

 wxSpinButtonXmlHandler::wxSpinButtonXmlHandler() 
 : wxXmlResourceHandler() 
 {
 wxSpinButtonXmlHandler::wxSpinButtonXmlHandler() 
 : wxXmlResourceHandler() 
 {

-    ADD_STYLE( wxSP_HORIZONTAL );
-    ADD_STYLE( wxSP_VERTICAL );
-    ADD_STYLE( wxSP_ARROW_KEYS );
-    ADD_STYLE( wxSP_WRAP );
+    XRC_ADD_STYLE(wxSP_HORIZONTAL);
+    XRC_ADD_STYLE(wxSP_VERTICAL);
+    XRC_ADD_STYLE(wxSP_ARROW_KEYS);
+    XRC_ADD_STYLE(wxSP_WRAP);

     AddWindowStyles();
 }
 
 wxObject *wxSpinButtonXmlHandler::DoCreateResource()
 { 
     AddWindowStyles();
 }
 
 wxObject *wxSpinButtonXmlHandler::DoCreateResource()
 { 

-    wxSpinButton *control = new wxSpinButton(m_parentAsWindow,
-                                    GetID(),
-                                    GetPosition(), GetSize(),
-                                    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) );
+    XRC_MAKE_INSTANCE(control, wxSpinButton)
+
+    control->Create(m_parentAsWindow,
+                    GetID(),
+                    GetPosition(), GetSize(),
+                    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));

     SetupWindow(control);
     
     return control;
 }
 
     SetupWindow(control);
     
     return control;
 }
 

-
-

 bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxSpinButton"));
 bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxSpinButton"));


@@ -62,35 +63,36 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
 
 #if wxUSE_SPINCTRL
 
 
 #if wxUSE_SPINCTRL
 

+IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlXmlHandler, wxXmlResourceHandler)
+

 wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() 
 : wxXmlResourceHandler() 
 {
 wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler() 
 : wxXmlResourceHandler() 
 {

-    ADD_STYLE( wxSP_HORIZONTAL );
-    ADD_STYLE( wxSP_VERTICAL );
-    ADD_STYLE( wxSP_ARROW_KEYS );
-    ADD_STYLE( wxSP_WRAP );
+    XRC_ADD_STYLE(wxSP_HORIZONTAL);
+    XRC_ADD_STYLE(wxSP_VERTICAL);
+    XRC_ADD_STYLE(wxSP_ARROW_KEYS);
+    XRC_ADD_STYLE(wxSP_WRAP);

 }
 
 wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
 { 
 }
 
 wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
 { 

-    wxSpinCtrl *control = new wxSpinCtrl(m_parentAsWindow,
-                                    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),
-                                    GetName()
-                                    );
+    XRC_MAKE_INSTANCE(control, wxSpinCtrl)
+    
+    control->Create(m_parentAsWindow,
+                    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),
+                    GetName());

 
     SetupWindow(control);
     
     return control;
 }
 
 
     SetupWindow(control);
     
     return control;
 }
 

-
-

 bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxSpinCtrl"));
 bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxSpinCtrl"));