If -1 is used for width/height, use best size.

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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 28768bbaa0c586e21e7eafbda1857befde133570..accefb6a1a825435d3cc509561f86c45aec0f119 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -23,8 +23,8 @@
 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY

-#define XtWINDOW XTWINDOW
-#define XtSreen XTSCREEN
+#define XtWindow XTWINDOW
+#define XtScreen XTSCREEN

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


@@ -50,6 +50,25 @@
     #include "wx/dnd.h"
 #endif
 
     #include "wx/dnd.h"
 #endif
 

+// DoSetSizeIntr and CanvasSetSizeIntr
+// PROBLEM:
+// under Motif composite controls (such as wxCalendarCtrl or generic wxSpinCtrl
+// don't work and/or segfault because
+// 1) wxWindow::Create calls SetSize,
+//    which results in a call to DoSetSize much earlier than in the other ports
+// 2) if wxWindow::Create is called (wxControl::Create calls it)
+//    then DoSetSize is never called, causing layout problems in composite
+//    controls
+//
+// SOLUTION:
+// 1) don't call SetSize, DoSetSize, DoMoveWindow, DoGetPosition,
+//    DoSetPosition directly or indirectly from wxWindow::Create
+// 2) call DoMoveWindow from DoSetSize, allowing controls to override it,
+//    but make wxWindow::DoMoveWindow a no-op if it is called from
+//    an overridden DoMoveWindow (i.e. wxFoo::DoMoveWindow calls
+//    wxWindow::DoMoveWindow; this is to preserve the behaviour
+//    before this change
+

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


@@ -80,6 +99,8 @@ static const int SCROLL_MARGIN = 4;
 // ----------------------------------------------------------------------------
 
 extern wxHashTable *wxWidgetHashTable;
 // ----------------------------------------------------------------------------
 
 extern wxHashTable *wxWidgetHashTable;

+static wxWindow* g_captureWindow = NULL;
+

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


@@ -151,17 +172,24 @@ void wxWindow::UnmanageAndDestroy(WXWidget widget)
     }
 }
 
     }
 }
 

-bool wxWindow::MapOrUnmap(WXWidget widget, bool map)
+bool wxWindow::MapOrUnmap(WXWidget widget, bool domap)

 {
     Widget w = (Widget)widget;
     if ( !w )
         return FALSE;
 
 {
     Widget w = (Widget)widget;
     if ( !w )
         return FALSE;
 

-    if ( map )
+    if ( domap )

         XtMapWidget(w);
     else
         XtUnmapWidget(w);
 
         XtMapWidget(w);
     else
         XtUnmapWidget(w);
 

+    //   Rationale: a lot of common operations (including but not
+    // limited to moving, resizing and appending items to a listbox)
+    // unmamange the widget, do their work, then manage it again.
+    // This means that, for example adding an item to a listbox will show it,
+    // or that most controls are shown every time they are moved or resized!
+    XtSetMappedWhenManaged( w, domap );
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -224,7 +252,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 
     parent->AddChild(this);
 
 
     parent->AddChild(this);
 

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

     m_foregroundColour = *wxBLACK;
 
     //// TODO: we should probably optimize by only creating a
     m_foregroundColour = *wxBLACK;
 
     //// TODO: we should probably optimize by only creating a


@@ -355,7 +383,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 
     // Scrolled widget needs to have its colour changed or we get a little blue
     // square where the scrollbars abutt
 
     // Scrolled widget needs to have its colour changed or we get a little blue
     // square where the scrollbars abutt

-    wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+    wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

     DoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
     DoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
 
     DoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
     DoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
 


@@ -374,15 +402,17 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     // Without this, the cursor may not be restored properly (e.g. in splitter
     // sample).
     SetCursor(*wxSTANDARD_CURSOR);
     // Without this, the cursor may not be restored properly (e.g. in splitter
     // sample).
     SetCursor(*wxSTANDARD_CURSOR);

-    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
-    SetSize(pos.x, pos.y, size.x, size.y);
-
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+    DoSetSizeIntr(pos.x, pos.y, size.x,size.y, wxSIZE_AUTO, TRUE);

     return TRUE;
 }
 
 // Destructor
 wxWindow::~wxWindow()
 {
     return TRUE;
 }
 
 // Destructor
 wxWindow::~wxWindow()
 {

+    if (g_captureWindow == this)
+        g_captureWindow = NULL;
+    

     m_isBeingDeleted = TRUE;
     
     // Motif-specific actions first
     m_isBeingDeleted = TRUE;
     
     // Motif-specific actions first


@@ -414,7 +444,7 @@ wxWindow::~wxWindow()
         if (w)
         {
             XtDestroyWidget(w);
         if (w)
         {
             XtDestroyWidget(w);

-           m_drawingArea = (WXWidget) 0;
+            m_drawingArea = (WXWidget) 0;

         }
 
         // Only if we're _really_ a canvas (not a dialog box/panel)
         }
 
         // Only if we're _really_ a canvas (not a dialog box/panel)


@@ -426,18 +456,18 @@ wxWindow::~wxWindow()
         if (m_hScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_hScrollBar);
         if (m_hScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_hScrollBar);

-           XtUnmanageChild((Widget) m_hScrollBar);
+            XtUnmanageChild((Widget) m_hScrollBar);

         }
         if (m_vScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_vScrollBar);
         }
         if (m_vScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_vScrollBar);

