X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..bada28f00f12666ef31f0543cea2cde86b7935c7:/src/motif/utils.cpp

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 10d2f165b3..bbd87c8772 100644
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -17,6 +17,10 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"
@@ -41,7 +45,13 @@
     #include <sysent.h>
 #endif
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Xm.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 #include "wx/unix/execute.h"
 
@@ -123,7 +133,7 @@ bool wxCheckForInterrupt(wxWindow *wnd)
 // 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;
@@ -194,7 +204,7 @@ static char * GetIniFile (char *dest, const char *filename)
             strcat (dest, "/");
         if (filename == NULL)
         {
-            if ((filename = getenv ("XENVIRONMENT(")) == NULL)
+            if ((filename = getenv ("XENVIRONMENT")) == NULL)
                 filename = ".Xdefaults";
         }
         else if (*filename != '.')
@@ -405,7 +415,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     {
         // Handle True, False here
         // True, Yes, Enables, Set or  Activated
-        if (*s == 'T(' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')
+        if (*s == 'T' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')
             *value = TRUE;
         // False, No, Disabled, Reset, Cleared, Deactivated
         else if (*s == 'F' || *s == 'N' || *s == 'D' || *s == 'R' || *s == 'C')
@@ -457,7 +467,7 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
     * and merge into existing database
     */
 
-    if ((environment = getenv ("XENVIRONMENT(")) == NULL)
+    if ((environment = getenv ("XENVIRONMENT")) == NULL)
     {
         size_t len;
         environment = GetIniFile (filename, NULL);
@@ -638,6 +648,16 @@ void wxDisplaySize(int *width, int *height)
         *height = DisplayHeight (dpy, DefaultScreen (dpy));
 }
 
+void wxDisplaySizeMM(int *width, int *height)
+{
+    Display *dpy = (Display*) wxGetDisplay();
+
+    if ( width )
+        *width = DisplayWidthMM(dpy, DefaultScreen (dpy));
+    if ( height )
+        *height = DisplayHeightMM(dpy, DefaultScreen (dpy));
+}
+
 // Configurable display in Motif
 static WXDisplay *gs_currentDisplay = NULL;
 static wxString gs_displayName;
@@ -689,8 +709,6 @@ bool wxSetDisplay(const wxString& display_name)
         else
             return FALSE;
     }
-
-    return FALSE;
 }
 
 wxString wxGetDisplayName()
@@ -698,6 +716,11 @@ wxString wxGetDisplayName()
     return gs_displayName;
 }
 
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+{
+    return wxGenericFindWindowAtPoint(pt);
+}
+
 // ----------------------------------------------------------------------------
 // accelerators
 // ----------------------------------------------------------------------------
@@ -731,7 +754,8 @@ char * wxFindAccelerator (const char *s)
     //     handling
     return NULL;
 
-    // The accelerator text is after the \t char.
+#if 0
+   // The accelerator text is after the \t char.
     while (*s && *s != '\t')
         s++;
     if (*s == '\0')
@@ -778,6 +802,7 @@ char * wxFindAccelerator (const char *s)
     }
     delete[]tmp;
     return wxBuffer;
+#endif
 }
 
 XmString wxFindAcceleratorText (const char *s)
@@ -786,7 +811,8 @@ XmString wxFindAcceleratorText (const char *s)
     //     handling
     return NULL;
 
-    // The accelerator text is after the \t char.
+#if 0
+   // The accelerator text is after the \t char.
     while (*s && *s != '\t')
         s++;
     if (*s == '\0')
@@ -794,6 +820,7 @@ XmString wxFindAcceleratorText (const char *s)
     s++;
     XmString text = XmStringCreateSimple ((char *)s);
     return text;
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -1048,7 +1075,7 @@ void wxHSVToXColor(wxHSV *hsv,XColor *rgb)
     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;
@@ -1081,14 +1108,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 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
     {
-        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);
@@ -1117,7 +1144,7 @@ void wxAllocNearestColor(Display *d,Colormap cmp,XColor *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++)
     {