compilation fix for systems with XtIMSignal

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index b43673b3b6a6c901853e26ffc468a16d510dde88..13133ceeac0062366d5306fc326dffeec9bc1525 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -17,27 +17,22 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif
 #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 <signal.h>

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


@@ -50,6 +45,8 @@
 #include "wx/unix/execute.h"
 
 #include <Xm/Xm.h>
 #include "wx/unix/execute.h"
 
 #include <Xm/Xm.h>

+#include <Xm/Frame.h>
+

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


@@ -87,56 +84,19 @@ static char *GetIniFile (char *dest, const char *filename);
 // ----------------------------------------------------------------------------
 
 // Consume all events until no more left
 // ----------------------------------------------------------------------------
 
 // Consume all events until no more left

-void wxFlushEvents()
-{
-    Display *display = (Display*) wxGetDisplay();
-
-    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)
-    {
-        XFlush (XtDisplay ((Widget) wxTheApp->GetTopLevelWidget()));
-        // Jan Lessner: works better when events are non-X events
-        XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMXEvent);
-    }
-}
-
-#if 0
-// Check whether this window wants to process messages, e.g. Stop button
-// in long calculations.
-bool wxCheckForInterrupt(wxWindow *wnd)
+void wxFlushEvents(WXDisplay* wxdisplay)

 {
 {

-    wxCHECK_MSG( wnd, FALSE, "NULL window in wxCheckForInterrupt" );
+    Display *display = (Display*)wxdisplay;
+    wxEventLoop evtLoop;

 
 

-    Display *dpy=(Display*) wnd->GetXDisplay();
-    Window win=(Window) wnd->GetXWindow();
-    XEvent event;
-    XFlush(dpy);
-    if (wnd->GetMainWidget())
-    {
-        XmUpdateDisplay((Widget)(wnd->GetMainWidget()));
-    }
+    XSync (display, False);

 
 

-    bool hadEvents = FALSE;
-    while( XCheckMaskEvent(dpy,
-                           ButtonPressMask|ButtonReleaseMask|ButtonMotionMask|
-                           PointerMotionMask|KeyPressMask|KeyReleaseMask,
-                           &event) )
+    while (evtLoop.Pending())

     {
     {

-        if ( event.xany.window == win )
-        {
-            hadEvents = TRUE;
-
-            XtDispatchEvent(&event);
-        }
+        XFlush (display);
+        evtLoop.Dispatch();

     }
     }

-
-    return hadEvents;

 }
 }

-#endif

 
 // ----------------------------------------------------------------------------
 // wxExecute stuff
 
 // ----------------------------------------------------------------------------
 // wxExecute stuff


@@ -171,25 +131,37 @@ 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();
+    if (display)
+    {
+        info.versionMajor = ProtocolVersion (display);
+        info.versionMinor = ProtocolRevision (display);
+    }
+    info.os = wxMOTIF_X;
+    return info;

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


@@ -228,7 +200,7 @@ static char * GetIniFile (char *dest, const char *filename)
     return dest;
 }
 
     return dest;
 }
 

