diff options
| author | culler <culler> | 2018-08-18 21:22:40 (GMT) |
|---|---|---|
| committer | culler <culler> | 2018-08-18 21:22:40 (GMT) |
| commit | 818f0229adfce8e7d51b97ec1663174ead547aab (patch) | |
| tree | bd064c5f3990b67ed114e90299685755b1f878ce /macosx | |
| parent | 35d97ae85b24bae1ad81598a36d0fd3721e196a8 (diff) | |
| parent | a56ebfbce55408f33a4b635507c6b92b44a9acbc (diff) | |
| download | tk-818f0229adfce8e7d51b97ec1663174ead547aab.zip tk-818f0229adfce8e7d51b97ec1663174ead547aab.tar.gz tk-818f0229adfce8e7d51b97ec1663174ead547aab.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXDialog.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index 97d4018..65e06a6 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", "no", "yes", NULL + "abort", "retry", "ignore", "ok", "cancel", "yes", "no", NULL }; static const NSString *const alertButtonNames[][3] = { diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index b90e75c..a0fda96 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -236,11 +236,13 @@ static int windowHashInit = false; { NSRect currentFrame = [sender frame]; TkWindow *winPtr = TkMacOSXGetTkWindow(sender); - if (winPtr->wmInfoPtr->flags & WM_WIDTH_NOT_RESIZABLE) { - frameSize.width = currentFrame.size.width; - } - if (winPtr->wmInfoPtr->flags & WM_HEIGHT_NOT_RESIZABLE) { - frameSize.height = currentFrame.size.height; + if (winPtr) { + if (winPtr->wmInfoPtr->flags & WM_WIDTH_NOT_RESIZABLE) { + frameSize.width = currentFrame.size.width; + } + if (winPtr->wmInfoPtr->flags & WM_HEIGHT_NOT_RESIZABLE) { + frameSize.height = currentFrame.size.height; + } } return frameSize; } |