Correct definition of sorting function.

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 10d2f165b36985d02f5190e6246c9a4ef1e04a52..6f80f461de009820c8357dee52dea35aae4d2c30 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -17,36 +17,48 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+

 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/setup.h"
 #include "wx/utils.h"

+#include "wx/apptrait.h"

 #include "wx/app.h"
 #include "wx/app.h"

-#include "wx/msgdlg.h"
-#include "wx/cursor.h"
-#include "wx/window.h" // for wxTopLevelWindows
+#include "wx/dcmemory.h"
+#include "wx/bitmap.h"
+#include "wx/evtloop.h"

 
 

-#include <ctype.h>
-#include <stdarg.h>
-#include <dirent.h>

 #include <string.h>
 #include <string.h>

-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <pwd.h>
-#include <errno.h>
-#include <netdb.h>
-#include <signal.h>

 
 #if (defined(__SUNCC__) || defined(__CLCC__))
     #include <sysent.h>
 #endif
 
 
 #if (defined(__SUNCC__) || defined(__CLCC__))
     #include <sysent.h>
 #endif
 

-#include <Xm/Xm.h>
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

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

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

 #include "wx/motif/private.h"
 
 #include "wx/motif/private.h"
 

+#if wxUSE_RESOURCES
+#include "X11/Xresource.h"
+#endif
+
+#include "X11/Xutil.h"
+
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
+

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------


@@ -59,7 +71,9 @@
     #define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults"
 #endif
 
     #define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults"
 #endif
 

+#if wxUSE_RESOURCES

 static char *GetIniFile (char *dest, const char *filename);
 static char *GetIniFile (char *dest, const char *filename);

+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -70,60 +84,25 @@ static char *GetIniFile (char *dest, const char *filename);
 // ----------------------------------------------------------------------------
 
 // Consume all events until no more left
 // ----------------------------------------------------------------------------
 
 // Consume all events until no more left

-void wxFlushEvents()
+void wxFlushEvents(WXDisplay* wxdisplay)

 {
 {

-    Display *display = (Display*) wxGetDisplay();
+    Display *display = (Display*)wxdisplay;
+    wxEventLoop evtLoop;

 
     XSync (display, FALSE);
 
 
     XSync (display, FALSE);
 

-    // 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.
-    while (XtAppPending ((XtAppContext) wxTheApp->GetAppContext()) & XtIMXEvent)
+    while (evtLoop.Pending())

     {
     {

-        XFlush (XtDisplay ((Widget) wxTheApp->GetTopLevelWidget()));
-        // Jan Lessner: works better when events are non-X events
-        XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMXEvent);
+        XFlush (display);
+        evtLoop.Dispatch();

     }
 }
 
     }
 }
 

-// Check whether this window wants to process messages, e.g. Stop button
-// in long calculations.
-bool wxCheckForInterrupt(wxWindow *wnd)
-{
-    wxCHECK_MSG( wnd, FALSE, "NULL window in wxCheckForInterrupt" );
-
-    Display *dpy=(Display*) wnd->GetXDisplay();
-    Window win=(Window) wnd->GetXWindow();
-    XEvent event;
-    XFlush(dpy);
-    if (wnd->GetMainWidget())
-    {
-        XmUpdateDisplay((Widget)(wnd->GetMainWidget()));
-    }
-
-    bool hadEvents = FALSE;
-    while( XCheckMaskEvent(dpy,
-                           ButtonPressMask|ButtonReleaseMask|ButtonMotionMask|
-                           PointerMotionMask|KeyPressMask|KeyReleaseMask,
-                           &event) )
-    {
-        if ( event.xany.window == win )
-        {
-            hadEvents = TRUE;
-
-            XtDispatchEvent(&event);
-        }
-    }
-
-    return hadEvents;
-}
-

 // ----------------------------------------------------------------------------
 // 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;


@@ -152,31 +131,42 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 // ----------------------------------------------------------------------------
 
 // Emit a beeeeeep
 // ----------------------------------------------------------------------------
 
 // Emit a beeeeeep

+#ifndef __EMX__
+// on OS/2, we use the wxBell from wxBase library (src/os2/utils.cpp)

 void wxBell()
 {
     // Use current setting for the bell
 void wxBell()
 {
     // Use current setting for the bell

-    XBell ((Display*) wxGetDisplay(), 0);
+    XBell (wxGlobalDisplay(), 0);

 }
 }

