From c65386cec9398c7b8ce969d638cd1b5d98483f98 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 8 Oct 2016 17:00:19 +0100 Subject: no radiobuttons or checkboxes loaded from src files anymore Change-Id: Ie10ebcf56a6145c8edeb903bed1beb0cf5cf8a7a --- include/tools/rcid.h | 1 - include/vcl/button.hxx | 3 --- rsc/inc/rscdb.hxx | 1 - rsc/source/parser/rscicpx.cxx | 23 ----------------------- rsc/source/parser/rscinit.cxx | 4 ---- tools/source/rc/resmgr.cxx | 1 - vcl/source/control/button.cxx | 33 --------------------------------- 7 files changed, 66 deletions(-) diff --git a/include/tools/rcid.h b/include/tools/rcid.h index a63d55e66a35..36839e5d0d83 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -52,7 +52,6 @@ #define RSC_IMAGEBUTTON (RSC_NOTYPE + 0x4a) #define RSC_SPINBUTTON (RSC_NOTYPE + 0x4d) -#define RSC_RADIOBUTTON (RSC_NOTYPE + 0x4e) #define RSC_EDIT (RSC_NOTYPE + 0x52) diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index af7cd5533ce3..6ce35fa1441b 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -302,7 +302,6 @@ protected: using Control::ImplInitSettings; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: SAL_DLLPRIVATE void ImplCallClick( bool bGrabFocus = false, GetFocusFlags nFocusFlags = GetFocusFlags::NONE ); @@ -324,7 +323,6 @@ protected: public: explicit RadioButton( vcl::Window* pParent, WinBits nWinStyle = 0 ); - explicit RadioButton( vcl::Window* pParent, const ResId& ); virtual ~RadioButton() override; virtual void dispose() override; @@ -424,7 +422,6 @@ protected: using Control::ImplInitSettings; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); virtual void FillLayoutData() const override; virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const override; virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index e7ffebad331d..69a85ca5de65 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -189,7 +189,6 @@ class RscTypCont RscTop * InitClassComboBox( RscTop * pSuper, RscArray * pStrLst ); RscTop * InitClassFixedText( RscTop * pSuper ); RscTop * InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage ); - RscTop * InitClassRadioButton( RscTop * pSuper ); RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ); RscTop * InitClassMenuItem( RscTop * pSuper ); RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 7a03057d42b3..85fd6a370d09 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -472,29 +472,6 @@ RscTop * RscTypCont::InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage return pClassFixedImage; } -RscTop * RscTypCont::InitClassRadioButton( RscTop * pSuper ) -{ - Atom nId; - RscTop * pClassRadioButton; - - // initialize class - nId = pHS->getID( "RadioButton" ); - pClassRadioButton = new RscClass( nId, RSC_RADIOBUTTON, pSuper ); - pClassRadioButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassRadioButton ); - - // initialize variables - INS_WINBIT( pClassRadioButton, WordBreak ) - INS_WINBIT( pClassRadioButton, Top ) - INS_WINBIT( pClassRadioButton, VCenter ) - INS_WINBIT( pClassRadioButton, Bottom ) - - nId = aNmTb.Put( "Check", VARNAME ); - pClassRadioButton->SetVariable( nId, &aBool ); - - return pClassRadioButton; -} - RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 5129f69bea37..2670ed31e1dd 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -65,7 +65,6 @@ void RscTypCont::Init() RscTop * pClassControl; RscTop * pClassButton; RscTop * pClassPushButton; - RscTop * pClassRadioButton; RscTop * pClassImageButton; RscTop * pClassEdit; RscTop * pClassListBox; @@ -311,9 +310,6 @@ void RscTypCont::Init() pRoot->Insert( pClassPushButton ); } { - pClassRadioButton = InitClassRadioButton( pClassButton ); - pRoot->Insert( pClassRadioButton ); - pClassImageButton = InitClassImageButton( pClassPushButton, pClassImage, pTriState ); pRoot->Insert( pClassImageButton ); diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 41305b02e31e..eec17191c343 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1423,7 +1423,6 @@ OString ResMgr::GetAutoHelpId() // intentionally no breaks! // auto help ids for controls switch( pRC->pResource->GetRT() ) { - case RSC_RADIOBUTTON: aHID.append( "RadioButton" ); break; case RSC_EDIT: aHID.append( "Edit" ); break; case RSC_LISTBOX: aHID.append( "ListBox" ); break; case RSC_COMBOBOX: aHID.append( "ComboBox" ); break; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index e232e0b94def..fc37a3429092 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2322,29 +2322,6 @@ RadioButton::RadioButton( vcl::Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -RadioButton::RadioButton( vcl::Window* pParent, const ResId& rResId ) : - Button( WINDOW_RADIOBUTTON ), mbLegacyNoTextAlign( false ) -{ - rResId.SetRT( RSC_RADIOBUTTON ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInitRadioButtonData(); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - -void RadioButton::ImplLoadRes( const ResId& rResId ) -{ - Button::ImplLoadRes( rResId ); - - //anderer Wert als Default ? - sal_uInt16 nChecked = ReadShortRes(); - if ( nChecked ) - SetState( true ); -} - RadioButton::~RadioButton() { disposeOnce(); @@ -3029,16 +3006,6 @@ void CheckBox::ImplInitSettings( bool bFont, } } -void CheckBox::ImplLoadRes( const ResId& rResId ) -{ - Button::ImplLoadRes( rResId ); - - sal_uInt16 nChecked = ReadShortRes(); - //anderer Wert als Default ? - if( nChecked ) - Check(); -} - void CheckBox::ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) { bool bNativeOK = true; -- cgit v1.2.3