summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basctl/source/basicide/baside3.cxx14
-rw-r--r--cui/source/customize/cfg.cxx8
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx6
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx6
-rw-r--r--include/vcl/btndlg.hxx25
-rw-r--r--sfx2/source/doc/querytemplate.cxx4
-rw-r--r--svx/source/dialog/prtqry.cxx6
-rw-r--r--sw/source/uibase/shells/textsh1.cxx10
-rw-r--r--uui/source/alreadyopen.cxx12
-rw-r--r--uui/source/filechanged.cxx4
-rw-r--r--uui/source/lockfailed.cxx4
-rw-r--r--uui/source/openlocked.cxx6
-rw-r--r--uui/source/trylater.cxx6
-rw-r--r--vcl/source/window/btndlg.cxx26
-rw-r--r--vcl/source/window/msgbox.cxx44
-rw-r--r--vcl/unx/x11/x11sys.cxx2
17 files changed, 97 insertions, 88 deletions
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 1af65b64180b..afaa5e2349f9 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -908,9 +908,9 @@ NameClashQueryBox::NameClashQueryBox( vcl::Window* pParent,
maMessText = rMessage;
AddButton( IDE_RESSTR(RID_STR_DLGIMP_CLASH_RENAME), RET_YES,
- BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );
- AddButton( IDE_RESSTR(RID_STR_DLGIMP_CLASH_REPLACE), RET_NO, 0 );
- AddButton( StandardButtonType::Cancel, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+ ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus );
+ AddButton( IDE_RESSTR(RID_STR_DLGIMP_CLASH_REPLACE), RET_NO );
+ AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
SetImage( QueryBox::GetStandardImage() );
}
@@ -932,10 +932,10 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( vcl::Window* pParent,
maMessText = rMessage;
AddButton( IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_ADD), RET_YES,
- BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );
- AddButton( IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_OMIT), RET_NO, 0 );
- AddButton( StandardButtonType::Cancel, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
- AddButton( StandardButtonType::Help, RET_HELP, BUTTONDIALOG_HELPBUTTON, 4 );
+ ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus );
+ AddButton( IDE_RESSTR(RID_STR_DLGIMP_MISMATCH_OMIT), RET_NO );
+ AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
+ AddButton( StandardButtonType::Help, RET_HELP, ButtonDialogFlags::Help, 4 );
SetImage( QueryBox::GetStandardImage() );
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 998621fec782..aa5bf2a22e54 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -5385,10 +5385,10 @@ MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_R
SetImage( WarningBox::GetStandardImage() );
SetMessText( ReplaceIconName( aMessage ) );
RemoveButton( 1 );
- AddButton( StandardButtonType::Yes, 2, 0 );
- AddButton( CUI_RES( RID_SVXSTR_YESTOALL ), 5, 0 );
- AddButton( StandardButtonType::No, 3, 0 );
- AddButton( StandardButtonType::Cancel, 4, 0 );
+ AddButton( StandardButtonType::Yes, 2);
+ AddButton( CUI_RES( RID_SVXSTR_YESTOALL ), 5);
+ AddButton( StandardButtonType::No, 3);
+ AddButton( StandardButtonType::Cancel, 4);
}
SvxIconReplacementDialog :: SvxIconReplacementDialog(
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 36341e32751f..aa4f5034e90e 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -442,7 +442,7 @@ namespace
OSL_FAIL( "lcl_addButton: invalid button id!" );
break;
}
- _rDialog.AddButton( _eType, nButtonID, _bDefault ? BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON : 0 );
+ _rDialog.AddButton( _eType, nButtonID, _bDefault ? ButtonDialogFlags::Default | ButtonDialogFlags::Focus : ButtonDialogFlags::NONE );
}
}
@@ -593,7 +593,7 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle )
else
{
OSL_ENSURE( WB_OK & _nStyle, "OSQLMessageBox::impl_createStandardButtons: unsupported dialog style requested!" );
- AddButton( StandardButtonType::OK, RET_OK, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON );
+ AddButton( StandardButtonType::OK, RET_OK, ButtonDialogFlags::Default | ButtonDialogFlags::Focus );
}
if ( !m_sHelpURL.isEmpty() )
@@ -635,7 +635,7 @@ void OSQLMessageBox::impl_addDetailsButton()
if ( bMoreDetailsAvailable )
{
- AddButton( StandardButtonType::More, RET_MORE, 0 );
+ AddButton( StandardButtonType::More, RET_MORE);
PushButton* pButton = GetPushButton( RET_MORE );
OSL_ENSURE( pButton, "OSQLMessageBox::impl_addDetailsButton: just added this button, why isn't it there?" );
pButton->SetClickHdl( LINK( this, OSQLMessageBox, ButtonClickHdl ) );
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 397f2a639663..71df15d4e64c 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1289,7 +1289,7 @@ sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _
ScopedVclPtrInstance< OSQLMessageBox > aAsk(_pParent, ModuleRes(_nTitle ), aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query);
if ( _bAll )
{
- aAsk->AddButton(ModuleRes(STR_BUTTON_TEXT_ALL), RET_ALL, 0);
+ aAsk->AddButton(ModuleRes(STR_BUTTON_TEXT_ALL), RET_ALL);
aAsk->GetPushButton(RET_ALL)->SetHelpId(HID_CONFIRM_DROP_BUTTON_ALL);
}
return aAsk->Execute();
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 06f5839c8483..71efb0999d33 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -347,9 +347,9 @@ void ORelationTableView::lookForUiActivities()
ScopedVclPtrInstance< OSQLMessageBox > aDlg(this,ModuleRes(STR_QUERY_REL_EDIT_RELATION),OUString(),0);
aDlg->SetText(sTitle);
aDlg->RemoveButton(aDlg->GetButtonId(0));
- aDlg->AddButton( ModuleRes(STR_QUERY_REL_EDIT), RET_OK, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON);
- aDlg->AddButton( ModuleRes(STR_QUERY_REL_CREATE), RET_YES, 0);
- aDlg->AddButton( StandardButtonType::Cancel,RET_CANCEL,0);
+ aDlg->AddButton( ModuleRes(STR_QUERY_REL_EDIT), RET_OK, ButtonDialogFlags::Default | ButtonDialogFlags::Focus);
+ aDlg->AddButton( ModuleRes(STR_QUERY_REL_CREATE), RET_YES);
+ aDlg->AddButton( StandardButtonType::Cancel,RET_CANCEL);
sal_uInt16 nRet = aDlg->Execute();
if( nRet == RET_CANCEL)
{
diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index db29f241aa74..156a50d416e8 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -23,17 +23,26 @@
#include <boost/ptr_container/ptr_vector.hpp>
#include <vcl/dllapi.h>
#include <vcl/dialog.hxx>
+#include <o3tl/typed_flags_set.hxx>
struct ImplBtnDlgItem;
class PushButton;
#define BUTTONDIALOG_BUTTON_NOTFOUND ((sal_uInt16)0xFFFF)
-#define BUTTONDIALOG_DEFBUTTON ((sal_uInt16)0x0001)
-#define BUTTONDIALOG_OKBUTTON ((sal_uInt16)0x0002)
-#define BUTTONDIALOG_CANCELBUTTON ((sal_uInt16)0x0004)
-#define BUTTONDIALOG_HELPBUTTON ((sal_uInt16)0x0008)
-#define BUTTONDIALOG_FOCUSBUTTON ((sal_uInt16)0x0010)
+enum class ButtonDialogFlags
+{
+ NONE = 0x0000,
+ Default = 0x0001,
+ OK = 0x0002,
+ Cancel = 0x0004,
+ Help = 0x0008,
+ Focus = 0x0010,
+};
+namespace o3tl
+{
+ template<> struct typed_flags<ButtonDialogFlags> : is_typed_flags<ButtonDialogFlags, 0x001f> {};
+}
class VCL_DLLPUBLIC ButtonDialog : public Dialog
{
@@ -52,8 +61,8 @@ public:
sal_uInt16 GetCurButtonId() const { return mnCurButtonId; }
- void AddButton( const OUString& rText, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 );
- void AddButton( StandardButtonType eType, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 );
+ void AddButton( const OUString& rText, sal_uInt16 nId, ButtonDialogFlags nBtnFlags = ButtonDialogFlags::NONE, long nSepPixel = 0 );
+ void AddButton( StandardButtonType eType, sal_uInt16 nId, ButtonDialogFlags nBtnFlags = ButtonDialogFlags::NONE, long nSepPixel = 0 );
void RemoveButton( sal_uInt16 nId );
void Clear();
@@ -87,7 +96,7 @@ private:
Link<> maClickHdl;
SAL_DLLPRIVATE void ImplInitButtonDialogData();
- SAL_DLLPRIVATE PushButton* ImplCreatePushButton( sal_uInt16 nBtnFlags );
+ SAL_DLLPRIVATE PushButton* ImplCreatePushButton( ButtonDialogFlags nBtnFlags );
SAL_DLLPRIVATE ImplBtnDlgItem* ImplGetItem( sal_uInt16 nId ) const;
DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* pBtn );
SAL_DLLPRIVATE void ImplPosControls();
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index 3718e57922af..f61d8069ba3a 100644
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.cxx
@@ -34,8 +34,8 @@ QueryTemplateBox::QueryTemplateBox( vcl::Window* pParent, const OUString& rMessa
SetHelpId( HID_QUERY_LOAD_TEMPLATE );
AddButton( SfxResId( STR_QRYTEMPL_UPDATE_BTN ).toString(), RET_YES,
- BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );
- AddButton( SfxResId(STR_QRYTEMPL_KEEP_BTN).toString(), RET_NO, BUTTONDIALOG_CANCELBUTTON );
+ ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus );
+ AddButton( SfxResId(STR_QRYTEMPL_KEEP_BTN).toString(), RET_NO, ButtonDialogFlags::Cancel );
}
} // end of namespace sfx2
diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx
index 9a6d750f9774..b67d5916473d 100644
--- a/svx/source/dialog/prtqry.cxx
+++ b/svx/source/dialog/prtqry.cxx
@@ -30,10 +30,10 @@ SvxPrtQryBox::SvxPrtQryBox(vcl::Window* pParent) :
SetImage( QueryBox::GetStandardImage() );
AddButton(SVX_RESSTR(RID_SVXSTR_QRY_PRINT_SELECTION), RET_OK,
- BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON);
+ ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus);
- AddButton(SVX_RESSTR(RID_SVXSTR_QRY_PRINT_ALL), 2, 0);
- AddButton(StandardButtonType::Cancel, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON);
+ AddButton(SVX_RESSTR(RID_SVXSTR_QRY_PRINT_ALL), 2);
+ AddButton(StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel);
SetButtonHelpText( RET_OK, OUString() );
}
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 0893c42b2099..6651087ad0cf 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -261,15 +261,15 @@ static short lcl_AskRedlineMode(vcl::Window *pWin)
OUString( SW_RES( STR_REDLINE_TITLE ) ),
OUString( SW_RES( STR_REDLINE_MSG ) ) );
aQBox->SetImage( QueryBox::GetStandardImage() );
- const sal_uInt16 nBtnFlags = BUTTONDIALOG_DEFBUTTON |
- BUTTONDIALOG_OKBUTTON |
- BUTTONDIALOG_FOCUSBUTTON;
+ const ButtonDialogFlags nBtnFlags = ButtonDialogFlags::Default |
+ ButtonDialogFlags::OK |
+ ButtonDialogFlags::Focus;
aQBox->AddButton(OUString(SW_RES(STR_REDLINE_ACCEPT_ALL)), RET_OK, nBtnFlags);
aQBox->GetPushButton( RET_OK )->SetHelpId(HID_AUTOFORMAT_ACCEPT);
- aQBox->AddButton(OUString(SW_RES(STR_REDLINE_REJECT_ALL)), RET_CANCEL, BUTTONDIALOG_CANCELBUTTON);
+ aQBox->AddButton(OUString(SW_RES(STR_REDLINE_REJECT_ALL)), RET_CANCEL, ButtonDialogFlags::Cancel);
aQBox->GetPushButton( RET_CANCEL )->SetHelpId(HID_AUTOFORMAT_REJECT );
- aQBox->AddButton(OUString(SW_RES(STR_REDLINE_EDIT)), 2, 0);
+ aQBox->AddButton(OUString(SW_RES(STR_REDLINE_EDIT)), 2);
aQBox->GetPushButton( 2 )->SetHelpId(HID_AUTOFORMAT_EDIT_CHG);
aQBox->SetButtonHelpText( RET_OK, OUString() );
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index fa83bee182e7..353fa3c7959b 100644
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.cxx
@@ -30,16 +30,16 @@ AlreadyOpenQueryBox::AlreadyOpenQueryBox( vcl::Window* pParent, ResMgr* pResMgr,
if ( bIsStoring )
{
AddButton( ResId(STR_ALREADYOPEN_RETRY_SAVE_BTN, *pResMgr).toString(), RET_YES,
- BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );
- AddButton( ResId(STR_ALREADYOPEN_SAVE_BTN, *pResMgr).toString(), RET_NO, 0 );
- AddButton( StandardButtonType::Cancel, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+ ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus );
+ AddButton( ResId(STR_ALREADYOPEN_SAVE_BTN, *pResMgr).toString(), RET_NO);
+ AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
}
else
{
AddButton( ResId(STR_ALREADYOPEN_READONLY_BTN, *pResMgr).toString(), RET_YES,
- BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );
- AddButton( ResId(STR_ALREADYOPEN_OPEN_BTN, *pResMgr).toString(), RET_NO, 0 );
- AddButton( StandardButtonType::Cancel, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+ ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus );
+ AddButton( ResId(STR_ALREADYOPEN_OPEN_BTN, *pResMgr).toString(), RET_NO);
+ AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
}
SetButtonHelpText( RET_YES, OUString() );
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 9b9946cf734f..33b5dee6b777 100644
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
@@ -28,8 +28,8 @@ FileChangedQueryBox::FileChangedQueryBox( vcl::Window* pParent, ResMgr* pResMgr
SetImage( QueryBox::GetStandardImage() );
AddButton(ResId(STR_FILECHANGED_SAVEANYWAY_BTN, *pResMgr).toString(), RET_YES,
- BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON);
- AddButton( StandardButtonType::Cancel, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+ ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus);
+ AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
SetButtonHelpText( RET_YES, OUString() );
SetMessText(ResId(STR_FILECHANGED_MSG, *pResMgr).toString());
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index 875add53d5c3..77ceb7e8d625 100644
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.cxx
@@ -29,8 +29,8 @@ LockFailedQueryBox::LockFailedQueryBox( vcl::Window* pParent, ResMgr* pResMgr )
{
SetImage( ErrorBox::GetStandardImage() );
- AddButton( StandardButtonType::OK, RET_OK, BUTTONDIALOG_OKBUTTON );
- AddButton( StandardButtonType::Cancel, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+ AddButton( StandardButtonType::OK, RET_OK, ButtonDialogFlags::OK );
+ AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
SetMessText(ResId(STR_LOCKFAILED_MSG, *pResMgr ).toString());
SetCheckBoxText(ResId(STR_LOCKFAILED_DONTSHOWAGAIN, *pResMgr).toString());
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index ca6883e3fdc7..acb19a61171d 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -28,11 +28,11 @@ OpenLockedQueryBox::OpenLockedQueryBox( vcl::Window* pParent, ResMgr* pResMgr, c
SetImage( QueryBox::GetStandardImage() );
AddButton(ResId(STR_OPENLOCKED_OPENREADONLY_BTN, *pResMgr).toString(), RET_YES,
- BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON);
+ ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus);
- AddButton(ResId(STR_OPENLOCKED_OPENCOPY_BTN, *pResMgr).toString(), RET_NO, 0);
+ AddButton(ResId(STR_OPENLOCKED_OPENCOPY_BTN, *pResMgr).toString(), RET_NO);
- AddButton( StandardButtonType::Cancel, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+ AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
SetButtonHelpText( RET_YES, OUString() );
SetButtonHelpText( RET_NO, OUString() );
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index 3f5719f3c29d..90688a95e2a3 100644
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.cxx
@@ -28,9 +28,9 @@ TryLaterQueryBox::TryLaterQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const
SetImage( QueryBox::GetStandardImage() );
AddButton(ResId(STR_TRYLATER_RETRYSAVING_BTN, *pResMgr).toString(), RET_YES,
- BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON);
- AddButton(ResId(STR_TRYLATER_SAVEAS_BTN, *pResMgr).toString(), RET_NO, 0);
- AddButton( StandardButtonType::Cancel, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
+ ButtonDialogFlags::Default | ButtonDialogFlags::OK | ButtonDialogFlags::Focus);
+ AddButton(ResId(STR_TRYLATER_SAVEAS_BTN, *pResMgr).toString(), RET_NO);
+ AddButton( StandardButtonType::Cancel, RET_CANCEL, ButtonDialogFlags::Cancel );
SetButtonHelpText( RET_YES, OUString() );
SetButtonHelpText( RET_NO, OUString() );
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 7846e41828e8..bb0f0a35f600 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -73,23 +73,23 @@ void ButtonDialog::dispose()
Dialog::dispose();
}
-PushButton* ButtonDialog::ImplCreatePushButton( sal_uInt16 nBtnFlags )
+PushButton* ButtonDialog::ImplCreatePushButton( ButtonDialogFlags nBtnFlags )
{
PushButton* pBtn;
WinBits nStyle = 0;
- if ( nBtnFlags & BUTTONDIALOG_DEFBUTTON )
+ if ( nBtnFlags & ButtonDialogFlags::Default )
nStyle |= WB_DEFBUTTON;
- if ( nBtnFlags & BUTTONDIALOG_CANCELBUTTON )
+ if ( nBtnFlags & ButtonDialogFlags::Cancel )
pBtn = VclPtr<CancelButton>::Create( this, nStyle );
- else if ( nBtnFlags & BUTTONDIALOG_OKBUTTON )
+ else if ( nBtnFlags & ButtonDialogFlags::OK )
pBtn = VclPtr<OKButton>::Create( this, nStyle );
- else if ( nBtnFlags & BUTTONDIALOG_HELPBUTTON )
+ else if ( nBtnFlags & ButtonDialogFlags::Help )
pBtn = VclPtr<HelpButton>::Create( this, nStyle );
else
pBtn = VclPtr<PushButton>::Create( this, nStyle );
- if ( !(nBtnFlags & BUTTONDIALOG_HELPBUTTON) )
+ if ( !(nBtnFlags & ButtonDialogFlags::Help) )
pBtn->SetClickHdl( LINK( this, ButtonDialog, ImplClickHdl ) );
return pBtn;
@@ -274,7 +274,7 @@ void ButtonDialog::Click()
}
void ButtonDialog::AddButton( const OUString& rText, sal_uInt16 nId,
- sal_uInt16 nBtnFlags, long nSepPixel )
+ ButtonDialogFlags nBtnFlags, long nSepPixel )
{
// PageItem anlegen
ImplBtnDlgItem* pItem = new ImplBtnDlgItem;
@@ -288,14 +288,14 @@ void ButtonDialog::AddButton( const OUString& rText, sal_uInt16 nId,
maItemList.push_back(pItem);
- if ( nBtnFlags & BUTTONDIALOG_FOCUSBUTTON )
+ if ( nBtnFlags & ButtonDialogFlags::Focus )
mnFocusButtonId = nId;
mbFormat = true;
}
void ButtonDialog::AddButton( StandardButtonType eType, sal_uInt16 nId,
- sal_uInt16 nBtnFlags, long nSepPixel )
+ ButtonDialogFlags nBtnFlags, long nSepPixel )
{
// PageItem anlegen
ImplBtnDlgItem* pItem = new ImplBtnDlgItem;
@@ -304,11 +304,11 @@ void ButtonDialog::AddButton( StandardButtonType eType, sal_uInt16 nId,
pItem->mnSepSize = nSepPixel;
if ( eType == StandardButtonType::OK )
- nBtnFlags |= BUTTONDIALOG_OKBUTTON;
+ nBtnFlags |= ButtonDialogFlags::OK;
else if ( eType == StandardButtonType::Help )
- nBtnFlags |= BUTTONDIALOG_HELPBUTTON;
+ nBtnFlags |= ButtonDialogFlags::Help;
else if ( (eType == StandardButtonType::Cancel) || (eType == StandardButtonType::Close) )
- nBtnFlags |= BUTTONDIALOG_CANCELBUTTON;
+ nBtnFlags |= ButtonDialogFlags::Cancel;
pItem->mpPushButton = ImplCreatePushButton( nBtnFlags );
// Standard-Buttons have the right text already
@@ -319,7 +319,7 @@ void ButtonDialog::AddButton( StandardButtonType eType, sal_uInt16 nId,
pItem->mpPushButton->SetText( Button::GetStandardText( eType ) );
}
- if ( nBtnFlags & BUTTONDIALOG_FOCUSBUTTON )
+ if ( nBtnFlags & ButtonDialogFlags::Focus )
mnFocusButtonId = nId;
maItemList.push_back(pItem);
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 8ddba996b1a3..0e7e08878184 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -62,18 +62,18 @@ void MessBox::ImplInitMessBoxData()
void MessBox::ImplInitButtons()
{
WinBits nStyle = GetStyle();
- sal_uInt16 nOKFlags = BUTTONDIALOG_OKBUTTON;
- sal_uInt16 nCancelFlags = BUTTONDIALOG_CANCELBUTTON;
- sal_uInt16 nRetryFlags = 0;
- sal_uInt16 nYesFlags = 0;
- sal_uInt16 nNoFlags = 0;
+ ButtonDialogFlags nOKFlags = ButtonDialogFlags::OK;
+ ButtonDialogFlags nCancelFlags = ButtonDialogFlags::Cancel;
+ ButtonDialogFlags nRetryFlags = ButtonDialogFlags::NONE;
+ ButtonDialogFlags nYesFlags = ButtonDialogFlags::NONE;
+ ButtonDialogFlags nNoFlags = ButtonDialogFlags::NONE;
if ( nStyle & WB_OK_CANCEL )
{
if ( nStyle & WB_DEF_CANCEL )
- nCancelFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
+ nCancelFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
else // WB_DEF_OK
- nOKFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
+ nOKFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
AddButton( StandardButtonType::OK, RET_OK, nOKFlags );
AddButton( StandardButtonType::Cancel, RET_CANCEL, nCancelFlags );
@@ -81,10 +81,10 @@ void MessBox::ImplInitButtons()
else if ( nStyle & WB_YES_NO )
{
if ( nStyle & WB_DEF_YES )
- nYesFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
+ nYesFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
else // WB_DEF_NO
- nNoFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
- nNoFlags |= BUTTONDIALOG_CANCELBUTTON;
+ nNoFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
+ nNoFlags |= ButtonDialogFlags::Cancel;
AddButton( StandardButtonType::Yes, RET_YES, nYesFlags );
AddButton( StandardButtonType::No, RET_NO, nNoFlags );
@@ -92,11 +92,11 @@ void MessBox::ImplInitButtons()
else if ( nStyle & WB_YES_NO_CANCEL )
{
if ( nStyle & WB_DEF_YES )
- nYesFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
+ nYesFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
else if ( nStyle & WB_DEF_NO )
- nNoFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
+ nNoFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
else
- nCancelFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
+ nCancelFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
AddButton( StandardButtonType::Yes, RET_YES, nYesFlags );
AddButton( StandardButtonType::No, RET_NO, nNoFlags );
@@ -105,24 +105,24 @@ void MessBox::ImplInitButtons()
else if ( nStyle & WB_RETRY_CANCEL )
{
if ( nStyle & WB_DEF_CANCEL )
- nCancelFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
+ nCancelFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
else // WB_DEF_RETRY
- nRetryFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
+ nRetryFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
AddButton( StandardButtonType::Retry, RET_RETRY, nRetryFlags );
AddButton( StandardButtonType::Cancel, RET_CANCEL, nCancelFlags );
}
else if ( nStyle & WB_ABORT_RETRY_IGNORE )
{
- sal_uInt16 nAbortFlags = 0;
- sal_uInt16 nIgnoreFlags = 0;
+ ButtonDialogFlags nAbortFlags = ButtonDialogFlags::NONE;
+ ButtonDialogFlags nIgnoreFlags = ButtonDialogFlags::NONE;
if ( nStyle & WB_DEF_CANCEL )
- nAbortFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
+ nAbortFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
else if ( nStyle & WB_DEF_RETRY )
- nRetryFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
+ nRetryFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
else if ( nStyle & WB_DEF_IGNORE )
- nIgnoreFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
+ nIgnoreFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
AddButton( StandardButtonType::Abort, RET_CANCEL, nAbortFlags );
AddButton( StandardButtonType::Retry, RET_RETRY, nRetryFlags );
@@ -130,7 +130,7 @@ void MessBox::ImplInitButtons()
}
else if ( nStyle & WB_OK )
{
- nOKFlags |= BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON;
+ nOKFlags |= ButtonDialogFlags::Default | ButtonDialogFlags::Focus;
AddButton( StandardButtonType::OK, RET_OK, nOKFlags );
}
@@ -168,7 +168,7 @@ void MessBox::ImplPosControls()
{
if ( !mbHelpBtn )
{
- AddButton( StandardButtonType::Help, RET_HELP, BUTTONDIALOG_HELPBUTTON, 3 );
+ AddButton( StandardButtonType::Help, RET_HELP, ButtonDialogFlags::Help, 3 );
mbHelpBtn = true;
}
}
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx
index 6723c63b8047..e3eb453fcb37 100644
--- a/vcl/unx/x11/x11sys.cxx
+++ b/vcl/unx/x11/x11sys.cxx
@@ -141,7 +141,7 @@ int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMes
sal_uInt16 nButton = 0;
for( std::list< OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it )
{
- aWarn->AddButton( *it, nButton+1, nButton == (sal_uInt16)nDefButton ? BUTTONDIALOG_DEFBUTTON : 0 );
+ aWarn->AddButton( *it, nButton+1, nButton == (sal_uInt16)nDefButton ? ButtonDialogFlags::Default : ButtonDialogFlags::NONE );
nButton++;
}
aWarn->SetFocusButton( (sal_uInt16)nDefButton+1 );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 17:31:04 +0000