summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx10
-rw-r--r--dbaccess/source/ui/dlg/generalpage.hxx2
-rw-r--r--sc/source/ui/dbgui/dpgroupdlg.cxx17
-rw-r--r--sc/source/ui/inc/dpgroupdlg.hxx2
-rw-r--r--sd/source/ui/dlg/animobjs.cxx6
-rw-r--r--sd/source/ui/inc/animobjs.hxx2
6 files changed, 22 insertions, 17 deletions
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 5de35c10c539..f9a8ebb4902c 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -484,9 +484,9 @@ namespace dbaui
// do some knittings
m_xEmbeddedDBType->connect_changed(LINK(this, OGeneralPageWizard, OnEmbeddedDBTypeSelected));
- m_xRB_CreateDatabase->connect_clicked( LINK( this, OGeneralPageWizard, OnSetupModeSelected ) );
- m_xRB_ConnectDatabase->connect_clicked( LINK( this, OGeneralPageWizard, OnSetupModeSelected ) );
- m_xRB_OpenExistingDatabase->connect_clicked( LINK( this, OGeneralPageWizard, OnSetupModeSelected ) );
+ m_xRB_CreateDatabase->connect_toggled( LINK( this, OGeneralPageWizard, OnSetupModeSelected ) );
+ m_xRB_ConnectDatabase->connect_toggled( LINK( this, OGeneralPageWizard, OnSetupModeSelected ) );
+ m_xRB_OpenExistingDatabase->connect_toggled( LINK( this, OGeneralPageWizard, OnSetupModeSelected ) );
m_xLB_DocumentList->connect_changed( LINK( this, OGeneralPageWizard, OnDocumentSelected ) );
m_xPB_OpenDatabase->connect_clicked( LINK( this, OGeneralPageWizard, OnOpenDocument ) );
m_xFT_NoEmbeddedDBLabel->hide();
@@ -647,8 +647,10 @@ namespace dbaui
EnableControls();
}
- IMPL_LINK_NOARG( OGeneralPageWizard, OnSetupModeSelected, weld::Button&, void )
+ IMPL_LINK(OGeneralPageWizard, OnSetupModeSelected, weld::ToggleButton&, rButton, void)
{
+ if (!rButton.get_active())
+ return;
SetupModeSelected();
}
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 810fd44d0682..461161195eef 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -179,7 +179,7 @@ namespace dbaui
void SetupModeSelected();
DECL_LINK( OnEmbeddedDBTypeSelected, weld::ComboBox&, void );
- DECL_LINK( OnSetupModeSelected, weld::Button&, void );
+ DECL_LINK( OnSetupModeSelected, weld::ToggleButton&, void );
DECL_LINK( OnDocumentSelected, weld::ComboBox&, void );
DECL_LINK( OnOpenDocument, weld::Button&, void );
};
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 64d61e55bbab..f86199f1acc2 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -61,8 +61,8 @@ ScDPGroupEditHelper::ScDPGroupEditHelper(weld::RadioButton& rRbAuto, weld::Radio
, mrRbMan(rRbMan)
, mrEdValue(rEdValue)
{
- mrRbAuto.connect_clicked( LINK( this, ScDPGroupEditHelper, ClickHdl ) );
- mrRbMan.connect_clicked( LINK( this, ScDPGroupEditHelper, ClickHdl ) );
+ mrRbAuto.connect_toggled( LINK( this, ScDPGroupEditHelper, ToggleHdl ) );
+ mrRbMan.connect_toggled( LINK( this, ScDPGroupEditHelper, ToggleHdl ) );
}
bool ScDPGroupEditHelper::IsAuto() const
@@ -83,24 +83,27 @@ void ScDPGroupEditHelper::SetValue( bool bAuto, double fValue )
if( bAuto )
{
mrRbAuto.set_active(true);
- ClickHdl(mrRbAuto);
+ ToggleHdl(mrRbAuto);
}
else
{
mrRbMan.set_active(true);
- ClickHdl(mrRbMan);
+ ToggleHdl(mrRbMan);
}
ImplSetValue( fValue );
}
-IMPL_LINK(ScDPGroupEditHelper, ClickHdl, weld::Button&, rButton, void)
+IMPL_LINK(ScDPGroupEditHelper, ToggleHdl, weld::ToggleButton&, rButton, void)
{
- if (&rButton == &mrRbAuto)
+ if (!rButton.get_active())
+ return;
+
+ if (mrRbAuto.get_active())
{
// disable edit field on clicking "automatic" radio button
mrEdValue.set_sensitive(false);
}
- else if (&rButton == &mrRbMan)
+ else if (mrRbMan.get_active())
{
// enable and set focus to edit field on clicking "manual" radio button
mrEdValue.set_sensitive(true);
diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx
index 79bbe7dccbd3..c0c19b8a9558 100644
--- a/sc/source/ui/inc/dpgroupdlg.hxx
+++ b/sc/source/ui/inc/dpgroupdlg.hxx
@@ -43,7 +43,7 @@ private:
virtual bool ImplGetValue( double& rfValue ) const = 0;
virtual void ImplSetValue( double fValue ) = 0;
- DECL_LINK(ClickHdl, weld::Button&, void);
+ DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
private:
weld::RadioButton& mrRbAuto;
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 2ab345103a52..e6ccdfa8b083 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -174,8 +174,8 @@ AnimationWindow::AnimationWindow(SfxBindings* pInBindings, SfxChildWindow *pCW,
m_xBtnRemoveBitmap->connect_clicked( LINK( this, AnimationWindow, ClickRemoveBitmapHdl ) );
m_xBtnRemoveAll->connect_clicked( LINK( this, AnimationWindow, ClickRemoveBitmapHdl ) );
- m_xRbtGroup->connect_clicked( LINK( this, AnimationWindow, ClickRbtHdl ) );
- m_xRbtBitmap->connect_clicked( LINK( this, AnimationWindow, ClickRbtHdl ) );
+ m_xRbtGroup->connect_toggled( LINK( this, AnimationWindow, ClickRbtHdl ) );
+ m_xRbtBitmap->connect_toggled( LINK( this, AnimationWindow, ClickRbtHdl ) );
m_xBtnCreateGroup->connect_clicked( LINK( this, AnimationWindow, ClickCreateGroupHdl ) );
m_xBtnHelp->connect_clicked( LINK( this, AnimationWindow, ClickHelpHdl ) );
m_xNumFldBitmap->connect_value_changed( LINK( this, AnimationWindow, ModifyBitmapHdl ) );
@@ -361,7 +361,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl, weld::Button&, void)
UpdateControl();
}
-IMPL_LINK_NOARG(AnimationWindow, ClickRbtHdl, weld::Button&, void)
+IMPL_LINK_NOARG(AnimationWindow, ClickRbtHdl, weld::ToggleButton&, void)
{
if (m_FrameList.empty() || m_xRbtGroup->get_active())
{
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index eca904e55283..2588e4cd31a9 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -129,7 +129,7 @@ private:
DECL_LINK( ClickLastHdl, weld::Button&, void );
DECL_LINK( ClickGetObjectHdl, weld::Button&, void );
DECL_LINK( ClickRemoveBitmapHdl, weld::Button&, void );
- DECL_LINK( ClickRbtHdl, weld::Button&, void );
+ DECL_LINK( ClickRbtHdl, weld::ToggleButton&, void );
DECL_LINK( ClickHelpHdl, weld::Button&, void );
DECL_LINK( ClickCreateGroupHdl, weld::Button&, void );
DECL_LINK( ModifyBitmapHdl, weld::SpinButton&, void );
generated by cgit (git 2.34.1) at 2025-01-24 11:19:41 +0000