From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 15 Jan 2007 08:35:49 +0000 (+0000)
Subject: [TARGET_API_MAC_CARBON] (create_and_show_dialog):
X-Git-Tag: emacs-pretest-22.0.93~135
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a5a6add275ef104f6e557005db1214ff6438955;p=emacs.git

[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.
---

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)
   SetRect (&empty_rect, 0, 0, 0, 0);
 
   /* Create dialog window.  */
-  err = CreateNewWindow (kMovableAlertWindowClass,
+  err = CreateNewWindow (kMovableModalWindowClass,
 			 kWindowStandardHandlerAttribute,
 			 &empty_rect, &window);
   if (err == noErr)
-    err = SetThemeWindowBackground (window, kThemeBrushAlertBackgroundActive,
+    err = SetThemeWindowBackground (window, kThemeBrushMovableModalBackground,
 				    true);
   if (err == noErr)
     err = SetWindowTitleWithCFString (window, (dialog_name[0] == 'Q'
@@ -2491,7 +2491,13 @@ create_and_show_dialog (f, first_wv)
 	  if (err == noErr)
 	    {
 	      if (!wv->enabled)
-		err = DisableControl (buttons[i]);
+		{
+#ifdef MAC_OSX
+		  err = DisableControl (buttons[i]);
+#else
+		  err = DeactivateControl (buttons[i]);
+#endif
+		}
 	      else if (default_button == NULL)
 		default_button = buttons[i];
 	    }