diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-20 13:10:46 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-20 13:10:46 +0000 |
| commit | e4050256aa5c6c04b7d512f8d58c5b743c137a1b (patch) | |
| tree | 29cc89f6b5e6865e44aa22c75b56e0e5dd5ad3bc /svx/source/dialog/checklbx.cxx | |
| parent | INTEGRATION: CWS jl49 (1.4.678); FILE MERGED (diff) | |
| download | core-e4050256aa5c6c04b7d512f8d58c5b743c137a1b.tar.gz core-e4050256aa5c6c04b7d512f8d58c5b743c137a1b.zip | |
INTEGRATION: CWS jl49 (1.9.116); FILE MERGED
2006/12/12 09:03:30 sb 1.9.116.3: #i70481# Added TODO issue ID.
2006/12/04 13:46:48 sb 1.9.116.2: #i70481# Prepare for high-contrast images (not yet functional, has to be addressed by future issue).
2006/11/30 13:45:54 sb 1.9.116.1: #i70481# Extended SvLBoxButton.
Diffstat (limited to 'svx/source/dialog/checklbx.cxx')
| -rw-r--r-- | svx/source/dialog/checklbx.cxx | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index ef72dcbde738..e95db1aecc3f 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -4,9 +4,9 @@ * * $RCSfile: checklbx.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-10-12 12:07:24 $ + * last change: $Author: ihi $ $Date: 2006-12-20 14:10:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -72,6 +72,19 @@ SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId ) : // ----------------------------------------------------------------------- +SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId, + const Image& rNormalStaticImage, + const Image& /*TODO#i72485# rHighContrastStaticImage*/ ) : + + SvTreeListBox( pParent, rResId ) + +{ + Init_Impl(); + pCheckButton->aBmps[SV_BMP_STATICIMAGE] = rNormalStaticImage; +} + +// ----------------------------------------------------------------------- + SvxCheckListBox::~SvxCheckListBox() { delete pCheckButton; @@ -87,9 +100,12 @@ void SvxCheckListBox::Init_Impl() // ----------------------------------------------------------------------- -void SvxCheckListBox::InsertEntry( const String& rStr, USHORT nPos ) +void SvxCheckListBox::InsertEntry( const String& rStr, USHORT nPos, + void* pUserData, + SvLBoxButtonKind eButtonKind ) { - SvTreeListBox::InsertEntry( rStr, NULL, FALSE, nPos ); + SvTreeListBox::InsertEntry( rStr, NULL, FALSE, nPos, pUserData, + eButtonKind ); } // ----------------------------------------------------------------------- @@ -259,14 +275,8 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) // ----------------------------------------------------------------------- -SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData ) +SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) { - return SvTreeListBox::InsertEntry( rText, pParent, bChildsOnDemand, nPos, pUserData ); + return SvTreeListBox::InsertEntry( rText, pParent, bChildsOnDemand, nPos, pUserData, eButtonKind ); } -// ----------------------------------------------------------------------- - -SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData ) -{ - return SvTreeListBox::InsertEntry( rText, rExpandedEntryBmp, rCollapsedEntryBmp, pParent, bChildsOnDemand, nPos, pUserData ); -} |