Updates to MIME-types and wxFileDialog code for better

[wxWidgets.git] / contrib / src / xrc / xh_gauge.cpp

diff --git a/contrib/src/xrc/xh_gauge.cpp b/contrib/src/xrc/xh_gauge.cpp
index b49257895e624da39ffd13f165b6e0f90ea6d776..852f7bbd654afa35e4650505b4116e7a6f05df9f 100644 (file)
--- a/contrib/src/xrc/xh_gauge.cpp
+++ b/contrib/src/xrc/xh_gauge.cpp
@@ -24,51 +24,51 @@
 
 #if wxUSE_GAUGE
 
 
 #if wxUSE_GAUGE
 

+IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
+

 wxGaugeXmlHandler::wxGaugeXmlHandler() 
 : wxXmlResourceHandler() 
 {
 wxGaugeXmlHandler::wxGaugeXmlHandler() 
 : wxXmlResourceHandler() 
 {

-    ADD_STYLE( wxGA_HORIZONTAL );
-    ADD_STYLE( wxGA_VERTICAL );
-    ADD_STYLE( wxGA_PROGRESSBAR );
-    ADD_STYLE( wxGA_SMOOTH );   // windows only
+    XRC_ADD_STYLE(wxGA_HORIZONTAL);
+    XRC_ADD_STYLE(wxGA_VERTICAL);
+    XRC_ADD_STYLE(wxGA_PROGRESSBAR);
+    XRC_ADD_STYLE(wxGA_SMOOTH);   // windows only

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

-    wxGauge *control = new wxGauge(m_parentAsWindow,
-                                    GetID(),
-                                    GetLong( wxT("range"), wxGAUGE_DEFAULT_RANGE), 
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
+    XRC_MAKE_INSTANCE(control, wxGauge)
+
+    control->Create(m_parentAsWindow,
+                    GetID(),
+                    GetLong(wxT("range"), wxGAUGE_DEFAULT_RANGE), 
+                    GetPosition(), GetSize(),
+                    GetStyle(),
+                    wxDefaultValidator,
+                    GetName());

 
 

-    if( HasParam( wxT("value") ))
+    if( HasParam(wxT("value")))

     {
     {

-        control->SetValue( GetLong( wxT("value") ));
+        control->SetValue(GetLong(wxT("value")));

     }
     }

-    if( HasParam( wxT("shadow") ))
+    if( HasParam(wxT("shadow")))

     {
     {

-        control->SetShadowWidth( GetDimension( wxT("shadow") ));
+        control->SetShadowWidth(GetDimension(wxT("shadow")));

     }
     }

-    if( HasParam( wxT("bezel") ))
+    if( HasParam(wxT("bezel")))

     {
     {

-        control->SetBezelFace( GetDimension( wxT("bezel") ));
+        control->SetBezelFace(GetDimension(wxT("bezel")));

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

-    
+

     return control;
 }
 
     return control;
 }
 

-
-

 bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxGauge"));
 }
 
 bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxGauge"));
 }
 

-

 #endif // wxUSE_GAUGE
 #endif // wxUSE_GAUGE