(no commit message)

[imagemagick] / MagickCore / widget.c

diff --git a/MagickCore/widget.c b/MagickCore/widget.c
index 052ea049d1706076c11ec693d45603b99a3a7185..cd77001808afef9a4d5ef36b266b36eca0acbe76 100644 (file)
--- a/MagickCore/widget.c
+++ b/MagickCore/widget.c
@@ -14,11 +14,11 @@
 %                   MagickCore X11 User Interface Methods                     %
 %                                                                             %
 %                              Software Design                                %
-%                                John Cristy                                  %
+%                                   Cristy                                    %
 %                              September 1993                                 %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -1788,6 +1788,7 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows,
   /*
     Respond to X events.
   */
+  XGetWidgetInfo((char *) NULL,&mode_info);
   XGetWidgetInfo((char *) NULL,&slider_info);
   XGetWidgetInfo((char *) NULL,&north_info);
   XGetWidgetInfo((char *) NULL,&south_info);
@@ -2253,8 +2254,9 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows,
             /*
               User pressed mode button.
             */
-            (void) CopyMagickString(reply_info.text,mode_info.text,
-              MaxTextExtent);
+            if (mode_info.text != (char *) NULL)
+              (void) CopyMagickString(reply_info.text,mode_info.text,
+                MaxTextExtent);
             (void) CopyMagickString(primary_selection,reply_info.text,
               MaxTextExtent);
             (void) XSetSelectionOwner(display,XA_PRIMARY,windows->widget.id,
@@ -2997,7 +2999,7 @@ MagickPrivate int XCommandWidget(Display *display,XWindows *windows,
         sizeof(*selection_info));
       if (selection_info == (XWidgetInfo *) NULL)
         {
-          ThrowXWindowFatalException(ResourceLimitError,
+          ThrowXWindowFatalException(ResourceLimitFatalError,
             "MemoryAllocationFailed","...");
           return(id);
         }
@@ -3589,7 +3591,7 @@ MagickPrivate int XConfirmWidget(Display *display,XWindows *windows,
             /*
               Dismiss button status changed.
             */
-            dismiss_info.raised=cancel_info.raised == MagickFalse ?
+            dismiss_info.raised=dismiss_info.raised == MagickFalse ?
               MagickTrue : MagickFalse;
             XDrawBeveledButton(display,&windows->widget,&dismiss_info);
             break;