added wxDialUpManager::IsAlwaysConnected() and GetISPNames(), also Dial()

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 41679869ccc21b60dc255280af6fc568ca780a63..10d2f165b36985d02f5190e6246c9a4ef1e04a52 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -194,7 +194,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 +405,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 +457,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);
@@ -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;
 }