extending calculation of visible region

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

diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index 476609dfab85c2abd18818b48b295c762720809b..984234d2105fec7f2503954ed19b7373972e0be2 100644 (file)
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bmpbt.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bmpbt.cpp

-// Purpose:     XML resource for bitmap buttons
+// Purpose:     XRC resource for bitmap buttons

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$


@@ -22,28 +22,33 @@
 #include "wx/xrc/xh_bmpbt.h"
 #include <wx/bmpbuttn.h>
 
 #include "wx/xrc/xh_bmpbt.h"
 #include <wx/bmpbuttn.h>
 

+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButtonXmlHandler, wxXmlResourceHandler)
+

 wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler() 
 : wxXmlResourceHandler() 
 {
 wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler() 
 : wxXmlResourceHandler() 
 {

-    ADD_STYLE(wxBU_AUTODRAW);
-    ADD_STYLE(wxBU_LEFT);
-    ADD_STYLE(wxBU_RIGHT);
-    ADD_STYLE(wxBU_TOP);
-    ADD_STYLE(wxBU_BOTTOM);
+    XRC_ADD_STYLE(wxBU_AUTODRAW);
+    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();
 }
 
     AddWindowStyles();
 }
 

-

 wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
 { 
 wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
 { 

-    wxBitmapButton *button = new wxBitmapButton(m_parentAsWindow,
-                                    GetID(),
-                                    GetBitmap(wxT("bitmap")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(wxT("style"), wxBU_AUTODRAW),
-                                    wxDefaultValidator,
-                                    GetName());
-    if (GetBool(wxT("default"), 0) == 1) button->SetDefault();
+    XRC_MAKE_INSTANCE(button, wxBitmapButton)
+
+    button->Create(m_parentAsWindow,
+                   GetID(),
+                   GetBitmap(wxT("bitmap")),
+                   GetPosition(), GetSize(),
+                   GetStyle(wxT("style"), wxBU_AUTODRAW),
+                   wxDefaultValidator,
+                   GetName());
+    if (GetBool(wxT("default"), 0))
+        button->SetDefault();

     SetupWindow(button);
     
     if (!GetParamValue(wxT("selected")).IsEmpty())
     SetupWindow(button);
     
     if (!GetParamValue(wxT("selected")).IsEmpty())


@@ -56,11 +61,7 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
     return button;
 }
 
     return button;
 }
 

-
-

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

-
-