diff options
| author | YAMAMOTO Mitsuharu | 2007-01-15 08:35:49 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2007-01-15 08:35:49 +0000 |
| commit | 9a5a6add275ef104f6e557005db1214ff6438955 (patch) | |
| tree | 269ef6280b00b43724c1d91971468ec2e15b6333 /src | |
| parent | 025a24b5bcc2c70a28ed208b45cdb7bfc1d6d7a1 (diff) | |
| download | emacs-9a5a6add275ef104f6e557005db1214ff6438955.tar.gz emacs-9a5a6add275ef104f6e557005db1214ff6438955.zip | |
[TARGET_API_MAC_CARBON] (create_and_show_dialog):
Create movable modal window instead of movable alert window.
[TARGET_API_MAC_CARBON] (create_and_show_dialog) [!MAC_OSX]: Use
DeactivateControl instead of DisableControl.
Diffstat (limited to 'src')
| -rw-r--r-- | src/macmenu.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/macmenu.c b/src/macmenu.c index b412429d696..1e599c614a6 100644 --- a/src/macmenu.c +++ b/src/macmenu.c | |||
| @@ -2460,11 +2460,11 @@ create_and_show_dialog (f, first_wv) | |||
| 2460 | SetRect (&empty_rect, 0, 0, 0, 0); | 2460 | SetRect (&empty_rect, 0, 0, 0, 0); |
| 2461 | 2461 | ||
| 2462 | /* Create dialog window. */ | 2462 | /* Create dialog window. */ |
| 2463 | err = CreateNewWindow (kMovableAlertWindowClass, | 2463 | err = CreateNewWindow (kMovableModalWindowClass, |
| 2464 | kWindowStandardHandlerAttribute, | 2464 | kWindowStandardHandlerAttribute, |
| 2465 | &empty_rect, &window); | 2465 | &empty_rect, &window); |
| 2466 | if (err == noErr) | 2466 | if (err == noErr) |
| 2467 | err = SetThemeWindowBackground (window, kThemeBrushAlertBackgroundActive, | 2467 | err = SetThemeWindowBackground (window, kThemeBrushMovableModalBackground, |
| 2468 | true); | 2468 | true); |
| 2469 | if (err == noErr) | 2469 | if (err == noErr) |
| 2470 | err = SetWindowTitleWithCFString (window, (dialog_name[0] == 'Q' | 2470 | err = SetWindowTitleWithCFString (window, (dialog_name[0] == 'Q' |
| @@ -2491,7 +2491,13 @@ create_and_show_dialog (f, first_wv) | |||
| 2491 | if (err == noErr) | 2491 | if (err == noErr) |
| 2492 | { | 2492 | { |
| 2493 | if (!wv->enabled) | 2493 | if (!wv->enabled) |
| 2494 | err = DisableControl (buttons[i]); | 2494 | { |
| 2495 | #ifdef MAC_OSX | ||
| 2496 | err = DisableControl (buttons[i]); | ||
| 2497 | #else | ||
| 2498 | err = DeactivateControl (buttons[i]); | ||
| 2499 | #endif | ||
| 2500 | } | ||
| 2495 | else if (default_button == NULL) | 2501 | else if (default_button == NULL) |
| 2496 | default_button = buttons[i]; | 2502 | default_button = buttons[i]; |
| 2497 | } | 2503 | } |