mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add an explicit Cancel handler

Browse Source
This commit is contained in:
Caolán McNamara
2012-03-09 09:16:47 +00:00
parent 809e3017d1
commit fd468f7c92
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cui/source/dialogs/about.cxx
View File

@@ -163,6 +163,8 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
aFeaturesLink.SetBackground(); aFeaturesLink.SetBackground();
aFeaturesLink.SetClickHdl( LINK( this, AboutDialog, HandleHyperlink ) ); aFeaturesLink.SetClickHdl( LINK( this, AboutDialog, HandleHyperlink ) );
aCancelButton.SetClickHdl( LINK( this, AboutDialog, CancelHdl ) );
Color aTextColor( rSettings.GetWindowTextColor() ); Color aTextColor( rSettings.GetWindowTextColor() );
aVersionText.SetControlForeground( aTextColor ); aVersionText.SetControlForeground( aTextColor );
aCopyrightText.SetControlForeground( aTextColor ); aCopyrightText.SetControlForeground( aTextColor );
@@ -288,6 +290,13 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
SetHelpId( CMD_SID_ABOUT ); SetHelpId( CMD_SID_ABOUT );
} }
//-----------------------------------------------------------------------
IMPL_LINK_NOARG(AboutDialog, CancelHdl)
{
Close();
return 0;
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
IMPL_LINK( AboutDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink ) IMPL_LINK( AboutDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink )

3
cui/source/inc/about.hxx
View File

@@ -72,7 +72,8 @@ protected:
public: public:
AboutDialog( Window* pParent, const ResId& rId); AboutDialog( Window* pParent, const ResId& rId);
DECL_LINK( HandleHyperlink, svt::FixedHyperlink * ); DECL_LINK(CancelHdl, void *);
DECL_LINK(HandleHyperlink, svt::FixedHyperlink *);
}; };
#endif // #ifndef _ABOUT_HXX #endif // #ifndef _ABOUT_HXX