Compilo.

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

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

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_bttn.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_bttn.h"
 #endif


@@ -19,23 +19,26 @@
     #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_TOP);
     XRC_ADD_STYLE(wxBU_BOTTOM);
 {
     XRC_ADD_STYLE(wxBU_LEFT);
     XRC_ADD_STYLE(wxBU_RIGHT);
     XRC_ADD_STYLE(wxBU_TOP);
     XRC_ADD_STYLE(wxBU_BOTTOM);

+    XRC_ADD_STYLE(wxBU_EXACTFIT);

     AddWindowStyles();
 }
 
 wxObject *wxButtonXmlHandler::DoCreateResource()
     AddWindowStyles();
 }
 
 wxObject *wxButtonXmlHandler::DoCreateResource()

-{ 
+{

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


@@ -49,7 +52,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;
 }
 


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

+
+#endif // wxUSE_XRC