fixed problems with sometimes processing the events twice introduced in rev 1.170...

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

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index 5ed5ee88db3dfd3f2cb4f39582fd2e97e0ac1778..ed74f1d3a1ba0a3ac4cdc10e17309a38945eea52 100644 (file)
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
-#pragma implementation "xh_bttn.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,13 +15,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_bttn.h"
 #include "wx/button.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxButtonXmlHandler, wxXmlResourceHandler)
 
 #include "wx/xrc/xh_bttn.h"
 #include "wx/button.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxButtonXmlHandler, wxXmlResourceHandler)
 

-wxButtonXmlHandler::wxButtonXmlHandler() 
-: wxXmlResourceHandler() 
+wxButtonXmlHandler::wxButtonXmlHandler()
+: wxXmlResourceHandler()

 {
     XRC_ADD_STYLE(wxBU_LEFT);
     XRC_ADD_STYLE(wxBU_RIGHT);
 {
     XRC_ADD_STYLE(wxBU_LEFT);
     XRC_ADD_STYLE(wxBU_RIGHT);


@@ -36,7 +34,7 @@ wxButtonXmlHandler::wxButtonXmlHandler()
 }
 
 wxObject *wxButtonXmlHandler::DoCreateResource()
 }
 
 wxObject *wxButtonXmlHandler::DoCreateResource()

-{ 
+{

    XRC_MAKE_INSTANCE(button, wxButton)
 
    button->Create(m_parentAsWindow,
    XRC_MAKE_INSTANCE(button, wxButton)
 
    button->Create(m_parentAsWindow,


@@ -50,7 +48,7 @@ wxObject *wxButtonXmlHandler::DoCreateResource()
     if (GetBool(wxT("default"), 0))
         button->SetDefault();
     SetupWindow(button);
     if (GetBool(wxT("default"), 0))
         button->SetDefault();
     SetupWindow(button);

-    
+

     return button;
 }
 
     return button;
 }
 


@@ -58,3 +56,5 @@ bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxButton"));
 }
 {
     return IsOfClass(node, wxT("wxButton"));
 }

+
+#endif // wxUSE_XRC