strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS components1 (1.11.14); FILE MERGED

Browse source 
2007/01/25 15:24:19 af 1.11.14.2: RESYNC: (1.11-1.12); FILE MERGED
2007/01/24 17:51:21 af 1.11.14.1: #i68075# The click handler can now be supplied along with a control.
This commit is contained in:
Rüdiger Timm 2007-04-03 15:21:29 +00:00
parent a021467b25
commit c517813773
1 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sd/source/ui/toolpanel/TitledControl.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: TitledControl.cxx,v $ * $RCSfile: TitledControl.cxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: kz $ $Date: 2006-12-12 18:44:50 $ * last change: $Author: rt $ $Date: 2007-04-03 16:21:29 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -58,6 +58,7 @@ TitledControl::TitledControl (
TreeNode* pParent, TreeNode* pParent,
::std::auto_ptr<TreeNode> pControl, ::std::auto_ptr<TreeNode> pControl,
const String& rTitle, const String& rTitle,
const ClickHandler& rClickHandler,
TitleBar::TitleBarType eType) TitleBar::TitleBarType eType)
: ::Window (pParent->GetWindow(), WB_TABSTOP), : ::Window (pParent->GetWindow(), WB_TABSTOP),
TreeNode(pParent), TreeNode(pParent),
@ -65,6 +66,7 @@ TitledControl::TitledControl (
mbVisible(true), mbVisible(true),
mpUserData(NULL), mpUserData(NULL),
mpControlFactory(NULL), mpControlFactory(NULL),
mpClickHandler(new ClickHandler(rClickHandler)),
mbExpansionModeIsToggle(eType!=TitleBar::TBT_CONTROL_TITLE) mbExpansionModeIsToggle(eType!=TitleBar::TBT_CONTROL_TITLE)
{ {
if (pControl.get() != NULL) if (pControl.get() != NULL)
@ -94,6 +96,7 @@ TitledControl::TitledControl (
TreeNode* pParent, TreeNode* pParent,
::std::auto_ptr<ControlFactory> pControlFactory, ::std::auto_ptr<ControlFactory> pControlFactory,
const String& rTitle, const String& rTitle,
const ClickHandler& rClickHandler,
TitleBar::TitleBarType eType) TitleBar::TitleBarType eType)
: ::Window (pParent->GetWindow(), WB_TABSTOP), : ::Window (pParent->GetWindow(), WB_TABSTOP),
TreeNode(pParent), TreeNode(pParent),
@ -101,6 +104,7 @@ TitledControl::TitledControl (
mbVisible (true), mbVisible (true),
mpUserData (NULL), mpUserData (NULL),
mpControlFactory(pControlFactory), mpControlFactory(pControlFactory),
mpClickHandler(new ClickHandler(rClickHandler)),
mbExpansionModeIsToggle(eType!=TitleBar::TBT_CONTROL_TITLE) mbExpansionModeIsToggle(eType!=TitleBar::TBT_CONTROL_TITLE)
{ {
mpControlContainer->AddControl (::std::auto_ptr<TreeNode> ( mpControlContainer->AddControl (::std::auto_ptr<TreeNode> (
@ -410,11 +414,7 @@ IMPL_LINK(TitledControl, WindowEventListener,
switch (pWindowEvent->GetId()) switch (pWindowEvent->GetId())
{ {
case VCLEVENT_WINDOW_MOUSEBUTTONUP: case VCLEVENT_WINDOW_MOUSEBUTTONUP:
// Toggle expansion. (*mpClickHandler)(*this);
GetParentNode()->GetControlContainer().SetExpansionState (
this,
mbExpansionModeIsToggle ? ControlContainer::ES_TOGGLE
: ControlContainer::ES_EXPAND);
break; break;
} }
} }
@ -478,4 +478,24 @@ TitleBar* TitledControl::GetTitleBar (void)
//===== TitledControlStandardClickHandler =====================================
TitledControlStandardClickHandler::TitledControlStandardClickHandler (
ControlContainer& rControlContainer,
ControlContainer::ExpansionState eExpansionState)
: mrControlContainer(rControlContainer),
meExpansionState(eExpansionState)
{
}
void TitledControlStandardClickHandler::operator () (TitledControl& rTitledControl)
{
// Toggle expansion.
mrControlContainer.SetExpansionState (&rTitledControl, meExpansionState);
}
} } // end of namespace ::sd::toolpanel } } // end of namespace ::sd::toolpanel