restore SetSelection(-1, -1) behaviour which was broken during wxTextEntry refactoring

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

diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp
index a52b8075aafa79c0a3bc38482b3778b400c2c795..9d63af74d0e6f70406d0ba6608e999f4bda58a24 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


@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // 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"


@@ -19,28 +15,35 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_GAUGE
+

 #include "wx/xrc/xh_gauge.h"
 #include "wx/xrc/xh_gauge.h"

-#include "wx/gauge.h"

 
 

-#if wxUSE_GAUGE
+#ifndef WX_PRECOMP
+    #include "wx/gauge.h"
+#endif

 
 

-wxGaugeXmlHandler::wxGaugeXmlHandler() 
-: wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
+
+wxGaugeXmlHandler::wxGaugeXmlHandler()
+                  :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();
 }
 
 wxObject *wxGaugeXmlHandler::DoCreateResource()
     XRC_ADD_STYLE(wxGA_SMOOTH);   // windows only
     AddWindowStyles();
 }
 
 wxObject *wxGaugeXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(control, wxGauge)
 
     control->Create(m_parentAsWindow,
                     GetID(),
     XRC_MAKE_INSTANCE(control, wxGauge)
 
     control->Create(m_parentAsWindow,
                     GetID(),

-                    GetLong(wxT("range"), wxGAUGE_DEFAULT_RANGE), 
+                    GetLong(wxT("range"), wxGAUGE_DEFAULT_RANGE),

                     GetPosition(), GetSize(),
                     GetStyle(),
                     wxDefaultValidator,
                     GetPosition(), GetSize(),
                     GetStyle(),
                     wxDefaultValidator,


@@ -69,4 +72,4 @@ bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxGauge"));
 }
 
     return IsOfClass(node, wxT("wxGauge"));
 }
 

-#endif // wxUSE_GAUGE
+#endif // wxUSE_XRC && wxUSE_GAUGE