diff options
author | fvogel <fvogelnew1@free.fr> | 2018-08-21 19:05:56 (GMT) |
---|---|---|
committer | fvogel <fvogelnew1@free.fr> | 2018-08-21 19:05:56 (GMT) |
commit | e95540bc2c71f1f44d7add8267221cf34ff9d40a (patch) | |
tree | 6e8e32fd3503ce77445b700dc6c502816d8c2ded /macosx/tkMacOSXDialog.c | |
parent | a56ebfbce55408f33a4b635507c6b92b44a9acbc (diff) | |
parent | 64597f93ed7a8acc50a1ea7685fef6c3cb45c916 (diff) | |
download | tk-e95540bc2c71f1f44d7add8267221cf34ff9d40a.zip tk-e95540bc2c71f1f44d7add8267221cf34ff9d40a.tar.gz tk-e95540bc2c71f1f44d7add8267221cf34ff9d40a.tar.bz2 |
Fix [66db98f30d] regarding error messages spit by messageboxes in the test suite, while still not regress as described in [98dce84781] (yes and no answers were swapped)
Diffstat (limited to 'macosx/tkMacOSXDialog.c')
-rw-r--r-- | macosx/tkMacOSXDialog.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index 65e06a6..8d20d4e 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -117,7 +117,7 @@ enum alertIconOptions { ICON_ERROR, ICON_INFO, ICON_QUESTION, ICON_WARNING }; static const char *const alertButtonStrings[] = { - "abort", "retry", "ignore", "ok", "cancel", "yes", "no", NULL + "abort", "retry", "ignore", "ok", "cancel", "no", "yes", NULL }; static const NSString *const alertButtonNames[][3] = { @@ -147,8 +147,8 @@ static const short alertButtonIndexAndTypeToNativeButtonIndex[][7] = { [TYPE_OK] = {0, 0, 0, 1, 0, 0, 0}, [TYPE_OKCANCEL] = {0, 0, 0, 1, 2, 0, 0}, [TYPE_RETRYCANCEL] = {0, 1, 0, 0, 2, 0, 0}, - [TYPE_YESNO] = {0, 0, 0, 0, 0, 1, 2}, - [TYPE_YESNOCANCEL] = {0, 0, 0, 0, 3, 1, 2}, + [TYPE_YESNO] = {0, 0, 0, 0, 0, 2, 1}, + [TYPE_YESNOCANCEL] = {0, 0, 0, 0, 3, 2, 1}, }; /* @@ -161,8 +161,8 @@ static const short alertNativeButtonIndexAndTypeToButtonIndex[][3] = { [TYPE_OK] = {3, 0, 0}, [TYPE_OKCANCEL] = {3, 4, 0}, [TYPE_RETRYCANCEL] = {1, 4, 0}, - [TYPE_YESNO] = {5, 6, 0}, - [TYPE_YESNOCANCEL] = {5, 6, 4}, + [TYPE_YESNO] = {6, 5, 0}, + [TYPE_YESNOCANCEL] = {6, 5, 4}, }; /* |