Changed two conflicting defines in defs.h

[wxWidgets.git] / src / motif / utils.cpp

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 65d6c32becad7c80410e643bd4a7c30697efdcad..094a3e869901d2e55565652c89950ef378f57a2d 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -75,7 +75,7 @@ void wxFlushEvents()
     Display *display = (Display*) wxGetDisplay();
 
     XSync (display, FALSE);
-    XEvent event;
+
     // XtAppPending returns availability of events AND timers/inputs, which
     // are processed via callbacks, so XtAppNextEvent will not return if
     // there are no events. So added '& XtIMXEvent' - Sergey.
@@ -725,8 +725,12 @@ char wxFindMnemonic (const char *s)
     return mnem;
 }
 
-char * wxFindAccelerator (char *s)
+char * wxFindAccelerator (const char *s)
 {
+    // VZ: this function returns incorrect keysym which completely breaks kbd
+    //     handling
+    return NULL;
+
     // The accelerator text is after the \t char.
     while (*s && *s != '\t')
         s++;
@@ -748,7 +752,7 @@ char * wxFindAccelerator (char *s)
     wxBuffer[0] = '\0';
     char *tmp = copystring (s);
     s = tmp;
-    char *p = s;
+    char *p = tmp;
 
     while (1)
     {
@@ -763,8 +767,7 @@ char * wxFindAccelerator (char *s)
                 strcat (wxBuffer, s);
             else
                 strcat (wxBuffer, "Meta");
-            s = p + 1;
-            p = s;
+            s = p++;
         }
         else
         {
@@ -777,15 +780,19 @@ char * wxFindAccelerator (char *s)
     return wxBuffer;
 }
 
-XmString wxFindAcceleratorText (char *s)
+XmString wxFindAcceleratorText (const char *s)
 {
+    // VZ: this function returns incorrect keysym which completely breaks kbd
+    //     handling
+    return NULL;
+
     // The accelerator text is after the \t char.
     while (*s && *s != '\t')
         s++;
     if (*s == '\0')
         return (NULL);
     s++;
-    XmString text = XmStringCreateSimple (s);
+    XmString text = XmStringCreateSimple ((char *)s);
     return text;
 }
 
@@ -1127,8 +1134,11 @@ void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
     xc -> green = color_defs[pixel].green;
     xc -> blue = color_defs[pixel].blue;
     xc -> flags = DoRed | DoGreen | DoBlue;
+    
+/*  FIXME, TODO
     if (!XAllocColor(d,cmp,xc))
         cout << "wxAllocNearestColor : Warning : Cannot find nearest color !\n";
+*/
 
     delete[] color_defs;
 }