added wxUSE_NOTEBOOK to include/wx/msw/setup0.h, removed wxUSE_RADIOBUTTON (we

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index b2a48459f09e4ce5910fe962eabee203ec4548d1..38275205176309437362078ec6cd67b41ed8a1bd 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -41,7 +41,13 @@
     #include <sysent.h>
 #endif
 
     #include <sysent.h>
 #endif
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/unix/execute.h"
 
 
 #include "wx/unix/execute.h"
 


@@ -75,7 +81,7 @@ void wxFlushEvents()
     Display *display = (Display*) wxGetDisplay();
 
     XSync (display, FALSE);
     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.
     // 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.


@@ -123,7 +129,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;


@@ -462,8 +468,8 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
         size_t len;
         environment = GetIniFile (filename, NULL);
         len = strlen (environment);
         size_t len;
         environment = GetIniFile (filename, NULL);
         len = strlen (environment);

-        wxString hostname;
-        if ( wxGetHostName(hostname) )
+        wxString hostname = wxGetHostName();
+        if ( !!hostname )

             strncat(environment, hostname, 1024 - len);
     }
     homeDB = XrmGetFileDatabase (environment);
             strncat(environment, hostname, 1024 - len);
     }
     homeDB = XrmGetFileDatabase (environment);


@@ -541,8 +547,8 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
     else
     {
         // Restore old cursor
     else
     {
         // Restore old cursor

-        if (win->GetCursor()->Ok())
-            attrs.cursor = (Cursor) win->GetCursor()->GetXCursor(display);
+        if (win->GetCursor().Ok())
+            attrs.cursor = (Cursor) win->GetCursor().GetXCursor(display);

         else
             attrs.cursor = None;
     }
         else
             attrs.cursor = None;
     }


@@ -689,8 +695,6 @@ bool wxSetDisplay(const wxString& display_name)
         else
             return FALSE;
     }
         else
             return FALSE;
     }

-
-    return FALSE;

 }
 
 wxString wxGetDisplayName()
 }
 
 wxString wxGetDisplayName()


@@ -725,9 +729,14 @@ char wxFindMnemonic (const char *s)
     return mnem;
 }
 
     return mnem;
 }
 

-char * wxFindAccelerator (char *s)
+char * wxFindAccelerator (const char *s)

 {
 {

-    // The accelerator text is after the \t char.
+    // VZ: this function returns incorrect keysym which completely breaks kbd
+    //     handling
+    return NULL;
+
+#if 0
+   // The accelerator text is after the \t char.

     while (*s && *s != '\t')
         s++;
     if (*s == '\0')
     while (*s && *s != '\t')
         s++;
     if (*s == '\0')


@@ -748,7 +757,7 @@ char * wxFindAccelerator (char *s)
     wxBuffer[0] = '\0';
     char *tmp = copystring (s);
     s = tmp;
     wxBuffer[0] = '\0';
     char *tmp = copystring (s);
     s = tmp;

-    char *p = s;
+    char *p = tmp;

 
     while (1)
     {
 
     while (1)
     {


@@ -763,8 +772,7 @@ char * wxFindAccelerator (char *s)
                 strcat (wxBuffer, s);
             else
                 strcat (wxBuffer, "Meta");
                 strcat (wxBuffer, s);
             else
                 strcat (wxBuffer, "Meta");

-            s = p + 1;
-            p = s;
+            s = p++;

         }
         else
         {
         }
         else
         {


@@ -775,18 +783,25 @@ char * wxFindAccelerator (char *s)
     }
     delete[]tmp;
     return wxBuffer;
     }
     delete[]tmp;
     return wxBuffer;

+#endif

 }
 
 }
 

-XmString wxFindAcceleratorText (char *s)
+XmString wxFindAcceleratorText (const char *s)

 {
 {

-    // The accelerator text is after the \t char.
+    // VZ: this function returns incorrect keysym which completely breaks kbd
+    //     handling
+    return NULL;
+
+#if 0
+   // The accelerator text is after the \t char.

     while (*s && *s != '\t')
         s++;
     if (*s == '\0')
         return (NULL);
     s++;
     while (*s && *s != '\t')
         s++;
     if (*s == '\0')
         return (NULL);
     s++;

-    XmString text = XmStringCreateSimple (s);
+    XmString text = XmStringCreateSimple ((char *)s);

     return text;
     return text;

+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1041,7 +1056,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;


@@ -1074,14 +1089,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);


@@ -1110,7 +1125,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++)
     {


@@ -1127,8 +1142,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;
 }