-static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
+static char *GetResourcePath(char *buf, const char *name, bool create = false)

 {
     if (create && wxFileExists (name) ) {
         strcpy(buf, name);
 {
     if (create && wxFileExists (name) ) {
         strcpy(buf, name);


@@ -271,7 +243,7 @@ wxFlushResources (void)
     {
         const char *file = node->GetKeyString();
         // If file doesn't exist, create it first.
     {
         const char *file = node->GetKeyString();
         // If file doesn't exist, create it first.

-        (void)GetResourcePath(nameBuffer, file, TRUE);
+        (void)GetResourcePath(nameBuffer, file, true);

 
         XrmDatabase database = (XrmDatabase) node->Data ();
         XrmPutFileDatabase (database, nameBuffer);
 
         XrmDatabase database = (XrmDatabase) node->Data ();
         XrmPutFileDatabase (database, nameBuffer);


@@ -308,7 +280,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, const wxStr
     strcat (resName, entry.c_str());
 
     XrmPutStringResource (&database, resName, value);
     strcat (resName, entry.c_str());
 
     XrmPutStringResource (&database, resName, value);

-    return TRUE;
+    return true;

 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)


@@ -336,7 +308,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);
     }
 


@@ -385,9 +357,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
 
         *value = new char[xvalue.size + 1];
         strncpy (*value, xvalue.addr, (int) xvalue.size);
 
         *value = new char[xvalue.size + 1];
         strncpy (*value, xvalue.addr, (int) xvalue.size);

-        return TRUE;
+        return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)


@@ -398,9 +370,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
     {
         *value = (float)strtod(s, NULL);
         delete[] s;
     {
         *value = (float)strtod(s, NULL);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)


@@ -411,9 +383,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
     {
         *value = strtol(s, NULL, 10);
         delete[] s;
     {
         *value = strtol(s, NULL, 10);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)


@@ -425,18 +397,18 @@ 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')
         // Handle True, False here
         // True, Yes, Enables, Set or  Activated
         if (*s == 'T' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')

-            *value = TRUE;
+            *value = true;

         // False, No, Disabled, Reset, Cleared, Deactivated
         else if (*s == 'F' || *s == 'N' || *s == 'D' || *s == 'R' || *s == 'C')
         // False, No, Disabled, Reset, Cleared, Deactivated
         else if (*s == 'F' || *s == 'N' || *s == 'D' || *s == 'R' || *s == 'C')

-            *value = FALSE;
+            *value = false;

         // Handle as Integer
         else
             *value = (int) strtol (s, NULL, 10);
         delete[] s;
         // Handle as Integer
         else
             *value = (int) strtol (s, NULL, 10);
         delete[] s;

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 void wxXMergeDatabases (wxApp * theApp, Display * display)
 }
 
 void wxXMergeDatabases (wxApp * theApp, Display * display)


@@ -523,7 +495,7 @@ wxSetDefaultResources (const Widget w, const char **resourceSpec, const char *na
     {
 #if (XlibSpecificationRelease>=5)
         XrmDatabase db = XtDatabase (dpy);
     {
 #if (XlibSpecificationRelease>=5)
         XrmDatabase db = XtDatabase (dpy);

-        XrmCombineDatabase (rdb, &db, FALSE);
+        XrmCombineDatabase (rdb, &db, False);

 #else
         XrmMergeDatabases (dpy->db, &rdb);
         dpy->db = rdb;
 #else
         XrmMergeDatabases (dpy->db, &rdb);
         dpy->db = rdb;


@@ -548,8 +520,8 @@ void wxGetMousePosition( int* x, int* y )
 #else
     XMotionEvent xev;
     Window root, child;
 #else
     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),
                   &root, &child,
                   &(xev.x_root), &(xev.y_root),
                   &(xev.x),      &(xev.y),


@@ -559,7 +531,7 @@ void wxGetMousePosition( int* x, int* y )
 #endif
 };
 
 #endif
 };
 

-// Return TRUE if we have a colour display
+// Return true if we have a colour display

 bool wxColourDisplay()
 {
     return wxDisplayDepth() > 1;
 bool wxColourDisplay()
 {
     return wxDisplayDepth() > 1;


@@ -568,7 +540,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));
 }


@@ -576,7 +548,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));


@@ -586,7 +558,7 @@ void wxDisplaySize(int *width, int *height)
 
 void wxDisplaySizeMM(int *width, int *height)
 {
 
 void wxDisplaySizeMM(int *width, int *height)
 {

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

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


@@ -614,8 +586,6 @@ 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();
     return NULL;
     else if (wxTheApp)
         return wxTheApp->GetInitialDisplay();
     return NULL;


@@ -625,11 +595,11 @@ bool wxSetDisplay(const wxString& display_name)
 {
     gs_displayName = display_name;
 
 {
     gs_displayName = display_name;
 

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

     {
         gs_currentDisplay = NULL;
 
     {
         gs_currentDisplay = NULL;
 

-        return TRUE;
+        return true;

     }
     else
     {
     }
     else
     {


@@ -650,10 +620,10 @@ bool wxSetDisplay(const wxString& display_name)
         if (display)
         {
             gs_currentDisplay = (WXDisplay*) display;
         if (display)
         {
             gs_currentDisplay = (WXDisplay*) display;

-            return TRUE;
+            return true;

         }
         else
         }
         else

-            return FALSE;
+            return false;

     }
 }
 
     }
 }
 


@@ -667,249 +637,6 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
     return wxGenericFindWindowAtPoint(pt);
 }
 
     return wxGenericFindWindowAtPoint(pt);
 }
 

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

 // ----------------------------------------------------------------------------
 // Some colour manipulation routines
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Some colour manipulation routines
 // ----------------------------------------------------------------------------


@@ -1033,22 +760,22 @@ wxString wxGetXEventName(XEvent& event)
     return str;
 #else
     int type = event.xany.type;
     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;
+    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
 #endif
 }
 #endif