+#endif

 
 

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()

 {
 {

+    static wxToolkitInfo info;
+
+    info.shortName = _T("motif");
+    info.name = _T("wxMotif");
+#ifdef __WXUNIVERSAL__
+    info.shortName << _T("univ");
+    info.name << _T("/wxUniversal");
+#endif

     // FIXME TODO
     // This code is WRONG!! Does NOT return the
     // Motif version of the libs but the X protocol
     // version!
     // FIXME TODO
     // This code is WRONG!! Does NOT return the
     // Motif version of the libs but the X protocol
     // version!

-    Display *display = XtDisplay ((Widget) wxTheApp->GetTopLevelWidget());
-    if (majorVsn)
-        *majorVsn = ProtocolVersion (display);
-    if (minorVsn)
-        *minorVsn = ProtocolRevision (display);
-
-    return wxMOTIF_X;
+    Display *display = wxGlobalDisplay();
+    info.versionMajor = ProtocolVersion (display);
+    info.versionMinor = ProtocolRevision (display);
+    info.os = wxMOTIF_X;
+    return info;

 }
 
 // ----------------------------------------------------------------------------
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 // ----------------------------------------------------------------------------
 

+#if wxUSE_RESOURCES
+

 // Read $HOME for what it says is home, if not
 // read $USER or $LOGNAME for user name else determine
 // the Real User, then determine the Real home dir.
 // Read $HOME for what it says is home, if not
 // read $USER or $LOGNAME for user name else determine
 // the Real User, then determine the Real home dir.


@@ -194,7 +184,7 @@ static char * GetIniFile (char *dest, const char *filename)
             strcat (dest, "/");
         if (filename == NULL)
         {
             strcat (dest, "/");
         if (filename == NULL)
         {

-            if ((filename = getenv ("XENVIRONMENT(")) == NULL)
+            if ((filename = getenv ("XENVIRONMENT")) == NULL)

                 filename = ".Xdefaults";
         }
         else if (*filename != '.')
                 filename = ".Xdefaults";
         }
         else if (*filename != '.')


@@ -207,8 +197,6 @@ static char * GetIniFile (char *dest, const char *filename)
     return dest;
 }
 
     return dest;
 }
 

