wxMotif compiles (and runs minimal sample) again after wxMenu changes

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index e4cdc74fea9b6ffcfc091da98a6238d1b9ba31d2..082d3285be2c52986726704397207cf96978cc6f 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -123,7 +123,7 @@ bool wxCheckForInterrupt(wxWindow *wnd)
 // wxExecute stuff
 // ----------------------------------------------------------------------------
 
 // wxExecute stuff
 // ----------------------------------------------------------------------------
 

-static void xt_notify_end_process(XtPointer data, int *fid,
+static void xt_notify_end_process(XtPointer data, int *WXUNUSED(fid),

                                   XtInputId *id)
 {
     wxEndProcessData *proc_data = (wxEndProcessData *)data;
                                   XtInputId *id)
 {
     wxEndProcessData *proc_data = (wxEndProcessData *)data;


@@ -727,6 +727,10 @@ char wxFindMnemonic (const char *s)
 
 char * wxFindAccelerator (const 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++;
     // The accelerator text is after the \t char.
     while (*s && *s != '\t')
         s++;


@@ -778,6 +782,10 @@ char * wxFindAccelerator (const char *s)
 
 XmString wxFindAcceleratorText (const 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++;
     // The accelerator text is after the \t char.
     while (*s && *s != '\t')
         s++;


@@ -1040,7 +1048,7 @@ void wxHSVToXColor(wxHSV *hsv,XColor *rgb)
     int h = hsv->h;
     int s = hsv->s;
     int v = hsv->v;
     int h = hsv->h;
     int s = hsv->s;
     int v = hsv->v;

-    int r, g, b;
+    int r = 0, g = 0, b = 0;

     int i, f;
     int p, q, t;
     s = (s * wxMAX_RGB) / wxMAX_SV;
     int i, f;
     int p, q, t;
     s = (s * wxMAX_RGB) / wxMAX_SV;


@@ -1073,14 +1081,14 @@ void wxXColorToHSV(wxHSV *hsv,XColor *rgb)
     int b = rgb->blue >> 8;
     int maxv = wxMax3(r, g, b);
     int minv = wxMin3(r, g, b);
     int b = rgb->blue >> 8;
     int maxv = wxMax3(r, g, b);
     int minv = wxMin3(r, g, b);

-    int h, s, v;
+    int h = 0, s, v;

     v = maxv;
     if (maxv) s = (maxv - minv) * wxMAX_RGB / maxv;
     else s = 0;
     if (s == 0) h = 0;
     else
     {
     v = maxv;
     if (maxv) s = (maxv - minv) * wxMAX_RGB / maxv;
     else s = 0;
     if (s == 0) h = 0;
     else
     {

-        int rc, gc, bc, hex;
+        int rc, gc, bc, hex = 0;

         rc = (maxv - r) * wxMAX_RGB / (maxv - minv);
         gc = (maxv - g) * wxMAX_RGB / (maxv - minv);
         bc = (maxv - b) * wxMAX_RGB / (maxv - minv);
         rc = (maxv - r) * wxMAX_RGB / (maxv - minv);
         gc = (maxv - g) * wxMAX_RGB / (maxv - minv);
         bc = (maxv - b) * wxMAX_RGB / (maxv - minv);


@@ -1109,7 +1117,7 @@ void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
     wxHSV hsv_defs, hsv;
     wxXColorToHSV(&hsv,xc);
 
     wxHSV hsv_defs, hsv;
     wxXColorToHSV(&hsv,xc);
 

-    int diff, min_diff, pixel = 0;
+    int diff, min_diff = 0, pixel = 0;

 
     for(llp = 0;llp < num_colors;llp++)
     {
 
     for(llp = 0;llp < num_colors;llp++)
     {


@@ -1126,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;
     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";
     if (!XAllocColor(d,cmp,xc))
         cout << "wxAllocNearestColor : Warning : Cannot find nearest color !\n";

+*/

 
     delete[] color_defs;
 }
 
     delete[] color_defs;
 }