diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-10-24 17:13:44 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-25 11:41:23 +0100 |
commit | cd6e8837c17922c9ccf2b5740036853ac3adce45 (patch) | |
tree | 6a49c639ac0cded401fce0a07222c3debc749a4e | |
parent | f23297e11148fdd7b28e242e8b77f375f969c617 (diff) |
no PushButton loaded from .src now
Change-Id: Ib866107995ab0496cf4f37a5e780458031d2fc25
-rw-r--r-- | include/tools/rcid.h | 1 | ||||
-rw-r--r-- | include/vcl/button.hxx | 1 | ||||
-rw-r--r-- | rsc/inc/rscdb.hxx | 1 | ||||
-rw-r--r-- | rsc/source/parser/rscicpx.cxx | 19 | ||||
-rw-r--r-- | rsc/source/parser/rscinit.cxx | 5 | ||||
-rw-r--r-- | vcl/source/control/button.cxx | 13 |
6 files changed, 0 insertions, 40 deletions
diff --git a/include/tools/rcid.h b/include/tools/rcid.h index be3c75d0984d..0dc60382afd0 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -47,7 +47,6 @@ #define RSC_CONTROL (RSC_NOTYPE + 0x44) #define RSC_BUTTON (RSC_NOTYPE + 0x45) -#define RSC_PUSHBUTTON (RSC_NOTYPE + 0x46) #define RSC_TEXT (RSC_NOTYPE + 0x57) diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index ff521870da8e..9d83d004668c 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -155,7 +155,6 @@ protected: GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; public: explicit PushButton( vcl::Window* pParent, WinBits nStyle = 0 ); - explicit PushButton( 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 aa08f7cb554d..1aca22ed44bd 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -175,7 +175,6 @@ class RscTypCont RscTop * InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, RscArray * pLangGeo ); RscTop * InitClassControl( RscTop * pSuper ); - RscTop * InitClassPushButton( RscTop * pSuper ); RscTop * InitClassFixedText( RscTop * pSuper ); RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ); RscTop * InitClassMenuItem( RscTop * pSuper ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 4da88cd3a0e5..b2410819769c 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -262,25 +262,6 @@ RscTop * RscTypCont::InitClassControl( RscTop * pSuper ) return pClassControl; } -RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper ) -{ - Atom nId; - RscTop * pClassPushButton; - - // initialize class - nId = pHS->getID( "PushButton" ); - pClassPushButton = new RscClass( nId, RSC_PUSHBUTTON, pSuper ); - pClassPushButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassPushButton ); - - InsWinBit( pClassPushButton, "DefButton", nDefaultId ); - INS_WINBIT( pClassPushButton, Top ) - INS_WINBIT( pClassPushButton, VCenter ) - INS_WINBIT( pClassPushButton, Bottom ) - - return pClassPushButton; -} - RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index ece6ec2eded6..1c57ef86591a 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 * pClassPushButton; RscTop * pClassFixedText; RscTop * pClassKeyCode; RscTop * pLangClassKeyCode; @@ -296,10 +295,6 @@ void RscTypCont::Init() pClassButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassButton ); pRoot->Insert( pClassButton ); - - // initialize class - pClassPushButton = InitClassPushButton( pClassButton ); - pRoot->Insert( pClassPushButton ); } { pClassFixedText = InitClassFixedText( pClassControl ); diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 2ca40135e7ee..e094ad49853a 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1207,19 +1207,6 @@ PushButton::PushButton( vcl::Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -PushButton::PushButton( vcl::Window* pParent, const ResId& rResId ) : - Button( WINDOW_PUSHBUTTON ) -{ - rResId.SetRT( RSC_PUSHBUTTON ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInitPushButtonData(); - ImplInit( pParent, nStyle ); - ImplLoadRes(); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - void PushButton::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() && |