-#if wxUSE_RESOURCES
-

 static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
 {
     if (create && wxFileExists (name) ) {
 static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
 {
     if (create && wxFileExists (name) ) {


@@ -222,7 +210,7 @@ static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
         // Put in standard place for resource files if not absolute
         strcpy (buf, DEFAULT_XRESOURCE_DIR);
         strcat (buf, "/");
         // Put in standard place for resource files if not absolute
         strcpy (buf, DEFAULT_XRESOURCE_DIR);
         strcat (buf, "/");

-        strcat (buf, (const char*) wxFileNameFromPath (name));
+        strcat (buf, wxFileNameFromPath (name).c_str());

     }
 
     if (create) {
     }
 
     if (create) {


@@ -284,9 +272,9 @@ bool wxWriteResource(const wxString& section, const wxString& entry, const wxStr
     }
 
     char resName[300];
     }
 
     char resName[300];

-    strcpy (resName, (const char*) section);
+    strcpy (resName, section.c_str());

     strcat (resName, ".");
     strcat (resName, ".");

-    strcat (resName, (const char*) entry);
+    strcat (resName, entry.c_str());

 
     XrmPutStringResource (&database, resName, value);
     return TRUE;
 
     XrmPutStringResource (&database, resName, value);
     return TRUE;


@@ -317,7 +305,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
 {
     if (!wxResourceDatabase)
     {
 {
     if (!wxResourceDatabase)
     {

-        Display *display = (Display*) wxGetDisplay();
+        Display *display = wxGlobalDisplay();

         wxXMergeDatabases (wxTheApp, display);
     }
 
         wxXMergeDatabases (wxTheApp, display);
     }
 


@@ -405,7 +393,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     {
         // Handle True, False here
         // True, Yes, Enables, Set or  Activated
     {
         // 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')
             *value = TRUE;
         // False, No, Disabled, Reset, Cleared, Deactivated
         else if (*s == 'F' || *s == 'N' || *s == 'D' || *s == 'R' || *s == 'C')


@@ -430,7 +418,7 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
     wxString classname = theApp->GetClassName();
     char name[256];
     (void) strcpy (name, "/usr/lib/X11/app-defaults/");
     wxString classname = theApp->GetClassName();
     char name[256];
     (void) strcpy (name, "/usr/lib/X11/app-defaults/");

-    (void) strcat (name, (const char*) classname);
+    (void) strcat (name, classname.c_str());

 
     /* Get application defaults file, if any */
     applicationDB = XrmGetFileDatabase (name);
 
     /* Get application defaults file, if any */
     applicationDB = XrmGetFileDatabase (name);


@@ -457,7 +445,7 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
     * and merge into existing database
     */
 
     * and merge into existing database
     */
 

-    if ((environment = getenv ("XENVIRONMENT(")) == NULL)
+    if ((environment = getenv ("XENVIRONMENT")) == NULL)

     {
         size_t len;
         environment = GetIniFile (filename, NULL);
     {
         size_t len;
         environment = GetIniFile (filename, NULL);


@@ -516,101 +504,28 @@ wxSetDefaultResources (const Widget w, const char **resourceSpec, const char *na
 
 #endif // wxUSE_RESOURCES
 
 
 #endif // wxUSE_RESOURCES
 

-// ----------------------------------------------------------------------------
-// busy cursor stuff
-// ----------------------------------------------------------------------------
-
-static int wxBusyCursorCount = 0;
-
-// Helper function
-static void
-wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
-{
-    Display *display = (Display*) win->GetXDisplay();
-
-    Window xwin = (Window) win->GetXWindow();
-    if (!xwin)
-       return;
-
-    XSetWindowAttributes attrs;
-
-    if (cursor)
-    {
-        attrs.cursor = (Cursor) cursor->GetXCursor(display);
-    }
-    else
-    {
-        // Restore old cursor
-        if (win->GetCursor().Ok())
-            attrs.cursor = (Cursor) win->GetCursor().GetXCursor(display);
-        else
-            attrs.cursor = None;
-    }
-    if (xwin)
-        XChangeWindowAttributes (display, xwin, CWCursor, &attrs);
-
-    XFlush (display);
-
-    for(wxNode *node = win->GetChildren().First (); node; node = node->Next())
-    {
-        wxWindow *child = (wxWindow *) node->Data ();
-        wxXSetBusyCursor (child, cursor);
-    }
-}
-
-// Set the cursor to the busy cursor for all windows
-void wxBeginBusyCursor(wxCursor *cursor)
-{
-    wxBusyCursorCount++;
-    if (wxBusyCursorCount == 1)
-    {
-        for(wxNode *node = wxTopLevelWindows.First (); node; node = node->Next())
-        {
-            wxWindow *win = (wxWindow *) node->Data ();
-            wxXSetBusyCursor (win, cursor);
-        }
-    }
-}
-
-// Restore cursor to normal
-void wxEndBusyCursor()
-{
-    if (wxBusyCursorCount == 0)
-        return;
-
-    wxBusyCursorCount--;
-    if (wxBusyCursorCount == 0)
-    {
-        for(wxNode *node = wxTopLevelWindows.First (); node; node = node->Next())
-        {
-            wxWindow *win = (wxWindow *) node->Data ();
-            wxXSetBusyCursor (win, NULL);
-        }
-    }
-}
-
-// TRUE if we're between the above two calls
-bool wxIsBusy()
-{
-    return (wxBusyCursorCount > 0);
-}
-

 // ----------------------------------------------------------------------------
 // display info
 // ----------------------------------------------------------------------------
 
 void wxGetMousePosition( int* x, int* y )
 {
 // ----------------------------------------------------------------------------
 // display info
 // ----------------------------------------------------------------------------
 
 void wxGetMousePosition( int* x, int* y )
 {

+#if wxUSE_NANOX
+    // TODO
+    *x = 0;
+    *y = 0;
+#else

     XMotionEvent xev;
     Window root, child;
     XMotionEvent xev;
     Window root, child;

-    XQueryPointer((Display*) wxGetDisplay(),
-                  DefaultRootWindow((Display*) wxGetDisplay()),
+    XQueryPointer(wxGlobalDisplay(),
+                  DefaultRootWindow(wxGlobalDisplay()),

                   &root, &child,
                   &(xev.x_root), &(xev.y_root),
                   &(xev.x),      &(xev.y),
                   &(xev.state));
     *x = xev.x_root;
     *y = xev.y_root;
                   &root, &child,
                   &(xev.x_root), &(xev.y_root),
                   &(xev.x),      &(xev.y),
                   &(xev.state));
     *x = xev.x_root;
     *y = xev.y_root;

+#endif

 };
 
 // Return TRUE if we have a colour display
 };
 
 // Return TRUE if we have a colour display


@@ -622,7 +537,7 @@ bool wxColourDisplay()
 // Returns depth of screen
 int wxDisplayDepth()
 {
 // Returns depth of screen
 int wxDisplayDepth()
 {

-    Display *dpy = (Display*) wxGetDisplay();
+    Display *dpy = wxGlobalDisplay();

 
     return DefaultDepth (dpy, DefaultScreen (dpy));
 }
 
     return DefaultDepth (dpy, DefaultScreen (dpy));
 }


@@ -630,7 +545,7 @@ int wxDisplayDepth()
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {

-    Display *dpy = (Display*) wxGetDisplay();
+    Display *dpy = wxGlobalDisplay();

 
     if ( width )
         *width = DisplayWidth (dpy, DefaultScreen (dpy));
 
     if ( width )
         *width = DisplayWidth (dpy, DefaultScreen (dpy));


@@ -638,7 +553,29 @@ void wxDisplaySize(int *width, int *height)
         *height = DisplayHeight (dpy, DefaultScreen (dpy));
 }
 
         *height = DisplayHeight (dpy, DefaultScreen (dpy));
 }
 

-// Configurable display in Motif
+void wxDisplaySizeMM(int *width, int *height)
+{
+    Display *dpy = wxGlobalDisplay();
+
+    if ( width )
+        *width = DisplayWidthMM(dpy, DefaultScreen (dpy));
+    if ( height )
+        *height = DisplayHeightMM(dpy, DefaultScreen (dpy));
+}
+
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+{
+    // This is supposed to return desktop dimensions minus any window
+    // manager panels, menus, taskbars, etc.  If there is a way to do that
+    // for this platform please fix this function, otherwise it defaults
+    // to the entire desktop.
+    if (x) *x = 0;
+    if (y) *y = 0;
+    wxDisplaySize(width, height);
+}
+
+
+// Configurable display in wxX11 and wxMotif

 static WXDisplay *gs_currentDisplay = NULL;
 static wxString gs_displayName;
 
 static WXDisplay *gs_currentDisplay = NULL;
 static wxString gs_displayName;
 


@@ -646,20 +583,16 @@ WXDisplay *wxGetDisplay()
 {
     if (gs_currentDisplay)
         return gs_currentDisplay;
 {
     if (gs_currentDisplay)
         return gs_currentDisplay;

-
-    if (wxTheApp && wxTheApp->GetTopLevelWidget())
-        return XtDisplay ((Widget) wxTheApp->GetTopLevelWidget());

     else if (wxTheApp)
         return wxTheApp->GetInitialDisplay();
     else if (wxTheApp)
         return wxTheApp->GetInitialDisplay();

-    else
-        return (WXDisplay*) NULL;
+    return NULL;

 }
 
 bool wxSetDisplay(const wxString& display_name)
 {
     gs_displayName = display_name;
 
 }
 
 bool wxSetDisplay(const wxString& display_name)
 {
     gs_displayName = display_name;
 

-    if ( !display_name )
+    if ( display_name.IsEmpty() )

     {
         gs_currentDisplay = NULL;
 
     {
         gs_currentDisplay = NULL;
 


@@ -670,9 +603,9 @@ bool wxSetDisplay(const wxString& display_name)
         Cardinal argc = 0;
 
         Display *display = XtOpenDisplay((XtAppContext) wxTheApp->GetAppContext(),
         Cardinal argc = 0;
 
         Display *display = XtOpenDisplay((XtAppContext) wxTheApp->GetAppContext(),

-            (const char*) display_name,
-            (const char*) wxTheApp->GetAppName(),
-            (const char*) wxTheApp->GetClassName(),
+            display_name.c_str(),
+            wxTheApp->GetAppName().c_str(),
+            wxTheApp->GetClassName().c_str(),

             NULL,
 #if XtSpecificationRelease < 5
             0, &argc,
             NULL,
 #if XtSpecificationRelease < 5
             0, &argc,


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

-
-    return FALSE;

 }
 
 wxString wxGetDisplayName()
 }
 
 wxString wxGetDisplayName()


@@ -698,345 +629,9 @@ wxString wxGetDisplayName()
     return gs_displayName;
 }
 
     return gs_displayName;
 }
 

-// ----------------------------------------------------------------------------
-// accelerators
-// ----------------------------------------------------------------------------
-
-// Find the letter corresponding to the mnemonic, for Motif
-char wxFindMnemonic (const char *s)
-{
-    char mnem = 0;
-    int len = strlen (s);
-    int i;
-    for (i = 0; i < len; i++)
-    {
-        if (s[i] == '&')
-        {
-            // Carefully handle &&
-            if ((i + 1) <= len && s[i + 1] == '&')
-                i++;
-            else
-            {
-                mnem = s[i + 1];
-                break;
-            }
-        }
-    }
-    return mnem;
-}
-
-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++;
-    if (*s == '\0')
-        return (NULL);
-    s++;
-    /*
-    Now we need to format it as X standard:
-
-      input            output
-
-        F7           --> <Key>F7
-        Ctrl+N       --> Ctrl<Key>N
-        Alt+k        --> Meta<Key>k
-        Ctrl+Shift+A --> Ctrl Shift<Key>A
-
-    */
-
-    wxBuffer[0] = '\0';
-    char *tmp = copystring (s);
-    s = tmp;
-    char *p = tmp;
-
-    while (1)
-    {
-        while (*p && *p != '+')
-            p++;
-        if (*p)
-        {
-            *p = '\0';
-            if (wxBuffer[0])
-                strcat (wxBuffer, " ");
-            if (strcmp (s, "Alt"))
-                strcat (wxBuffer, s);
-            else
-                strcat (wxBuffer, "Meta");
-            s = p++;
-        }
-        else
-        {
-            strcat (wxBuffer, "<Key>");
-            strcat (wxBuffer, s);
-            break;
-        }
-    }
-    delete[]tmp;
-    return wxBuffer;
-}
-
-XmString wxFindAcceleratorText (const char *s)
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

 {
 {

-    // 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 ((char *)s);
-    return text;
-}
-
-// ----------------------------------------------------------------------------
-// keycode translations
-// ----------------------------------------------------------------------------
-
-#include <X11/keysym.h>
-
-// FIXME what about tables??
-
-int wxCharCodeXToWX(KeySym keySym)
-{
-    int id;
-    switch (keySym)
-    {
-        case XK_Shift_L:
-        case XK_Shift_R:
-            id = WXK_SHIFT; break;
-        case XK_Control_L:
-        case XK_Control_R:
-            id = WXK_CONTROL; break;
-        case XK_BackSpace:
-            id = WXK_BACK; break;
-        case XK_Delete:
-            id = WXK_DELETE; break;
-        case XK_Clear:
-            id = WXK_CLEAR; break;
-        case XK_Tab:
-            id = WXK_TAB; break;
-        case XK_numbersign:
-            id = '#'; break;
-        case XK_Return:
-            id = WXK_RETURN; break;
-        case XK_Escape:
-            id = WXK_ESCAPE; break;
-        case XK_Pause:
-        case XK_Break:
-            id = WXK_PAUSE; break;
-        case XK_Num_Lock:
-            id = WXK_NUMLOCK; break;
-        case XK_Scroll_Lock:
-            id = WXK_SCROLL; break;
-
-        case XK_Home:
-            id = WXK_HOME; break;
-        case XK_End:
-            id = WXK_END; break;
-        case XK_Left:
-            id = WXK_LEFT; break;
-        case XK_Right:
-            id = WXK_RIGHT; break;
-        case XK_Up:
-            id = WXK_UP; break;
-        case XK_Down:
-            id = WXK_DOWN; break;
-        case XK_Next:
-            id = WXK_NEXT; break;
-        case XK_Prior:
-            id = WXK_PRIOR; break;
-        case XK_Menu:
-            id = WXK_MENU; break;
-        case XK_Select:
-            id = WXK_SELECT; break;
-        case XK_Cancel:
-            id = WXK_CANCEL; break;
-        case XK_Print:
-            id = WXK_PRINT; break;
-        case XK_Execute:
-            id = WXK_EXECUTE; break;
-        case XK_Insert:
-            id = WXK_INSERT; break;
-        case XK_Help:
-            id = WXK_HELP; break;
-
-        case XK_KP_Multiply:
-            id = WXK_MULTIPLY; break;
-        case XK_KP_Add:
-            id = WXK_ADD; break;
-        case XK_KP_Subtract:
-            id = WXK_SUBTRACT; break;
-        case XK_KP_Divide:
-            id = WXK_DIVIDE; break;
-        case XK_KP_Decimal:
-            id = WXK_DECIMAL; break;
-        case XK_KP_Equal:
-            id = '='; break;
-        case XK_KP_Space:
-            id = ' '; break;
-        case XK_KP_Tab:
-            id = WXK_TAB; break;
-        case XK_KP_Enter:
-            id = WXK_RETURN; break;
-        case XK_KP_0:
-            id = WXK_NUMPAD0; break;
-        case XK_KP_1:
-            id = WXK_NUMPAD1; break;
-        case XK_KP_2:
-            id = WXK_NUMPAD2; break;
-        case XK_KP_3:
-            id = WXK_NUMPAD3; break;
-        case XK_KP_4:
-            id = WXK_NUMPAD4; break;
-        case XK_KP_5:
-            id = WXK_NUMPAD5; break;
-        case XK_KP_6:
-            id = WXK_NUMPAD6; break;
-        case XK_KP_7:
-            id = WXK_NUMPAD7; break;
-        case XK_KP_8:
-            id = WXK_NUMPAD8; break;
-        case XK_KP_9:
-            id = WXK_NUMPAD9; break;
-        case XK_F1:
-            id = WXK_F1; break;
-        case XK_F2:
-            id = WXK_F2; break;
-        case XK_F3:
-            id = WXK_F3; break;
-        case XK_F4:
-            id = WXK_F4; break;
-        case XK_F5:
-            id = WXK_F5; break;
-        case XK_F6:
-            id = WXK_F6; break;
-        case XK_F7:
-            id = WXK_F7; break;
-        case XK_F8:
-            id = WXK_F8; break;
-        case XK_F9:
-            id = WXK_F9; break;
-        case XK_F10:
-            id = WXK_F10; break;
-        case XK_F11:
-            id = WXK_F11; break;
-        case XK_F12:
-            id = WXK_F12; break;
-        case XK_F13:
-            id = WXK_F13; break;
-        case XK_F14:
-            id = WXK_F14; break;
-        case XK_F15:
-            id = WXK_F15; break;
-        case XK_F16:
-            id = WXK_F16; break;
-        case XK_F17:
-            id = WXK_F17; break;
-        case XK_F18:
-            id = WXK_F18; break;
-        case XK_F19:
-            id = WXK_F19; break;
-        case XK_F20:
-            id = WXK_F20; break;
-        case XK_F21:
-            id = WXK_F21; break;
-        case XK_F22:
-            id = WXK_F22; break;
-        case XK_F23:
-            id = WXK_F23; break;
-        case XK_F24:
-            id = WXK_F24; break;
-        default:
-            id = (keySym <= 255) ? (int)keySym : -1;
-    }
-
-    return id;
-}
-
-KeySym wxCharCodeWXToX(int id)
-{
-    KeySym keySym;
-
-    switch (id)
-    {
-        case WXK_CANCEL:            keySym = XK_Cancel; break;
-        case WXK_BACK:              keySym = XK_BackSpace; break;
-        case WXK_TAB:            keySym = XK_Tab; break;
-        case WXK_CLEAR:        keySym = XK_Clear; break;
-        case WXK_RETURN:        keySym = XK_Return; break;
-        case WXK_SHIFT:        keySym = XK_Shift_L; break;
-        case WXK_CONTROL:        keySym = XK_Control_L; break;
-        case WXK_MENU :        keySym = XK_Menu; break;
-        case WXK_PAUSE:        keySym = XK_Pause; break;
-        case WXK_ESCAPE:        keySym = XK_Escape; break;
-        case WXK_SPACE:        keySym = ' '; break;
-        case WXK_PRIOR:        keySym = XK_Prior; break;
-        case WXK_NEXT :        keySym = XK_Next; break;
-        case WXK_END:        keySym = XK_End; break;
-        case WXK_HOME :        keySym = XK_Home; break;
-        case WXK_LEFT :        keySym = XK_Left; break;
-        case WXK_UP:        keySym = XK_Up; break;
-        case WXK_RIGHT:        keySym = XK_Right; break;
-        case WXK_DOWN :        keySym = XK_Down; break;
-        case WXK_SELECT:        keySym = XK_Select; break;
-        case WXK_PRINT:        keySym = XK_Print; break;
-        case WXK_EXECUTE:        keySym = XK_Execute; break;
-        case WXK_INSERT:        keySym = XK_Insert; break;
-        case WXK_DELETE:        keySym = XK_Delete; break;
-        case WXK_HELP :        keySym = XK_Help; break;
-        case WXK_NUMPAD0:        keySym = XK_KP_0; break;
-        case WXK_NUMPAD1:        keySym = XK_KP_1; break;
-        case WXK_NUMPAD2:        keySym = XK_KP_2; break;
-        case WXK_NUMPAD3:        keySym = XK_KP_3; break;
-        case WXK_NUMPAD4:        keySym = XK_KP_4; break;
-        case WXK_NUMPAD5:        keySym = XK_KP_5; break;
-        case WXK_NUMPAD6:        keySym = XK_KP_6; break;
-        case WXK_NUMPAD7:        keySym = XK_KP_7; break;
-        case WXK_NUMPAD8:        keySym = XK_KP_8; break;
-        case WXK_NUMPAD9:        keySym = XK_KP_9; break;
-        case WXK_MULTIPLY:        keySym = XK_KP_Multiply; break;
-        case WXK_ADD:        keySym = XK_KP_Add; break;
-        case WXK_SUBTRACT:        keySym = XK_KP_Subtract; break;
-        case WXK_DECIMAL:        keySym = XK_KP_Decimal; break;
-        case WXK_DIVIDE:        keySym = XK_KP_Divide; break;
-        case WXK_F1:        keySym = XK_F1; break;
-        case WXK_F2:        keySym = XK_F2; break;
-        case WXK_F3:        keySym = XK_F3; break;
-        case WXK_F4:        keySym = XK_F4; break;
-        case WXK_F5:        keySym = XK_F5; break;
-        case WXK_F6:        keySym = XK_F6; break;
-        case WXK_F7:        keySym = XK_F7; break;
-        case WXK_F8:        keySym = XK_F8; break;
-        case WXK_F9:        keySym = XK_F9; break;
-        case WXK_F10:        keySym = XK_F10; break;
-        case WXK_F11:        keySym = XK_F11; break;
-        case WXK_F12:        keySym = XK_F12; break;
-        case WXK_F13:        keySym = XK_F13; break;
-        case WXK_F14:        keySym = XK_F14; break;
-        case WXK_F15:        keySym = XK_F15; break;
-        case WXK_F16:        keySym = XK_F16; break;
-        case WXK_F17:        keySym = XK_F17; break;
-        case WXK_F18:        keySym = XK_F18; break;
-        case WXK_F19:        keySym = XK_F19; break;
-        case WXK_F20:        keySym = XK_F20; break;
-        case WXK_F21:        keySym = XK_F21; break;
-        case WXK_F22:        keySym = XK_F22; break;
-        case WXK_F23:        keySym = XK_F23; break;
-        case WXK_F24:        keySym = XK_F24; break;
-        case WXK_NUMLOCK:    keySym = XK_Num_Lock; break;
-        case WXK_SCROLL:     keySym = XK_Scroll_Lock; break;
-        default:             keySym = id <= 255 ? (KeySym)id : 0;
-    }
-
-    return keySym;
+    return wxGenericFindWindowAtPoint(pt);

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


@@ -1048,7 +643,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;


@@ -1081,14 +676,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);


@@ -1105,6 +700,7 @@ void wxXColorToHSV(wxHSV *hsv,XColor *rgb)
 
 void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
 {
 
 void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
 {

+#if !wxUSE_NANOX

     int llp;
 
     int screen = DefaultScreen(d);
     int llp;
 
     int screen = DefaultScreen(d);


@@ -1117,7 +713,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++)
     {


@@ -1134,13 +730,14 @@ 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";
 */
 
     delete[] color_defs;
 /*  FIXME, TODO
     if (!XAllocColor(d,cmp,xc))
         cout << "wxAllocNearestColor : Warning : Cannot find nearest color !\n";
 */
 
     delete[] color_defs;

+#endif

 }
 
 void wxAllocColor(Display *d,Colormap cmp,XColor *xc)
 }
 
 void wxAllocColor(Display *d,Colormap cmp,XColor *xc)


@@ -1152,12 +749,146 @@ void wxAllocColor(Display *d,Colormap cmp,XColor *xc)
     }
 }
 
     }
 }
 

+#ifdef __WXDEBUG__
+wxString wxGetXEventName(XEvent& event)
+{
+#if wxUSE_NANOX
+    wxString str(wxT("(some event)"));
+    return str;
+#else
+    int type = event.xany.type;
+           static char* event_name[] = {
+               "", "unknown(-)",                                         // 0-1
+               "KeyPress", "KeyRelease", "ButtonPress", "ButtonRelease", // 2-5
+               "MotionNotify", "EnterNotify", "LeaveNotify", "FocusIn",  // 6-9
+               "FocusOut", "KeymapNotify", "Expose", "GraphicsExpose",   // 10-13
+               "NoExpose", "VisibilityNotify", "CreateNotify",           // 14-16
+               "DestroyNotify", "UnmapNotify", "MapNotify", "MapRequest",// 17-20
+               "ReparentNotify", "ConfigureNotify", "ConfigureRequest",  // 21-23
+               "GravityNotify", "ResizeRequest", "CirculateNotify",      // 24-26
+               "CirculateRequest", "PropertyNotify", "SelectionClear",   // 27-29
+               "SelectionRequest", "SelectionNotify", "ColormapNotify",  // 30-32
+               "ClientMessage", "MappingNotify",                         // 33-34
+               "unknown(+)"};                                            // 35
+           type = wxMin(35, type); type = wxMax(1, type);
+        wxString str(event_name[type]);
+        return str;
+#endif
+}
+#endif

 
 

-// These functions duplicate those in wxWindow, but are needed
-// for use outside of wxWindow (e.g. wxMenu, wxMenuBar).
+// ----------------------------------------------------------------------------
+// accelerators
+// ----------------------------------------------------------------------------

 
 

-// Change a widget's foreground and background colours.
+// Find the letter corresponding to the mnemonic, for Motif
+char wxFindMnemonic (const char *s)
+{
+    char mnem = 0;
+    int len = strlen (s);
+    int i;
+
+    for (i = 0; i < len; i++)
+    {
+        if (s[i] == '&')
+        {
+            // Carefully handle &&
+            if ((i + 1) <= len && s[i + 1] == '&')
+                i++;
+            else
+            {
+                mnem = s[i + 1];
+                break;
+            }
+        }
+    }
+    return mnem;
+}
+
+char* wxFindAccelerator( const char *s )
+{
+#if 1
+    // VZ: this function returns incorrect keysym which completely breaks kbd
+    //     handling
+    return NULL;
+#else
+    // The accelerator text is after the \t char.
+    s = strchr( s, '\t' );
+
+    if( !s ) return NULL;
+
+    /*
+    Now we need to format it as X standard:
+
+      input            output
+
+        F7           --> <Key>F7
+        Ctrl+N       --> Ctrl<Key>N
+        Alt+k        --> Meta<Key>k
+        Ctrl+Shift+A --> Ctrl Shift<Key>A
+
+        and handle Ctrl-N & similia
+    */
+
+    static char buf[256];
+
+    buf[0] = '\0';
+    wxString tmp = s + 1; // skip TAB
+    size_t index = 0;
+
+    while( index < tmp.length() )
+    {
+        size_t plus  = tmp.find( '+', index );
+        size_t minus = tmp.find( '-', index );

 
 

+        // neither '+' nor '-', add <Key>
+        if( plus == wxString::npos && minus == wxString::npos )
+        {
+            strcat( buf, "<Key>" );
+            strcat( buf, tmp.c_str() + index );
+
+            return buf;
+        }
+
+        // OK: npos is big and positive
+        size_t sep = wxMin( plus, minus );
+        wxString mod = tmp.substr( index, sep - index );
+
+        // Ctrl  -> Ctrl
+        // Shift -> Shift
+        // Alt   -> Meta
+        if( mod == "Alt" )
+            mod = "Meta";
+
+        if( buf[0] )
+            strcat( buf, " " );
+
+        strcat( buf, mod.c_str() );
+
+        index = sep + 1;
+    }
+
+    return NULL;
+#endif
+}
+
+XmString wxFindAcceleratorText (const char *s)
+{
+#if 1
+    // VZ: this function returns incorrect keysym which completely breaks kbd
+    //     handling
+    return NULL;
+#else
+    // The accelerator text is after the \t char.
+    s = strchr( s, '\t' );
+
+    if( !s ) return NULL;
+
+    return wxStringToXmString( s + 1 ); // skip TAB!
+#endif
+}
+
+// Change a widget's foreground and background colours.

 void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
 {
     // When should we specify the foreground, if it's calculated
 void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
 {
     // When should we specify the foreground, if it's calculated


@@ -1192,3 +923,107 @@ void wxDoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, boo
         NULL);
 }
 
         NULL);
 }
 

+extern void wxDoChangeFont(WXWidget widget, wxFont& font)
+{
+    // Lesstif 0.87 hangs here, but 0.93 does not
+#if !wxCHECK_LESSTIF() || wxCHECK_LESSTIF_VERSION( 0, 93 )
+    Widget w = (Widget)widget;
+    XtVaSetValues( w,
+                   wxFont::GetFontTag(), font.GetFontType( XtDisplay(w) ),
+                   NULL );
+#endif
+
+}
+
+wxString wxXmStringToString( const XmString& xmString )
+{
+    char *txt;
+    if( XmStringGetLtoR( xmString, XmSTRING_DEFAULT_CHARSET, &txt ) )
+    {
+        wxString str(txt);
+        XtFree (txt);
+        return str;
+    }
+
+    return wxEmptyString;
+}
+
+XmString wxStringToXmString( const wxString& str )
+{
+    return XmStringCreateLtoR((char *)str.c_str(), XmSTRING_DEFAULT_CHARSET);
+}
+
+XmString wxStringToXmString( const char* str )
+{
+    return XmStringCreateLtoR((char *)str, XmSTRING_DEFAULT_CHARSET);
+}
+
+// ----------------------------------------------------------------------------
+// wxBitmap utility functions
+// ----------------------------------------------------------------------------
+
+// Creates a bitmap with transparent areas drawn in
+// the given colour.
+wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour)
+{
+    wxBitmap newBitmap(bitmap.GetWidth(),
+                       bitmap.GetHeight(),
+                       bitmap.GetDepth());
+    wxMemoryDC destDC;
+    wxMemoryDC srcDC;
+
+    srcDC.SelectObject(bitmap);
+    destDC.SelectObject(newBitmap);
+
+    wxBrush brush(colour, wxSOLID);
+    // destDC.SetOptimization(FALSE);
+    destDC.SetBackground(brush);
+    destDC.Clear();
+    destDC.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(),
+                &srcDC, 0, 0, wxCOPY, TRUE);
+
+    return newBitmap;
+}
+
+// ----------------------------------------------------------------------------
+// Miscellaneous functions
+// ----------------------------------------------------------------------------
+
+WXWidget wxCreateBorderWidget( WXWidget parent, long style )
+{
+    Widget borderWidget = (Widget)NULL, parentWidget = (Widget)parent;
+
+    if (style & wxSIMPLE_BORDER)
+    {
+        borderWidget = XtVaCreateManagedWidget
+                                   (
+                                    "simpleBorder",
+                                    xmFrameWidgetClass, parentWidget,
+                                    XmNshadowType, XmSHADOW_ETCHED_IN,
+                                    XmNshadowThickness, 1,
+                                    NULL
+                                   );
+    }
+    else if (style & wxSUNKEN_BORDER)
+    {
+        borderWidget = XtVaCreateManagedWidget
+                                   (
+                                    "sunkenBorder",
+                                    xmFrameWidgetClass, parentWidget,
+                                    XmNshadowType, XmSHADOW_IN,
+                                    NULL
+                                   );
+    }
+    else if (style & wxRAISED_BORDER)
+    {
+        borderWidget = XtVaCreateManagedWidget
+                                   (
+                                    "raisedBorder",
+                                    xmFrameWidgetClass, parentWidget,
+                                    XmNshadowType, XmSHADOW_OUT,
+                                    NULL
+                                   );
+    }
+
+    return borderWidget;
+}