@@ -1063,6 +790,7 @@ char wxFindMnemonic (const char *s)
     char mnem = 0;
     int len = strlen (s);
     int i;
     char mnem = 0;
     int len = strlen (s);
     int i;

+

     for (i = 0; i < len; i++)
     {
         if (s[i] == '&')
     for (i = 0; i < len; i++)
     {
         if (s[i] == '&')


@@ -1080,19 +808,18 @@ char wxFindMnemonic (const char *s)
     return mnem;
 }
 
     return mnem;
 }
 

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

 {
 {

+#if 1

     // VZ: this function returns incorrect keysym which completely breaks kbd
     //     handling
     return NULL;
     // 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;

 
 

-#if 0
-   // 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:
 
     /*
     Now we need to format it as X standard:
 


@@ -1103,62 +830,68 @@ char * wxFindAccelerator (const char *s)
         Alt+k        --> Meta<Key>k
         Ctrl+Shift+A --> Ctrl Shift<Key>A
 
         Alt+k        --> Meta<Key>k
         Ctrl+Shift+A --> Ctrl Shift<Key>A
 

+        and handle Ctrl-N & similia

     */
 
     static char buf[256];
     */
 
     static char buf[256];

+

     buf[0] = '\0';
     buf[0] = '\0';

-    char *tmp = copystring (s);
-    s = tmp;
-    char *p = tmp;
+    wxString tmp = s + 1; // skip TAB
+    size_t index = 0;

 
 

-    while (1)
+    while( index < tmp.length() )

     {
     {

-        while (*p && *p != '+')
-            p++;
-        if (*p)
-        {
-            *p = '\0';
-            if (buf[0])
-                strcat (buf, " ");
-            if (strcmp (s, "Alt"))
-                strcat (buf, s);
-            else
-                strcat (buf, "Meta");
-            s = p++;
-        }
-        else
+        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, s);
-            break;
+            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;

     }
     }

-    delete[]tmp;
-    return buf;
+
+    return NULL;

 #endif
 }
 
 XmString wxFindAcceleratorText (const char *s)
 {
 #endif
 }
 
 XmString wxFindAcceleratorText (const char *s)
 {

+#if 1

     // VZ: this function returns incorrect keysym which completely breaks kbd
     //     handling
     return NULL;
     // 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 0
-   // 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;
+    if( !s ) return NULL;
+
+    return wxStringToXmString( s + 1 ); // skip TAB!

 #endif
 }
 
 #endif
 }
 

-

 // Change a widget's foreground and background colours.
 // 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


@@ -1199,20 +932,12 @@ extern void wxDoChangeFont(WXWidget widget, wxFont& font)
 #if !wxCHECK_LESSTIF() || wxCHECK_LESSTIF_VERSION( 0, 93 )
     Widget w = (Widget)widget;
     XtVaSetValues( w,
 #if !wxCHECK_LESSTIF() || wxCHECK_LESSTIF_VERSION( 0, 93 )
     Widget w = (Widget)widget;
     XtVaSetValues( w,

-                   wxFont::GetFontTag(), font.GetFontType( XtDisplay(w) ),
+                   wxFont::GetFontTag(), font.GetFontTypeC( XtDisplay(w) ),

                    NULL );
 #endif
 
 }
 
                    NULL );
 #endif
 
 }
 

-bool wxWindowIsVisible(Window win)
-{
-    XWindowAttributes wa;
-    XGetWindowAttributes(wxGlobalDisplay(), win, &wa);
-
-    return (wa.map_state == IsViewable);
-}
-

 wxString wxXmStringToString( const XmString& xmString )
 {
     char *txt;
 wxString wxXmStringToString( const XmString& xmString )
 {
     char *txt;


@@ -1254,11 +979,53 @@ wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour)
     destDC.SelectObject(newBitmap);
 
     wxBrush brush(colour, wxSOLID);
     destDC.SelectObject(newBitmap);
 
     wxBrush brush(colour, wxSOLID);

-    // destDC.SetOptimization(FALSE);

     destDC.SetBackground(brush);
     destDC.Clear();
     destDC.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(),
     destDC.SetBackground(brush);
     destDC.Clear();
     destDC.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(),

-                &srcDC, 0, 0, wxCOPY, TRUE);
+                &srcDC, 0, 0, wxCOPY, true);

 
     return newBitmap;
 }
 
     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;
+}