-           XtUnmanageChild((Widget) m_vScrollBar);
+            XtUnmanageChild((Widget) m_vScrollBar);

         }
 
         if (m_hScrollBar)
         }
 
         if (m_hScrollBar)

-           XtDestroyWidget((Widget) m_hScrollBar);
+            XtDestroyWidget((Widget) m_hScrollBar);

         if (m_vScrollBar)
         if (m_vScrollBar)

-           XtDestroyWidget((Widget) m_vScrollBar);
+            XtDestroyWidget((Widget) m_vScrollBar);

 
         UnmanageAndDestroy(m_scrolledWindow);
 
 
         UnmanageAndDestroy(m_scrolledWindow);
 


@@ -504,7 +534,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
 
         m_hScrollBar = (WXWidget) hScrollBar;
 
 
         m_hScrollBar = (WXWidget) hScrollBar;
 

-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

         DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
 
         XtRealizeWidget(hScrollBar);
         DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
 
         XtRealizeWidget(hScrollBar);


@@ -539,7 +569,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
             NULL);
 
         m_vScrollBar = (WXWidget) vScrollBar;
             NULL);
 
         m_vScrollBar = (WXWidget) vScrollBar;

-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

         DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
 
         XtRealizeWidget(vScrollBar);
         DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
 
         XtRealizeWidget(vScrollBar);


@@ -708,8 +738,9 @@ wxString wxWindow::GetTitle() const
     return wxString(title);
 }
 
     return wxString(title);
 }
 

-void wxWindow::CaptureMouse()
+void wxWindow::DoCaptureMouse()

 {
 {

+    g_captureWindow = this;

     if ( m_winCaptured )
         return;
 
     if ( m_winCaptured )
         return;
 


@@ -720,8 +751,9 @@ void wxWindow::CaptureMouse()
     m_winCaptured = TRUE;
 }
 
     m_winCaptured = TRUE;
 }
 

-void wxWindow::ReleaseMouse()
+void wxWindow::DoReleaseMouse()

 {
 {

+    g_captureWindow = NULL;

     if ( !m_winCaptured )
         return;
 
     if ( !m_winCaptured )
         return;
 


@@ -810,8 +842,9 @@ int wxWindow::GetScrollRange(int orient) const
     Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
     wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
 
     Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
     wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
 

-    int range;
-    XtVaGetValues(scrollBar, XmNmaximum, &range, NULL);
+    int range = 0;
+    if (scrollBar) 
+        XtVaGetValues(scrollBar, XmNmaximum, &range, NULL);

     return range;
 }
 
     return range;
 }
 


