summaryrefslogtreecommitdiff
path: root/svtools/source/contnr
diff options
context:
space:
mode:
authorgt <gt@openoffice.org>2002-05-24 08:48:23 +0000
committergt <gt@openoffice.org>2002-05-24 08:48:23 +0000
commit9159d3b959d7e26c1f9ad2d8d4bc223974791e78 (patch)
tree71657e177cbc90a6466f0781d86b8850a32036c2 /svtools/source/contnr
parent506a3500d5f2308fe24257b55d7ffa92e15b0125 (diff)
#99251# default images for class SvLBoxButtonData
Diffstat (limited to 'svtools/source/contnr')
-rw-r--r--svtools/source/contnr/svlbitm.cxx79
-rw-r--r--svtools/source/contnr/svtreebx.cxx8
2 files changed, 78 insertions, 9 deletions
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index ab6ba9e591e5..0234fcf36ba4 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svlbitm.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: fs $ $Date: 2002-05-17 11:52:21 $
+ * last change: $Author: gt $ $Date: 2002-05-24 09:48:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -63,23 +63,65 @@
#include <svlbox.hxx>
#include <svlbitm.hxx>
-#pragma hdrstop
+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
+#endif
+#ifndef _SV_BUTTON_HXX
+#include <vcl/button.hxx>
+#endif
+#ifndef _SV_DECOVIEW_HXX
+#include <vcl/decoview.hxx>
+#endif
#define TABOFFS_NOT_VALID -2000000
+
+struct SvLBoxButtonData_Impl
+{
+ SvLBoxEntry* pEntry;
+ BOOL bDefaultImages;
+};
+
+
DBG_NAME(SvLBoxButtonData);
-SvLBoxButtonData::SvLBoxButtonData()
+void SvLBoxButtonData::InitData( BOOL bImagesFromDefault, const Control* pCtrl )
{
- DBG_CTOR(SvLBoxButtonData,0);
+ pImpl = new SvLBoxButtonData_Impl;
+
bDataOk = FALSE;
- pEntry = 0;
+ pImpl->pEntry = 0;
+
eState = SV_BUTTON_UNCHECKED;
+
+ pImpl->bDefaultImages = bImagesFromDefault;
+
+ if( bImagesFromDefault )
+ SetDefaultImages( pCtrl );
+}
+
+SvLBoxButtonData::SvLBoxButtonData( const Control* pControlForSettings )
+{
+ DBG_CTOR(SvLBoxButtonData,0);
+
+ InitData( TRUE, pControlForSettings );
+}
+
+SvLBoxButtonData::SvLBoxButtonData()
+{
+ DBG_CTOR(SvLBoxButtonData,0);
+
+ InitData( FALSE );
}
SvLBoxButtonData::~SvLBoxButtonData()
{
DBG_DTOR(SvLBoxButtonData,0);
+
+ delete pImpl;
+#ifdef DBG_UTIL
+ pImpl = NULL;
+#endif
}
@@ -128,7 +170,7 @@ void SvLBoxButtonData::SetWidthAndHeight()
void SvLBoxButtonData::StoreButtonState( SvLBoxEntry* pActEntry, USHORT nItemFlags )
{
DBG_CHKTHIS(SvLBoxButtonData,0);
- pEntry = pActEntry;
+ pImpl->pEntry = pActEntry;
eState = ConvertToButtonState( nItemFlags );
}
@@ -153,6 +195,29 @@ SvButtonState SvLBoxButtonData::ConvertToButtonState( USHORT nItemFlags ) const
}
}
+SvLBoxEntry* SvLBoxButtonData::GetActEntry() const
+{
+ DBG_ASSERT( pImpl, "-SvLBoxButtonData::GetActEntry(): don't use me that way!" );
+ return pImpl->pEntry;
+}
+
+void SvLBoxButtonData::SetDefaultImages( const Control* pCtrl )
+{
+ const AllSettings& rSettings = pCtrl? pCtrl->GetSettings() : Application::GetSettings();
+
+ aBmps[ SV_BMP_UNCHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT );
+ aBmps[ SV_BMP_CHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED );
+ aBmps[ SV_BMP_HICHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED );
+ aBmps[ SV_BMP_HIUNCHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED );
+ aBmps[ SV_BMP_TRISTATE ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DONTKNOW );
+ aBmps[ SV_BMP_HITRISTATE ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DONTKNOW | BUTTON_DRAW_PRESSED );
+}
+
+BOOL SvLBoxButtonData::HasDefaultImages( void ) const
+{
+ return pImpl->bDefaultImages;
+}
+
// ***************************************************************
// class SvLBoxString
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index 13589cf5511a..dbfa628dfd60 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svtreebx.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: fs $ $Date: 2002-05-17 08:31:59 $
+ * last change: $Author: gt $ $Date: 2002-05-24 09:48:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2413,6 +2413,10 @@ void SvTreeListBox::InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground)
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
+
+ // always try to re-create default-SvLBoxButtonData
+ if( pCheckButtonData && pCheckButtonData->HasDefaultImages() )
+ pCheckButtonData->SetDefaultImages( this );
}
void SvTreeListBox::InitStartEntry()