]> git.eshelyaron.com Git - emacs.git/commitdiff
[TARGET_API_MAC_CARBON] (create_and_show_dialog):
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Mon, 15 Jan 2007 08:35:49 +0000 (08:35 +0000)
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Mon, 15 Jan 2007 08:35:49 +0000 (08:35 +0000)
Create movable modal window instead of movable alert window.
[TARGET_API_MAC_CARBON] (create_and_show_dialog) [!MAC_OSX]: Use
DeactivateControl instead of DisableControl.

src/macmenu.c

index b412429d69662c393753e6f8e8315a8d7d67e45c..1e599c614a62ed6d9dfb63949704b74f7797edfc 100644 (file)
@@ -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];
            }