[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/inc vcl/source

[Libreoffice Gerrit user]

 vcl/inc/vcl/button.hxx        |    1 +
 vcl/source/control/button.cxx |    7 +++++++
 2 files changed, 8 insertions(+)

New commits:
commit 977868c3e4f91be07e359b32158d4ccf90bcdf88
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 18 14:22:28 2012 +0100

    copy the button data
    
    Change-Id: I3014106791b761e6aad5ea355402f9a2850f5bb5

diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 5a73e0a..31191f5 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -95,6 +95,7 @@ public:
 
     void                SetFocusRect( const Rectangle& rFocusRect );
     bool IsSmallSymbol () const;
+    virtual void take_properties(Window &rOther);
 };
 
 // --------------------
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 3e54e84..8395ff8 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -109,6 +109,13 @@ Button::Button( WindowType nType ) :
     mpButtonData = new ImplCommonButtonData;
 }
 
+void Button::take_properties(Window &rOther)
+{
+    Control::take_properties(rOther);
+    Button &rOtherButton = static_cast<Button&>(rOther);
+    *mpButtonData = *rOtherButton.mpButtonData;
+}
+
 // -----------------------------------------------------------------------
 
 Button::~Button()