diff options
| -rw-r--r-- | include/tools/rcid.h | 2 | ||||
| -rw-r--r-- | include/vcl/button.hxx | 1 | ||||
| -rw-r--r-- | rsc/inc/rscdb.hxx | 1 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 23 | ||||
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 4 | ||||
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/control/button.cxx | 13 |
7 files changed, 0 insertions, 45 deletions
diff --git a/include/tools/rcid.h b/include/tools/rcid.h index 95c4b9a58104..a63d55e66a35 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -54,8 +54,6 @@ #define RSC_SPINBUTTON (RSC_NOTYPE + 0x4d) #define RSC_RADIOBUTTON (RSC_NOTYPE + 0x4e) -#define RSC_CHECKBOX (RSC_NOTYPE + 0x50) - #define RSC_EDIT (RSC_NOTYPE + 0x52) #define RSC_COMBOBOX (RSC_NOTYPE + 0x54) diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index f6e05f478a4d..af7cd5533ce3 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -438,7 +438,6 @@ public: SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); public: explicit CheckBox( vcl::Window* pParent, WinBits nStyle = 0 ); - explicit CheckBox( vcl::Window* pParent, const ResId& ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void Tracking( const TrackingEvent& rTEvt ) override; diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 4f507f42520c..e7ffebad331d 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -181,7 +181,6 @@ class RscTypCont RscTop * InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, RscArray * pLangGeo ); RscTop * InitClassControl( RscTop * pSuper ); - RscTop * InitClassCheckBox( RscTop * pSuper ); RscTop * InitClassPushButton( RscTop * pSuper ); RscTop * InitClassImageButton( RscTop * pSuper, RscTop * pClassImage, RscEnum * pTriState ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index e757a7b1136d..7a03057d42b3 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -262,29 +262,6 @@ RscTop * RscTypCont::InitClassControl( RscTop * pSuper ) return pClassControl; } -RscTop * RscTypCont::InitClassCheckBox( RscTop * pSuper ) -{ - Atom nId; - RscTop * pClassCheckBox; - - // initialize class - nId = pHS->getID( "CheckBox" ); - pClassCheckBox = new RscClass( nId, RSC_CHECKBOX, pSuper ); - pClassCheckBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassCheckBox ); - - // initialize variables - INS_WINBIT( pClassCheckBox, WordBreak ) - INS_WINBIT( pClassCheckBox, Top ) - INS_WINBIT( pClassCheckBox, VCenter ) - INS_WINBIT( pClassCheckBox, Bottom ) - - nId = aNmTb.Put( "Check", VARNAME ); - pClassCheckBox->SetVariable( nId, &aBool ); - - return pClassCheckBox; -} - RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 15596c683255..5129f69bea37 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -64,7 +64,6 @@ void RscTypCont::Init() RscTop * pClassWindow; RscTop * pClassControl; RscTop * pClassButton; - RscTop * pClassCheckBox; RscTop * pClassPushButton; RscTop * pClassRadioButton; RscTop * pClassImageButton; @@ -307,9 +306,6 @@ void RscTypCont::Init() aNmTb.Put( nId, CLASSNAME, pClassButton ); pRoot->Insert( pClassButton ); - pClassCheckBox = InitClassCheckBox( pClassButton ); - pRoot->Insert( pClassCheckBox ); - // initialize class pClassPushButton = InitClassPushButton( pClassButton ); pRoot->Insert( pClassPushButton ); diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 983f78da4229..41305b02e31e 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1424,7 +1424,6 @@ OString ResMgr::GetAutoHelpId() // auto help ids for controls switch( pRC->pResource->GetRT() ) { case RSC_RADIOBUTTON: aHID.append( "RadioButton" ); break; - case RSC_CHECKBOX: aHID.append( "CheckBox" ); 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 4e5904eb56c0..e232e0b94def 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -3237,19 +3237,6 @@ CheckBox::CheckBox( vcl::Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -CheckBox::CheckBox( vcl::Window* pParent, const ResId& rResId ) : - Button( WINDOW_CHECKBOX ), mbLegacyNoTextAlign( false ) -{ - rResId.SetRT( RSC_CHECKBOX ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInitCheckBoxData(); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - void CheckBox::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() && maMouseRect.IsInside( rMEvt.GetPosPixel() ) ) |