summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-23 21:11:41 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-24 13:04:38 +0100
commit602274c77fa8134ca097f4d60b9fb75cea0eff78 (patch)
tree97f52c76c3ccde45692c1579737a1b25ffdd4d36
parent6f660293885733e64602aa6144c36ed7e7b43faf (diff)
no ImageButton loaded from .src now
Change-Id: If6f6718e1e6d756b99a499deafa4310c76a75ad3
-rw-r--r--include/tools/rc.h10
-rw-r--r--include/tools/rcid.h2
-rw-r--r--include/vcl/button.hxx1
-rw-r--r--rsc/inc/rscdb.hxx2
-rw-r--r--rsc/source/parser/rscicpx.cxx67
-rw-r--r--rsc/source/parser/rscinit.cxx5
-rw-r--r--vcl/source/control/button.cxx20
7 files changed, 0 insertions, 107 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h
index 775903780f59..7eab5bf7c06e 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -77,16 +77,6 @@ namespace o3tl {
template<> struct typed_flags<RscMenuItem> : is_typed_flags<RscMenuItem, 0xd6f> {};
}
-// For "ImageButtons":
-enum class RscImageButtonFlags {
- Image = 0x01,
- Symbol = 0x02,
- State = 0x04
-};
-namespace o3tl {
- template<> struct typed_flags<RscImageButtonFlags> : is_typed_flags<RscImageButtonFlags, 0x07> {};
-}
-
// For "Image":
enum class RscImageFlags {
ImageBitmap = 0x01,
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 4d69c85129d4..c88ee3c03b02 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -49,8 +49,6 @@
#define RSC_BUTTON (RSC_NOTYPE + 0x45)
#define RSC_PUSHBUTTON (RSC_NOTYPE + 0x46)
-#define RSC_IMAGEBUTTON (RSC_NOTYPE + 0x4a)
-
#define RSC_EDIT (RSC_NOTYPE + 0x52)
#define RSC_LISTBOX (RSC_NOTYPE + 0x55)
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index c7976b4ce0b7..ff521870da8e 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -500,7 +500,6 @@ private:
public:
ImageButton( vcl::Window* pParent, WinBits nStyle = 0 );
- ImageButton( vcl::Window* pParent, const ResId& rResId );
};
class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 715a88f2a94e..cbcafe0cb594 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -176,8 +176,6 @@ class RscTypCont
RscArray * pLangGeo );
RscTop * InitClassControl( RscTop * pSuper );
RscTop * InitClassPushButton( RscTop * pSuper );
- RscTop * InitClassImageButton( RscTop * pSuper, RscTop * pClassImage,
- RscEnum * pTriState );
RscTop * InitClassEdit( RscTop * pSuper );
RscTop * InitClassListBox( RscTop * pSuper, RscArray * pStrLst );
RscTop * InitClassFixedText( RscTop * pSuper );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index e2514b8bc321..c50204788c9c 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -281,73 +281,6 @@ RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper )
return pClassPushButton;
}
-RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper,
- RscTop * pClassImage,
- RscEnum * pTriState )
-{
- Atom nId;
- RscTop * pClassImageButton;
-
- // initialize class
- nId = pHS->getID( "ImageButton" );
- pClassImageButton = new RscClass( nId, RSC_IMAGEBUTTON, pSuper );
- pClassImageButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassImageButton );
-
- // initialize variables
- {
- nId = aNmTb.Put( "ButtonImage", VARNAME );
- pClassImageButton->SetVariable( nId, pClassImage, nullptr, 0,
- (sal_uInt32)RscImageButtonFlags::Image );
- }
- // initialize variables
- {
- Atom nVarId;
- RscEnum * pSymbol;
-
- aBaseLst.push_back( pSymbol = new RscEnum( pHS->getID( "EnumSymbolButton" ), RSC_NOTYPE ) );
-
- SETCONST( pSymbol, "IMAGEBUTTON_DONTKNOW", SymbolType::DONTKNOW );
- SETCONST( pSymbol, "IMAGEBUTTON_IMAGE", SymbolType::IMAGE );
- SETCONST( pSymbol, "IMAGEBUTTON_ARROW_UP", SymbolType::ARROW_UP );
- SETCONST( pSymbol, "IMAGEBUTTON_ARROW_DOWN", SymbolType::ARROW_DOWN );
- SETCONST( pSymbol, "IMAGEBUTTON_ARROW_LEFT", SymbolType::ARROW_LEFT );
- SETCONST( pSymbol, "IMAGEBUTTON_ARROW_RIGHT", SymbolType::ARROW_RIGHT );
- SETCONST( pSymbol, "IMAGEBUTTON_SPIN_UP", SymbolType::SPIN_UP );
- SETCONST( pSymbol, "IMAGEBUTTON_SPIN_DOWN", SymbolType::SPIN_DOWN );
- SETCONST( pSymbol, "IMAGEBUTTON_SPIN_LEFT", SymbolType::SPIN_LEFT );
- SETCONST( pSymbol, "IMAGEBUTTON_SPIN_RIGHT", SymbolType::SPIN_RIGHT );
- SETCONST( pSymbol, "IMAGEBUTTON_FIRST", SymbolType::FIRST );
- SETCONST( pSymbol, "IMAGEBUTTON_LAST", SymbolType::LAST );
- SETCONST( pSymbol, "IMAGEBUTTON_PREV", SymbolType::PREV );
- SETCONST( pSymbol, "IMAGEBUTTON_NEXT", SymbolType::NEXT );
- SETCONST( pSymbol, "IMAGEBUTTON_PAGEUP", SymbolType::PAGEUP );
- SETCONST( pSymbol, "IMAGEBUTTON_PAGEDOWN", SymbolType::PAGEDOWN );
- SETCONST( pSymbol, "IMAGEBUTTON_PLAY", SymbolType::PLAY );
- SETCONST( pSymbol, "IMAGEBUTTON_REVERSEPLAY", SymbolType::REVERSEPLAY );
- SETCONST( pSymbol, "IMAGEBUTTON_STOP", SymbolType::STOP );
- SETCONST( pSymbol, "IMAGEBUTTON_PAUSE", SymbolType::PAUSE );
- SETCONST( pSymbol, "IMAGEBUTTON_WINDSTART", SymbolType::WINDSTART );
- SETCONST( pSymbol, "IMAGEBUTTON_WINDEND", SymbolType::WINDEND );
- SETCONST( pSymbol, "IMAGEBUTTON_WINDBACKWARD", SymbolType::WINDBACKWARD );
- SETCONST( pSymbol, "IMAGEBUTTON_WINDFORWARD", SymbolType::WINDFORWARD );
-
- // add variable
- nVarId = aNmTb.Put( "Symbol", VARNAME );
- pClassImageButton->SetVariable( nVarId, pSymbol, nullptr, 0,
- (sal_uInt32)RscImageButtonFlags::Symbol );
- }
- nId = aNmTb.Put( "State", VARNAME );
- pClassImageButton->SetVariable( nId, pTriState, nullptr, 0,
- (sal_uInt32)RscImageButtonFlags::State );
-
- INS_WINBIT(pClassImageButton,Repeat)
- INS_WINBIT(pClassImageButton,SmallStyle)
- INS_WINBIT(pClassImageButton,RectStyle)
-
- return pClassImageButton;
-}
-
RscTop * RscTypCont::InitClassEdit( RscTop * pSuper )
{
Atom nId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 735acef364fd..68bb4f77aedd 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 * pClassImageButton;
RscTop * pClassEdit;
RscTop * pClassListBox;
RscTop * pClassFixedText;
@@ -306,10 +305,6 @@ void RscTypCont::Init()
pRoot->Insert( pClassPushButton );
}
{
- pClassImageButton = InitClassImageButton( pClassPushButton,
- pClassImage, pTriState );
- pRoot->Insert( pClassImageButton );
-
pClassEdit = InitClassEdit( pClassControl );
pRoot->Insert( pClassEdit );
}
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index ebbe3c9bb31e..2ca40135e7ee 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -3777,26 +3777,6 @@ ImageButton::ImageButton( vcl::Window* pParent, WinBits nStyle ) :
ImplInitStyle();
}
-ImageButton::ImageButton( vcl::Window* pParent, const ResId& rResId ) :
- PushButton( pParent, rResId.SetRT( RSC_IMAGEBUTTON ) )
-{
- RscImageButtonFlags nObjMask = (RscImageButtonFlags)ReadLongRes();
-
- if ( RscImageButtonFlags::Image & nObjMask )
- {
- SetModeImage( Image( ResId( static_cast<RSHEADER_TYPE*>(GetClassRes()), *rResId.GetResMgr() ) ) );
- IncrementRes( GetObjSizeRes( static_cast<RSHEADER_TYPE*>(GetClassRes()) ) );
- }
-
- if ( RscImageButtonFlags::Symbol & nObjMask )
- SetSymbol( (SymbolType)ReadLongRes() );
-
- if ( RscImageButtonFlags::State & nObjMask )
- SetState( (TriState)ReadLongRes() );
-
- ImplInitStyle();
-}
-
void ImageButton::ImplInitStyle()
{
WinBits nStyle = GetStyle();