Combine two wxImage-to-pixmap creation functions into one.

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

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index ff2d4813d0e1c663f0684a031b11a217cbd10f3d..397c6dbe472903c446312d4b3fed148e12e16896 100644 (file)
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_bttn.cpp
+// Name:        src/xrc/xh_bttn.cpp

 // Purpose:     XRC resource for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // Purpose:     XRC resource for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05


@@ -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,22 +15,29 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

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

-#include "wx/button.h"

 
 

+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
+
+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,


@@ -48,7 +51,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;
 }
 


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

+
+#endif // wxUSE_XRC