diff options
| -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; } |