diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-12-04 17:11:52 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-12-04 20:08:08 +0000 |
commit | 0bde9091b00516096657cb7ed82898d486072355 (patch) | |
tree | 2e941b79f3f6430a758b6e99e75e3de254e214ef /vcl/source/control/button.cxx | |
parent | 839272421fcf4c7bd1ebb0e526fb1476a0cb84c6 (diff) |
remove ability to auto-replace .res widgets with .ui versions
it worked, and was sort of cool, but complicated and potentially fragile and
I've lost interest in maintaining it as a stepping stone towards full .ui
conversion in favour of just fully converted to .ui
Change-Id: I27cfd4061ef15cd691ac6ddaa7155afd025182ec
Diffstat (limited to 'vcl/source/control/button.cxx')
-rw-r--r-- | vcl/source/control/button.cxx | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 2410ba3c02fd..63233c266c6a 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -96,13 +96,6 @@ 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() @@ -1209,10 +1202,6 @@ PushButton::PushButton( Window* pParent, const ResId& rResId ) : { rResId.SetRT( RSC_PUSHBUTTON ); WinBits nStyle = ImplInitRes( rResId ); - - if (VclBuilderContainer::replace_buildable(pParent, rResId, *this)) - return; - ImplInitPushButtonData(); ImplInit( pParent, nStyle ); ImplLoadRes( rResId ); @@ -1221,17 +1210,6 @@ PushButton::PushButton( Window* pParent, const ResId& rResId ) : Show(); } -void PushButton::take_properties(Window &rOther) -{ - if (!GetParent()) - { - ImplInitPushButtonData(); - ImplInit(rOther.GetParent(), rOther.GetStyle()); - } - - Button::take_properties(rOther); -} - // ----------------------------------------------------------------------- PushButton::~PushButton() @@ -1781,10 +1759,6 @@ OKButton::OKButton( Window* pParent, const ResId& rResId ) : { rResId.SetRT( RSC_OKBUTTON ); WinBits nStyle = ImplInitRes( rResId ); - - if (VclBuilderContainer::replace_buildable(pParent, rResId, *this)) - return; - ImplInit( pParent, nStyle ); ImplLoadRes( rResId ); @@ -1792,13 +1766,6 @@ OKButton::OKButton( Window* pParent, const ResId& rResId ) : Show(); } -void OKButton::take_properties(Window &rOther) -{ - if (!GetParent()) - ImplInit(rOther.GetParent(), rOther.GetStyle()); - PushButton::take_properties(rOther); -} - // ----------------------------------------------------------------------- void OKButton::Click() @@ -1858,10 +1825,6 @@ CancelButton::CancelButton( Window* pParent, const ResId& rResId ) : { rResId.SetRT( RSC_CANCELBUTTON ); WinBits nStyle = ImplInitRes( rResId ); - - if (VclBuilderContainer::replace_buildable(pParent, rResId, *this)) - return; - ImplInit( pParent, nStyle ); ImplLoadRes( rResId ); @@ -1869,13 +1832,6 @@ CancelButton::CancelButton( Window* pParent, const ResId& rResId ) : Show(); } -void CancelButton::take_properties(Window &rOther) -{ - if (!GetParent()) - ImplInit(rOther.GetParent(), rOther.GetStyle()); - PushButton::take_properties(rOther); -} - // ----------------------------------------------------------------------- void CancelButton::Click() @@ -1935,10 +1891,6 @@ HelpButton::HelpButton( Window* pParent, const ResId& rResId ) : { rResId.SetRT( RSC_HELPBUTTON ); WinBits nStyle = ImplInitRes( rResId ); - - if (VclBuilderContainer::replace_buildable(pParent, rResId, *this)) - return; - ImplInit( pParent, nStyle ); ImplLoadRes( rResId ); @@ -1946,13 +1898,6 @@ HelpButton::HelpButton( Window* pParent, const ResId& rResId ) : Show(); } -void HelpButton::take_properties(Window &rOther) -{ - if (!GetParent()) - ImplInit(rOther.GetParent(), rOther.GetStyle()); - PushButton::take_properties(rOther); -} - // ----------------------------------------------------------------------- void HelpButton::Click() @@ -2512,10 +2457,6 @@ RadioButton::RadioButton( Window* pParent, const ResId& rResId ) : { rResId.SetRT( RSC_RADIOBUTTON ); WinBits nStyle = ImplInitRes( rResId ); - - if (VclBuilderContainer::replace_buildable(pParent, rResId, *this)) - return; - ImplInitRadioButtonData(); ImplInit( pParent, nStyle ); ImplLoadRes( rResId ); @@ -2524,30 +2465,6 @@ RadioButton::RadioButton( Window* pParent, const ResId& rResId ) : Show(); } -void RadioButton::take_properties(Window &rOther) -{ - if (!GetParent()) - { - ImplInitRadioButtonData(); - ImplInit(rOther.GetParent(), rOther.GetStyle()); - } - - Button::take_properties(rOther); - - RadioButton &rOtherRadio = static_cast<RadioButton&>(rOther); - if (rOtherRadio.m_xGroup.get()) - { - rOtherRadio.m_xGroup->erase(std::remove(rOtherRadio.m_xGroup->begin(), rOtherRadio.m_xGroup->end(), &rOtherRadio), - rOtherRadio.m_xGroup->end()); - rOtherRadio.m_xGroup->push_back(this); - } - std::swap(m_xGroup, rOtherRadio.m_xGroup); - mbChecked = rOtherRadio.mbChecked; - mbSaveValue = rOtherRadio.mbSaveValue; - mbRadioCheck = rOtherRadio.mbRadioCheck; - mbStateChanged = rOtherRadio.mbStateChanged; -} - // ----------------------------------------------------------------------- void RadioButton::ImplLoadRes( const ResId& rResId ) @@ -3487,10 +3404,6 @@ CheckBox::CheckBox( Window* pParent, const ResId& rResId ) : { rResId.SetRT( RSC_CHECKBOX ); WinBits nStyle = ImplInitRes( rResId ); - - if (VclBuilderContainer::replace_buildable(pParent, rResId, *this)) - return; - ImplInitCheckBoxData(); ImplInit( pParent, nStyle ); ImplLoadRes( rResId ); @@ -3499,22 +3412,6 @@ CheckBox::CheckBox( Window* pParent, const ResId& rResId ) : Show(); } -void CheckBox::take_properties(Window &rOther) -{ - if (!GetParent()) - { - ImplInitCheckBoxData(); - ImplInit(rOther.GetParent(), rOther.GetStyle()); - } - - Button::take_properties(rOther); - - CheckBox &rOtherCheck = static_cast<CheckBox&>(rOther); - meState = rOtherCheck.meState; - meSaveValue = rOtherCheck.meSaveValue; - mbTriState = rOtherCheck.mbTriState; -} - // ----------------------------------------------------------------------- void CheckBox::MouseButtonDown( const MouseEvent& rMEvt ) |