@@ -932,12 +965,12 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
     while (cnode)
     {
         wxWindow *child = (wxWindow*) cnode->Data();
     while (cnode)
     {
         wxWindow *child = (wxWindow*) cnode->Data();

-       int sx = 0;
-       int sy = 0;
-       child->GetSize( &sx, &sy );
+        int sx = 0;
+        int sy = 0;
+        child->GetSize( &sx, &sy );

         wxPoint pos( child->GetPosition() );
         wxPoint pos( child->GetPosition() );

-       child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );
-       cnode = cnode->Next();
+        child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );
+        cnode = cnode->Next();

     }
 
     int x1 = (dx >= 0) ? x : x - dx;
     }
 
     int x1 = (dx >= 0) ? x : x - dx;


@@ -1181,6 +1214,34 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
     XmMenuPosition (menuWidget, &event);
     XtManageChild (menuWidget);
 
     XmMenuPosition (menuWidget, &event);
     XtManageChild (menuWidget);
 

+    XEvent x_event;
+    // The ID of a pop-up menu is 1 when active, and is set to 0 by the
+    // idle-time destroy routine.
+    // Waiting until this ID changes causes this function to block until
+    // the menu has been dismissed and the widgets cleaned up.
+    // In other words, once this routine returns, it is safe to delete
+    // the menu object.
+    // Ian Brown <ian.brown@printsoft.de>
+    while (menu->GetId() == 1)
+    {
+        XtAppNextEvent( (XtAppContext) wxTheApp->GetAppContext(), &x_event);
+
+        wxTheApp->ProcessXEvent((WXEvent*) & x_event);
+
+        if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0)
+        {
+            if (!wxTheApp->ProcessIdle())
+            {
+#if wxUSE_THREADS
+                // leave the main loop to give other threads a chance to
+                // perform their GUI work
+                wxMutexGuiLeave();
+                wxUsleep(20);
+                wxMutexGuiEnter();
+#endif
+            }
+        }
+    }

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -1268,11 +1329,20 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
 }
 
 void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 }
 
 void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)

+{
+    DoSetSizeIntr(x, y, width, height, sizeFlags, FALSE);
+}
+
+void wxWindow::DoSetSizeIntr(int x, int y, int width, int height,
+                             int sizeFlags, bool fromCtor)

 {
     // A bit of optimization to help sort out the flickers.
 {
     // A bit of optimization to help sort out the flickers.

-    int oldX, oldY, oldW, oldH;
-    GetSize(& oldW, & oldH);
-    GetPosition(& oldX, & oldY);
+    int oldX = -1, oldY = -1, oldW = -1, oldH = -1;
+    if( !fromCtor )
+    {
+        GetSize(& oldW, & oldH);
+        GetPosition(& oldX, & oldY);
+    }

 
     if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
     {
 
     if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
     {


@@ -1299,7 +1369,8 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     {
         if (m_drawingArea)
         {
     {
         if (m_drawingArea)
         {

-            CanvasSetSize(x, y, width, height, sizeFlags);
+            CanvasSetSizeIntr(x, y, width, height, sizeFlags, fromCtor);
+            if( !fromCtor ) DoMoveWindow(x, y, width, height);

             return;
         }
 
             return;
         }
 


@@ -1359,17 +1430,6 @@ wxPoint wxWindow::GetClientAreaOrigin() const
     return wxPoint(0, 0);
 }
 
     return wxPoint(0, 0);
 }
 

-// Makes an adjustment to the window position (for example, a frame that has
-// a toolbar that it manages itself).
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
-{
-    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
-    {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        x += pt.x; y += pt.y;
-    }
-}
-

 void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
 {
     m_minWidth = minW;
 void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
 {
     m_minWidth = minW;


@@ -1402,6 +1462,15 @@ void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, in
 
 void wxWindow::DoMoveWindow(int x, int y, int width, int height)
 {
 
 void wxWindow::DoMoveWindow(int x, int y, int width, int height)
 {

+    // see the top of the file, near DoSetSizeIntr
+    if (m_drawingArea)
+        return;
+
+    if (width == 0)
+        width = 1;
+    if (height == 0)
+        height = 1;
+

     XtVaSetValues((Widget)GetTopWidget(),
                   XmNx, x,
                   XmNy, y,
     XtVaSetValues((Widget)GetTopWidget(),
                   XmNx, x,
                   XmNy, y,


@@ -1454,7 +1523,7 @@ void wxWindow::GetTextExtent(const wxString& string,
 
     wxCHECK_RET( fontToUse->Ok(), "valid window font needed" );
     
 
     wxCHECK_RET( fontToUse->Ok(), "valid window font needed" );
     

-    WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay());
+    WXFontStructPtr pFontStruct = fontToUse->GetFontStruct(1.0, GetXDisplay());

 
     int direction, ascent, descent2;
     XCharStruct overall;
 
     int direction, ascent, descent2;
     XCharStruct overall;


@@ -1669,8 +1738,8 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
         wxAcceleratorEntry* entry = & (entries[i]);
         if (entry->MatchesEvent(event))
         {
         wxAcceleratorEntry* entry = & (entries[i]);
         if (entry->MatchesEvent(event))
         {

-            // Bingo, we have a match. Now find a control that matches the entry
-            // command id.
+            // Bingo, we have a match. Now find a control that matches the
+            // entry command id.

 
             // Need to go up to the top of the window hierarchy, since it might
             // be e.g. a menu item
 
             // Need to go up to the top of the window hierarchy, since it might
             // be e.g. a menu item


@@ -2099,22 +2168,21 @@ static void wxCanvasInputEvent(Widget drawingArea,
                     {
                         // I have a dclick
                         canvas->SetLastClick(0, ts);
                     {
                         // I have a dclick
                         canvas->SetLastClick(0, ts);

-                        switch ( eventType )
+
+                        wxEventType typeDouble;
+                        if ( eventType == wxEVT_LEFT_DOWN )
+                            typeDouble = wxEVT_LEFT_DCLICK;
+                        else if ( eventType == wxEVT_MIDDLE_DOWN )
+                            typeDouble = wxEVT_MIDDLE_DCLICK;
+                        else if ( eventType == wxEVT_RIGHT_DOWN )
+                            typeDouble = wxEVT_RIGHT_DCLICK;
+                        else
+                            typeDouble = wxEVT_NULL;
+
+                        if ( typeDouble != wxEVT_NULL )

                         {
                         {

-                        case wxEVT_LEFT_DOWN:
-                            wxevent.SetEventType(wxEVT_LEFT_DCLICK);
-                            break;
-                        case wxEVT_MIDDLE_DOWN:
-                            wxevent.SetEventType(wxEVT_MIDDLE_DCLICK);
-                            break;
-                        case wxEVT_RIGHT_DOWN:
-                            wxevent.SetEventType(wxEVT_RIGHT_DCLICK);
-                            break;
-
-                        default :
-                            break;
+                            wxevent.SetEventType(typeDouble);

                         }
                         }

-

                     }
                     else
                     {
                     }
                     else
                     {


@@ -2140,32 +2208,8 @@ static void wxCanvasInputEvent(Widget drawingArea,
       }
     case KeyPress:
         {
       }
     case KeyPress:
         {

-            KeySym keySym;
-#if 0
-            XComposeStatus compose;
-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, &compose);
-#endif // 0
-
-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL);
-            int id = wxCharCodeXToWX (keySym);
-
-            wxEventType eventType = wxEVT_CHAR;
-
-            wxKeyEvent event (eventType);
-
-            if (local_event.xkey.state & ShiftMask)
-                event.m_shiftDown = TRUE;
-            if (local_event.xkey.state & ControlMask)
-                event.m_controlDown = TRUE;
-            if (local_event.xkey.state & Mod3Mask)
-                event.m_altDown = TRUE;
-            if (local_event.xkey.state & Mod1Mask)
-                event.m_metaDown = TRUE;
-            event.SetEventObject(canvas);
-            event.m_keyCode = id;
-            event.SetTimestamp(local_event.xkey.time);
-
-            if (id > -1)
+            wxKeyEvent event (wxEVT_CHAR);
+            if (wxTranslateKeyEvent (event, canvas, (Widget) 0, &local_event))

             {
                 // Implement wxFrame::OnCharHook by checking ancestor.
                 wxWindow *parent = canvas->GetParent();
             {
                 // Implement wxFrame::OnCharHook by checking ancestor.
                 wxWindow *parent = canvas->GetParent();


@@ -2194,25 +2238,8 @@ static void wxCanvasInputEvent(Widget drawingArea,
         }
     case KeyRelease:
         {
         }
     case KeyRelease:
         {

-            KeySym keySym;
-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL);
-            int id = wxCharCodeXToWX (keySym);
-

             wxKeyEvent event (wxEVT_KEY_UP);
             wxKeyEvent event (wxEVT_KEY_UP);

-
-            if (local_event.xkey.state & ShiftMask)
-                event.m_shiftDown = TRUE;
-            if (local_event.xkey.state & ControlMask)
-                event.m_controlDown = TRUE;
-            if (local_event.xkey.state & Mod3Mask)
-                event.m_altDown = TRUE;
-            if (local_event.xkey.state & Mod1Mask)
-                event.m_metaDown = TRUE;
-            event.SetEventObject(canvas);
-            event.m_keyCode = id;
-            event.SetTimestamp(local_event.xkey.time);
-
-            if (id > -1)
+            if (wxTranslateKeyEvent (event, canvas, (Widget) 0, &local_event))

             {
                 canvas->GetEventHandler()->ProcessEvent (event);
             }
             {
                 canvas->GetEventHandler()->ProcessEvent (event);
             }


@@ -2374,13 +2401,23 @@ void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event,
 // CanvaseXXXSize() functions
 // ----------------------------------------------------------------------------
 
 // CanvaseXXXSize() functions
 // ----------------------------------------------------------------------------
 

+void wxWindow::CanvasSetSize(int x, int y, int w, int h, int sizeFlags)
+{
+    CanvasSetSizeIntr(x, y, w, h, sizeFlags, FALSE);
+}
+

 // SetSize, but as per old wxCanvas (with drawing widget etc.)
 // SetSize, but as per old wxCanvas (with drawing widget etc.)

-void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags)
+void wxWindow::CanvasSetSizeIntr(int x, int y, int w, int h, int sizeFlags,
+                                 bool fromCtor)

 {
     // A bit of optimization to help sort out the flickers.
 {
     // A bit of optimization to help sort out the flickers.

-    int oldX, oldY, oldW, oldH;
-    GetSize(& oldW, & oldH);
-    GetPosition(& oldX, & oldY);
+    int oldX = -1, oldY = -1, oldW = -1, oldH = -1;
+    // see the top of the file, near DoSetSizeIntr
+    if( !fromCtor )
+    {
+        GetSize(& oldW, & oldH);
+        GetPosition(& oldX, & oldY);
+    }

 
     bool useOldPos = FALSE;
     bool useOldSize = FALSE;
 
     bool useOldPos = FALSE;
     bool useOldSize = FALSE;


@@ -2656,22 +2693,12 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
                 {
                     // I have a dclick
                     win->SetLastClick(0, ts);
                 {
                     // I have a dclick
                     win->SetLastClick(0, ts);

-                    switch ( eventType )
-                    {
-                        case wxEVT_LEFT_DOWN:
-                            eventType = wxEVT_LEFT_DCLICK;
-                            break;
-                        case wxEVT_MIDDLE_DOWN:
-                            eventType = wxEVT_MIDDLE_DCLICK;
-                            break;
-                        case wxEVT_RIGHT_DOWN:
-                            eventType = wxEVT_RIGHT_DCLICK;
-                            break;
-
-                        default :
-                            break;
-                    }
-                    
+                    if ( eventType == wxEVT_LEFT_DOWN )
+                        eventType = wxEVT_LEFT_DCLICK;
+                    else if ( eventType == wxEVT_MIDDLE_DOWN )
+                        eventType = wxEVT_MIDDLE_DCLICK;
+                    else if ( eventType == wxEVT_RIGHT_DOWN )
+                        eventType = wxEVT_RIGHT_DCLICK;

                 }
                 else
                 {
                 }
                 else
                 {


@@ -2765,6 +2792,10 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget WXUNUSED(wid
 #endif // 0
             (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
             int id = wxCharCodeXToWX (keySym);
 #endif // 0
             (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
             int id = wxCharCodeXToWX (keySym);

+            // id may be WXK_xxx code - these are outside ASCII range, so we
+            // can't just use toupper() on id
+            if (id >= 'a' && id <= 'z')
+                id = toupper(id);

 
             if (xevent->xkey.state & ShiftMask)
                 wxevent.m_shiftDown = TRUE;
 
             if (xevent->xkey.state & ShiftMask)
                 wxevent.m_shiftDown = TRUE;


@@ -2874,7 +2905,7 @@ void wxWindow::ChangeBackgroundColour()
         DoChangeBackgroundColour(m_scrolledWindow, m_backgroundColour);
         // Have to set the scrollbar colours back since
         // the scrolled window seemed to change them
         DoChangeBackgroundColour(m_scrolledWindow, m_backgroundColour);
         // Have to set the scrollbar colours back since
         // the scrolled window seemed to change them

-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

 
         if (m_hScrollBar)
             DoChangeBackgroundColour(m_hScrollBar, backgroundColour);
 
         if (m_hScrollBar)
             DoChangeBackgroundColour(m_hScrollBar, backgroundColour);


@@ -2962,8 +2993,9 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
         int width, height, width1, height1;
         GetSize(& width, & height);
 
         int width, height, width1, height1;
         GetSize(& width, & height);
 

-        // lesstif 0.87 hangs here
-#ifndef LESSTIF_VERSION
+        // lesstif 0.87 hangs here, but 0.93 does not
+#if !defined(LESSTIF_VERSION) \
+    || (defined(LesstifVersion) && LesstifVersion >= 93)

         XtVaSetValues (w,
             XmNfontList, (XmFontList) m_font.GetFontList(1.0, XtDisplay(w)),
             NULL);
         XtVaSetValues (w,
             XmNfontList, (XmFontList) m_font.GetFontList(1.0, XtDisplay(w)),
             NULL);


@@ -2984,15 +3016,45 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
 wxWindow *wxGetActiveWindow()
 {
     // TODO
 wxWindow *wxGetActiveWindow()
 {
     // TODO

+    wxFAIL_MSG("Not implemented");

     return NULL;
 }
 
     return NULL;
 }
 

+/* static */
+wxWindow *wxWindowBase::GetCapture()
+{
+    return (wxWindow *)g_captureWindow;
+}
+
+
+// Find the wxWindow at the current mouse position, returning the mouse
+// position.
+wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+{
+    return wxFindWindowAtPoint(wxGetMousePosition());
+}
+
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
+{
+    Display *display = (Display*) wxGetDisplay();
+    Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
+    Window rootReturn, childReturn;
+    int rootX, rootY, winX, winY;
+    unsigned int maskReturn;
+
+    XQueryPointer (display,
+                   rootWindow,
+                   &rootReturn,
+                   &childReturn,
+                   &rootX, &rootY, &winX, &winY, &maskReturn);
+    return wxPoint(rootX, rootY);
+}
+
+

 // ----------------------------------------------------------------------------
 // wxNoOptimize: switch off size optimization
 // ----------------------------------------------------------------------------
 
 int wxNoOptimize::ms_count = 0;
 
 // ----------------------------------------------------------------------------
 // wxNoOptimize: switch off size optimization
 // ----------------------------------------------------------------------------
 
 int wxNoOptimize::ms_count = 0;
 

-
-
-