]> git.saurik.com Git - wxWidgets.git/blobdiff - src/motif/window.cpp
replace apple extended code
[wxWidgets.git] / src / motif / window.cpp
index d4da1486be5f35fab6f653ee68d8eeac55af3756..c4babdf5dbf5deb0aed2e2e79a2b37b7dd65c939 100644 (file)
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "window.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#define XtScreen XTSCREEN
+#endif
+
 #include "wx/setup.h"
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"
 #include "wx/app.h"
-#include "wx/panel.h"
 #include "wx/layout.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
 #include "wx/button.h"
 #include "wx/settings.h"
-#include "wx/msgdlg.h"
 #include "wx/frame.h"
 #include "wx/scrolwin.h"
-
+#include "wx/module.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"
+#include "wx/evtloop.h"
+#include "wx/hash.h"
 
 #if  wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 #endif
 
+// DoSetSizeIntr and DoMoveWindowIntr
+// PROBLEM:
+// under Motif composite controls (such as wxCalendarCtrl or generic wxSpinCtrl
+// did nott work and/or segfaulted 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
+
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Xm.h>
 
 #include <Xm/DrawingA.h>
 #include <Xm/ScrollBar.h>
 #include <Xm/Frame.h>
 #include <Xm/Label.h>
+#include <Xm/RowColumn.h>           // for XmMenuPosition
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 #include "wx/motif/private.h"
 
@@ -66,7 +95,9 @@ static const int SCROLL_MARGIN = 4;
 // global variables for this module
 // ----------------------------------------------------------------------------
 
-static wxHashTable *gs_wxWidgetHashTable;
+extern wxHashTable *wxWidgetHashTable;
+static wxWindow* g_captureWindow = NULL;
+
 
 // ----------------------------------------------------------------------------
 // private functions
@@ -77,7 +108,7 @@ static void wxCanvasInputEvent(Widget drawingArea, XtPointer data, XmDrawingArea
 static void wxCanvasMotionEvent(Widget, XButtonEvent * event);
 static void wxCanvasEnterLeave(Widget drawingArea, XtPointer clientData, XCrossingEvent * event);
 static void wxScrollBarCallback(Widget widget, XtPointer clientData,
-                                XmScaleCallbackStruct *cbs);
+                                XmScrollBarCallbackStruct *cbs);
 static void wxPanelItemEventHandler(Widget    wid,
                                     XtPointer client_data,
                                     XEvent*   event,
@@ -113,14 +144,11 @@ static int str16len(const char *s)
 // event tables
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
 
-    BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
+    BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
         EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-        EVT_IDLE(wxWindow::OnIdle)
     END_EVENT_TABLE()
-#endif // USE_SHARED_LIBRARY
 
 // ============================================================================
 // implementation
@@ -140,16 +168,31 @@ 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;
 
-    if ( map )
-        XtMapWidget(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 );
+
+    // if the widget is not unmanaged, it still intercepts
+    // mouse events, even if it is not mapped (and hence invisible)
+    if ( domap )
+    {
+        XtManageChild(w);
+        // XtMapWidget(w);
+    }
     else
-        XtUnmapWidget(w);
+    {
+        XtUnmanageChild(w);
+        // XtUnmapWidget(w);
+    }
 
     return TRUE;
 }
@@ -160,30 +203,20 @@ bool wxWindow::MapOrUnmap(WXWidget widget, bool map)
 
 void wxWindow::Init()
 {
-    // generic initializations first
-    InitBase();
-
     // Motif-specific
     m_needsRefresh = TRUE;
     m_mainWidget = (WXWidget) 0;
 
-    m_button1Pressed =
-    m_button2Pressed =
-    m_button3Pressed = FALSE;
-
     m_winCaptured = FALSE;
 
     m_isShown = TRUE;
-
+    
     m_hScrollBar =
     m_vScrollBar =
     m_borderWidget =
     m_scrolledWindow =
     m_drawingArea = (WXWidget) 0;
 
-    m_hScroll =
-    m_vScroll = FALSE;
-
     m_scrollPosX =
     m_scrollPosY = 0;
 
@@ -196,7 +229,6 @@ void wxWindow::Init()
 
     m_lastTS = 0;
     m_lastButton = 0;
-    m_canAddEventHandler = FALSE;
 }
 
 // real construction (Init() must have been called before!)
@@ -208,11 +240,11 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 {
     wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" );
 
-    CreateBase(parent, id, pos, size, style, name);
+    CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
 
     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
@@ -243,16 +275,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
-    if (style & wxBORDER)
-    {
-        m_borderWidget = (WXWidget)XtVaCreateManagedWidget
-                                   (
-                                    "canvasBorder",
-                                    xmFrameWidgetClass, parentWidget,
-                                    XmNshadowType, XmSHADOW_IN,
-                                    NULL
-                                   );
-    }
+    m_borderWidget = wxCreateBorderWidget( (WXWidget)parentWidget, style );
 
     m_scrolledWindow = (WXWidget)XtVaCreateManagedWidget
                                  (
@@ -306,12 +329,6 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     XtAddCallback ((Widget) m_drawingArea, XmNexposeCallback, (XtCallbackProc) wxCanvasRepaintProc, (XtPointer) this);
     XtAddCallback ((Widget) m_drawingArea, XmNinputCallback, (XtCallbackProc) wxCanvasInputEvent, (XtPointer) this);
 
-    // TODO?
-#if 0
-    display = XtDisplay (scrolledWindow);
-    xwindow = XtWindow (drawingArea);
-#endif // 0
-
     XtAddEventHandler(
                       (Widget)m_drawingArea,
                        PointerMotionHintMask | EnterWindowMask |
@@ -323,34 +340,31 @@ 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
-    wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
-    DoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
-    DoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
+    wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+    wxDoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
+    wxDoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
 
     XmScrolledWindowSetAreas(
                              (Widget)m_scrolledWindow,
                              (Widget) 0, (Widget) 0,
                              (Widget) m_drawingArea);
 
-#if 0
-    if (m_hScrollBar)
-        XtRealizeWidget ((Widget) m_hScrollBar);
-    if (m_vScrollBar)
-        XtRealizeWidget ((Widget) m_vScrollBar);
-#endif // 0
-
     // 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()
 {
+    if (g_captureWindow == this)
+        g_captureWindow = NULL;
+    
+    m_isBeingDeleted = TRUE;
+    
     // Motif-specific actions first
     WXWidget wMain = GetMainWidget();
     if ( wMain )
@@ -359,8 +373,6 @@ wxWindow::~wxWindow()
         DetachWidget(wMain);
     }
 
-    ClearUpdateRects();
-
     // If m_drawingArea, we're a fully-fledged window with drawing area,
     // scrollbars etc. (what wxCanvas used to be)
     if ( m_drawingArea )
@@ -377,18 +389,31 @@ wxWindow::~wxWindow()
         if (w)
         {
             XtDestroyWidget(w);
+            m_drawingArea = (WXWidget) 0;
         }
 
-        m_mainWidget = (WXWidget) 0;
-
         // Only if we're _really_ a canvas (not a dialog box/panel)
         if (m_scrolledWindow)
         {
             wxDeleteWindowFromTable((Widget) m_scrolledWindow);
         }
 
-        UnmanageAndDestroy(m_hScrollBar);
-        UnmanageAndDestroy(m_vScrollBar);
+        if (m_hScrollBar)
+        {
+            wxDeleteWindowFromTable((Widget) m_hScrollBar);
+            XtUnmanageChild((Widget) m_hScrollBar);
+        }
+        if (m_vScrollBar)
+        {
+            wxDeleteWindowFromTable((Widget) m_vScrollBar);
+            XtUnmanageChild((Widget) m_vScrollBar);
+        }
+
+        if (m_hScrollBar)
+            XtDestroyWidget((Widget) m_hScrollBar);
+        if (m_vScrollBar)
+            XtDestroyWidget((Widget) m_vScrollBar);
+
         UnmanageAndDestroy(m_scrolledWindow);
 
         if (m_borderWidget)
@@ -397,6 +422,9 @@ wxWindow::~wxWindow()
             m_borderWidget = (WXWidget) 0;
         }
     }
+    else // Why wasn't this here before? JACS 8/3/2000
+        DestroyChildren();
+
 
     // Destroy the window
     if (GetMainWidget())
@@ -406,6 +434,12 @@ wxWindow::~wxWindow()
         // or dialog is destroyed, but before that you may get some memory
         // leaks and potential layout problems if you delete and then add
         // child windows.
+
+        // GRG, Feb/2000: commented this out when adding support for
+        //   wxSCROLL[WIN]_THUMBRELEASE events. Also it was reported
+        //   that this call crashed wxMotif under OS/2, so it seems
+        //   that leaving it out is the right thing to do.
+        // SN, Feb/2000: newgrid/griddemo shows why it is needed :-(
         XtDestroyWidget((Widget) GetMainWidget());
         SetMainWidget((WXWidget) NULL);
     }
@@ -415,120 +449,107 @@ wxWindow::~wxWindow()
 // scrollbar management
 // ----------------------------------------------------------------------------
 
+WXWidget wxWindow::DoCreateScrollBar(WXWidget parent,
+                                     wxOrientation orientation,
+                                     void (*callback)())
+{
+    int orient = ( orientation & wxHORIZONTAL ) ? XmHORIZONTAL : XmVERTICAL;
+    Widget sb =
+        XtVaCreateManagedWidget( "scrollBarWidget",
+                                 xmScrollBarWidgetClass, (Widget)parent,
+                                 XmNorientation, orient,
+                                 XmNincrement, 1,
+                                 XmNvalue, 0,
+                                 NULL );
+
+    XtPointer o = (XtPointer)orientation;
+    XtCallbackProc cb = (XtCallbackProc)callback;
+
+    XtAddCallback( sb, XmNvalueChangedCallback, cb, o );
+    XtAddCallback( sb, XmNdragCallback, cb, o );
+    XtAddCallback( sb, XmNincrementCallback, cb, o );
+    XtAddCallback( sb, XmNdecrementCallback, cb, o );
+    XtAddCallback( sb, XmNpageIncrementCallback, cb, o );
+    XtAddCallback( sb, XmNpageDecrementCallback, cb, o );
+    XtAddCallback( sb, XmNtoTopCallback, cb, o );
+    XtAddCallback( sb, XmNtoBottomCallback, cb, o );
+
+    return (WXWidget)sb;
+}
+
 // Helper function
-void wxWindow::CreateScrollbar(int orientation)
+void wxWindow::CreateScrollbar(wxOrientation orientation)
 {
     wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
 
-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
+    XtVaSetValues( (Widget) m_scrolledWindow,
+                   XmNresizePolicy, XmRESIZE_NONE,
+                   NULL );
 
+    wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     // Add scrollbars if required
     if (orientation == wxHORIZONTAL)
     {
-        Widget hScrollBar = XtVaCreateManagedWidget ("hsb",
-            xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
-            XmNorientation, XmHORIZONTAL,
-            NULL);
-        //      XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-
-        XtVaSetValues (hScrollBar,
-            XmNincrement, 1,
-            XmNvalue, 0,
-            NULL);
-
-        m_hScrollBar = (WXWidget) hScrollBar;
+        m_hScrollBar = DoCreateScrollBar( m_scrolledWindow, wxHORIZONTAL,
+                                          (void (*)())wxScrollBarCallback );
 
-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
-        DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
+        wxDoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
 
-        XtRealizeWidget(hScrollBar);
+        XtRealizeWidget( (Widget)m_hScrollBar );
 
         XtVaSetValues((Widget) m_scrolledWindow,
             XmNhorizontalScrollBar, (Widget) m_hScrollBar,
             NULL);
 
-        m_hScroll = TRUE;
+        wxAddWindowToTable( (Widget)m_hScrollBar, this );
     }
-
-    if (orientation == wxVERTICAL)
+    else if (orientation == wxVERTICAL)
     {
-        Widget vScrollBar = XtVaCreateManagedWidget ("vsb",
-            xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
-            XmNorientation, XmVERTICAL,
-            NULL);
-        //      XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-
-        XtVaSetValues (vScrollBar,
-            XmNincrement, 1,
-            XmNvalue, 0,
-            NULL);
+        m_vScrollBar = DoCreateScrollBar( m_scrolledWindow, wxVERTICAL,
+                                          (void (*)())wxScrollBarCallback );
 
-        m_vScrollBar = (WXWidget) vScrollBar;
-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
-        DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
+        wxDoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
 
-        XtRealizeWidget(vScrollBar);
+        XtRealizeWidget((Widget)m_vScrollBar);
 
         XtVaSetValues((Widget) m_scrolledWindow,
             XmNverticalScrollBar, (Widget) m_vScrollBar,
             NULL);
 
-        m_vScroll = TRUE;
+        wxAddWindowToTable( (Widget)m_vScrollBar, this );
     }
 
-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
+    XtVaSetValues( (Widget) m_scrolledWindow,
+                   XmNresizePolicy, XmRESIZE_ANY,
+                   NULL );
 }
 
-void wxWindow::DestroyScrollbar(int orientation)
+void wxWindow::DestroyScrollbar(wxOrientation orientation)
 {
     wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
 
-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
-    // Add scrollbars if required
-    if (orientation == wxHORIZONTAL)
-    {
-        if (m_hScrollBar)
-        {
-            XtDestroyWidget((Widget) m_hScrollBar);
-        }
-        m_hScrollBar = (WXWidget) 0;
-        m_hScroll = FALSE;
-
-        XtVaSetValues((Widget) m_scrolledWindow,
-            XmNhorizontalScrollBar, (Widget) 0,
-            NULL);
-
-    }
+    XtVaSetValues((Widget) m_scrolledWindow,
+                  XmNresizePolicy, XmRESIZE_NONE,
+                  NULL);
+    String stringSB = orientation == wxHORIZONTAL ?
+        XmNhorizontalScrollBar : XmNverticalScrollBar;
+    WXWidget* widgetSB = orientation == wxHORIZONTAL ?
+        &m_hScrollBar : &m_vScrollBar;
 
-    if (orientation == wxVERTICAL)
+    if( *widgetSB )
     {
-        if (m_vScrollBar)
-        {
-            XtDestroyWidget((Widget) m_vScrollBar);
-        }
-        m_vScrollBar = (WXWidget) 0;
-        m_vScroll = TRUE;
+        wxDeleteWindowFromTable( (Widget)*widgetSB );
+        XtDestroyWidget( (Widget)*widgetSB );
+        *widgetSB = (WXWidget)NULL;
+    }
 
-        XtVaSetValues((Widget) m_scrolledWindow,
-            XmNverticalScrollBar, (Widget) 0,
-            NULL);
+    XtVaSetValues( (Widget)m_scrolledWindow,
+                   stringSB, (Widget) 0,
+                   NULL );
 
-    }
-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
+    XtVaSetValues((Widget) m_scrolledWindow,
+                  XmNresizePolicy, XmRESIZE_ANY,
+                  NULL);
 }
 
 // ---------------------------------------------------------------------------
@@ -543,7 +564,7 @@ void wxWindow::SetFocus()
 }
 
 // Get the window with the focus
-wxWindow *wxWindow::FindFocus()
+wxWindow *wxWindowBase::DoFindFocus()
 {
     // TODO Problems:
     // (1) Can there be multiple focussed widgets in an application?
@@ -552,7 +573,7 @@ wxWindow *wxWindow::FindFocus()
     // (2) The widget with the focus may not be in the widget table
     // depending on which widgets I put in the table
     wxWindow *winFocus = (wxWindow *)NULL;
-    for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
+    for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
           node;
           node = node->GetNext() )
     {
@@ -571,12 +592,12 @@ wxWindow *wxWindow::FindFocus()
     return winFocus;
 }
 
-void wxWindow::Enable(bool enable)
+bool wxWindow::Enable(bool enable)
 {
     if ( !wxWindowBase::Enable(enable) )
         return FALSE;
 
-    Widget wMain = GetMainWidget();
+    Widget wMain = (Widget)GetMainWidget();
     if ( wMain )
     {
         XtSetSensitive(wMain, enable);
@@ -593,8 +614,8 @@ bool wxWindow::Show(bool show)
 
     if (m_borderWidget || m_scrolledWindow)
     {
-        MapOrUnmap(m_drawingArea, show);
         MapOrUnmap(m_borderWidget ? m_borderWidget : m_scrolledWindow, show);
+        // MapOrUnmap(m_drawingArea, show);
     }
     else
     {
@@ -602,15 +623,6 @@ bool wxWindow::Show(bool show)
             MapOrUnmap(GetMainWidget(), show);
     }
 
-#if 0
-    Window xwin = (Window) GetXWindow();
-    Display *xdisp = (Display*) GetXDisplay();
-    if (show)
-        XMapWindow(xdisp, xwin);
-    else
-        XUnmapWindow(xdisp, xwin);
-#endif
-
     return TRUE;
 }
 
@@ -630,34 +642,39 @@ void wxWindow::Lower()
     XLowerWindow(XtDisplay(wTop), window);
 }
 
-void wxWindow::SetTitle( const wxString& title)
+void wxWindow::SetTitle(const wxString& title)
 {
-    SetWindowText(GetHwnd(), title.c_str());
+    XtVaSetValues((Widget)GetMainWidget(), XmNtitle, title.c_str(), NULL);
 }
 
 wxString wxWindow::GetTitle() const
 {
-    return wxGetWindowText(GetHWND());
+    char *title;
+    XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &title, NULL);
+
+    return wxString(title);
 }
 
-void wxWindow::CaptureMouse()
+void wxWindow::DoCaptureMouse()
 {
+    g_captureWindow = this;
     if ( m_winCaptured )
         return;
 
-    Widget wMain = GetMainWidget();
+    Widget wMain = (Widget)GetMainWidget();
     if ( wMain )
         XtAddGrab(wMain, TRUE, FALSE);
 
     m_winCaptured = TRUE;
 }
 
-void wxWindow::ReleaseMouse()
+void wxWindow::DoReleaseMouse()
 {
+    g_captureWindow = NULL;
     if ( !m_winCaptured )
         return;
 
-    Widget wMain = GetMainWidget();
+    Widget wMain = (Widget)GetMainWidget();
     if ( wMain )
         XtRemoveGrab(wMain);
 
@@ -685,15 +702,22 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
         return FALSE;
     }
 
-    wxASSERT_MSG( m_cursor.Ok(),
-                  _T("cursor must be valid after call to the base version"));
+    //    wxASSERT_MSG( m_cursor.Ok(),
+    //                  wxT("cursor must be valid after call to the base version"));
+    wxCursor* cursor2 = NULL;
+    if (m_cursor.Ok())
+        cursor2 = & m_cursor;
+    else
+        cursor2 = wxSTANDARD_CURSOR;
 
     WXDisplay *dpy = GetXDisplay();
-    WXCursor x_cursor = m_cursor.GetXCursor(dpy);
+    WXCursor x_cursor = cursor2->GetXCursor(dpy);
 
     Widget w = (Widget) GetMainWidget();
     Window win = XtWindow(w);
     XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);
+
+    return TRUE;
 }
 
 // Coordinates relative to the window
@@ -732,34 +756,38 @@ int wxWindow::GetScrollPos(int orient) const
 // can scroll.
 int wxWindow::GetScrollRange(int orient) const
 {
-    Widget scrollBar = (Widget)GetScrollbar(orient);
-    wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
+    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
+    // CE scintilla windows don't always have these scrollbars 
+    // and it tends to pile up a whole bunch of asserts
+    //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;
 }
 
 int wxWindow::GetScrollThumb(int orient) const
 {
-    Widget scrollBar = (Widget)GetScrollbar(orient);
-    wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
+    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
+    //wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
 
-    int thumb;
-    XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL);
+    int thumb = 0;
+    if (scrollBar)
+        XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL);
     return thumb;
 }
 
 void wxWindow::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
 {
-    Widget scrollBar = (Widget)GetScrollbar(orient);
+    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
 
     if ( scrollBar )
     {
         XtVaSetValues (scrollBar, XmNvalue, pos, NULL);
     }
 
-    SetInternalScrollPos(orient, pos);
+    SetInternalScrollPos((wxOrientation)orient, pos);
 }
 
 // New function that will replace some of the above.
@@ -778,7 +806,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
         thumbVisible = range;
 
     // Save the old state to see if it changed
-    WXWidget oldScrollBar = GetScrollbar(orient);
+    WXWidget oldScrollBar = GetScrollbar((wxOrientation)orient);
 
     if (orient == wxHORIZONTAL)
     {
@@ -806,7 +834,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
                 CreateScrollbar(wxVERTICAL);
         }
     }
-    WXWidget newScrollBar =  GetScrollbar(orient);
+    WXWidget newScrollBar =  GetScrollbar((wxOrientation)orient);
 
     if (oldScrollBar != newScrollBar)
     {
@@ -827,7 +855,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
         NULL);
     }
 
-    SetInternalScrollPos(orient, pos);
+    SetInternalScrollPos((wxOrientation)orient, pos);
 
     int newW, newH;
     GetSize(& newW, & newH);
@@ -875,6 +903,18 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
     wxBrush brush(GetBackgroundColour(), wxSOLID);
     dc.SetBrush(brush); // FIXME: needed?
 
+    wxWindowList::compatibility_iterator cnode = m_children.GetFirst();
+    while (cnode)
+    {
+        wxWindow *child = cnode->GetData();
+        int sx = 0;
+        int sy = 0;
+        child->GetSize( &sx, &sy );
+        wxPoint pos( child->GetPosition() );
+        child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );
+        cnode = cnode->GetNext();
+    }
+
     // We'll add rectangles to the list of update rectangles according to which
     // bits we've exposed.
     wxList updateRects;
@@ -959,10 +999,10 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 
     // Now send expose events
 
-    wxNode* node = updateRects.First();
+    wxList::compatibility_iterator  node = updateRects.GetFirst();
     while (node)
     {
-        wxRect* rect = (wxRect*) node->Data();
+        wxRect* rect = (wxRect*) node->GetData();
         XExposeEvent event;
 
         event.type = Expose;
@@ -979,17 +1019,17 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 
         XSendEvent(display, window, False, ExposureMask, (XEvent *)&event);
 
-        node = node->Next();
+        node = node->GetNext();
 
     }
 
     // Delete the update rects
-    node = updateRects.First();
+    node = updateRects.GetFirst();
     while (node)
     {
-        wxRect* rect = (wxRect*) node->Data();
+        wxRect* rect = (wxRect*) node->GetData();
         delete rect;
-        node = node->Next();
+        node = node->GetNext();
     }
 
     XmUpdateDisplay((Widget) GetMainWidget());
@@ -1027,6 +1067,102 @@ void wxWindow::DoSetToolTip(wxToolTip * WXUNUSED(tooltip))
 
 #endif // wxUSE_TOOLTIPS
 
+// ----------------------------------------------------------------------------
+// popup menus
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS
+
+bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
+{
+    if ( x == -1 && y == -1 )
+    {
+        wxPoint mouse = ScreenToClient(wxGetMousePosition());
+        x = mouse.x; y = mouse.y;
+    }
+
+    Widget widget = (Widget) GetMainWidget();
+
+    /* The menuId field seems to be usused, so we'll use it to
+    indicate whether a menu is popped up or not:
+    0: Not currently created as a popup
+    -1: Created as a popup, but not active
+    1: Active popup.
+    */
+
+    if (menu->GetParent() && (menu->GetId() != -1))
+        return FALSE;
+
+    if (menu->GetMainWidget())
+    {
+        menu->DestroyMenu(TRUE);
+    }
+
+    menu->SetId(1); /* Mark as popped-up */
+    menu->CreateMenu(NULL, widget, menu);
+    menu->SetInvokingWindow(this);
+
+    menu->UpdateUI();
+
+    //  menu->SetParent(parent);
+    //  parent->children->Append(menu);  // Store menu for later deletion
+
+    Widget menuWidget = (Widget) menu->GetMainWidget();
+
+    int rootX = 0;
+    int rootY = 0;
+
+    int deviceX = x;
+    int deviceY = y;
+    /*
+    if (this->IsKindOf(CLASSINFO(wxCanvas)))
+    {
+    wxCanvas *canvas = (wxCanvas *) this;
+    deviceX = canvas->GetDC ()->LogicalToDeviceX (x);
+    deviceY = canvas->GetDC ()->LogicalToDeviceY (y);
+    }
+    */
+
+    Display *display = XtDisplay (widget);
+    Window rootWindow = RootWindowOfScreen (XtScreen((Widget)widget));
+    Window thisWindow = XtWindow (widget);
+    Window childWindow;
+    XTranslateCoordinates (display, thisWindow, rootWindow, (int) deviceX, (int) deviceY,
+        &rootX, &rootY, &childWindow);
+
+    XButtonPressedEvent event;
+    event.type = ButtonPress;
+    event.button = 1;
+
+    event.x = deviceX;
+    event.y = deviceY;
+
+    event.x_root = rootX;
+    event.y_root = rootY;
+
+    XmMenuPosition (menuWidget, &event);
+    XtManageChild (menuWidget);
+
+    // 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>
+
+    wxEventLoop evtLoop;
+
+    while (menu->GetId() == 1)
+    {
+        wxDoEventLoopIteration( evtLoop );
+    }
+
+    return TRUE;
+}
+
+#endif
+
 // ---------------------------------------------------------------------------
 // moving and resizing
 // ---------------------------------------------------------------------------
@@ -1037,28 +1173,29 @@ bool wxWindow::PreResize()
 }
 
 // Get total size
-void wxWindow::GetSize(int *x, int *y) const
+void wxWindow::DoGetSize(int *x, int *y) const
 {
-    if (m_drawingArea)
-    {
-        CanvasGetSize(x, y);
-        return;
-    }
-
-    Widget widget = (Widget) GetTopWidget();
+    Widget widget = (Widget)( !m_drawingArea ? GetTopWidget() :
+                              ( m_borderWidget ? m_borderWidget :
+                                m_scrolledWindow ? m_scrolledWindow :
+                                m_drawingArea ) );
     Dimension xx, yy;
-    XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
-    *x = xx; *y = yy;
+
+    XtVaGetValues( widget,
+                   XmNwidth, &xx,
+                   XmNheight, &yy,
+                   NULL );
+    if(x) *x = xx; 
+    if(y) *y = yy;
 }
 
-void wxWindow::GetPosition(int *x, int *y) const
+void wxWindow::DoGetPosition(int *x, int *y) const
 {
-    if (m_drawingArea)
-    {
-        CanvasGetPosition(x, y);
-        return;
-    }
-    Widget widget = (Widget) GetTopWidget();
+    Widget widget = (Widget)
+        ( m_drawingArea ?
+          ( m_borderWidget ? m_borderWidget : m_scrolledWindow ) : 
+          GetTopWidget() );
+
     Position xx, yy;
     XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL);
 
@@ -1071,10 +1208,11 @@ void wxWindow::GetPosition(int *x, int *y) const
         yy -= pt.y;
     }
 
-    *x = xx; *y = yy;
+    if(x) *x = xx;
+    if(y) *y = yy;
 }
 
-void wxWindow::ScreenToClient(int *x, int *y) const
+void wxWindow::DoScreenToClient(int *x, int *y) const
 {
     Widget widget = (Widget) GetClientWidget();
     Display *display = XtDisplay((Widget) GetMainWidget());
@@ -1087,7 +1225,7 @@ void wxWindow::ScreenToClient(int *x, int *y) const
     XTranslateCoordinates(display, rootWindow, thisWindow, xx, yy, x, y, &childWindow);
 }
 
-void wxWindow::ClientToScreen(int *x, int *y) const
+void wxWindow::DoClientToScreen(int *x, int *y) const
 {
     Widget widget = (Widget) GetClientWidget();
     Display *display = XtDisplay(widget);
@@ -1102,91 +1240,127 @@ void wxWindow::ClientToScreen(int *x, int *y) const
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindow::GetClientSize(int *x, int *y) const
+void wxWindow::DoGetClientSize(int *x, int *y) const
 {
     Widget widget = (Widget) GetClientWidget();
     Dimension xx, yy;
     XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
-    *x = xx; *y = yy;
+    if(x) *x = xx; if(y) *y = yy;
 }
 
 void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
-    // A bit of optimization to help sort out the flickers.
-    int oldX, oldY, oldW, oldH;
-    GetSize(& oldW, & oldH);
-    GetPosition(& oldX, & oldY);
-
-    bool useOldPos = FALSE;
-    bool useOldSize = FALSE;
-
-    if ((x == -1) && (x == -1) && ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0))
-        useOldPos = TRUE;
-    else if (x == oldX && y == oldY)
-        useOldPos = TRUE;
-
-    if ((width == -1) && (height == -1))
-        useOldSize = TRUE;
-    else if (width == oldW && height == oldH)
-        useOldSize = TRUE;
+    DoSetSizeIntr(x, y, width, height, sizeFlags, FALSE);
+}
 
-    if (!wxNoOptimize::CanOptimize())
+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.
+    int oldX = -1, oldY = -1, oldW = -1, oldH = -1;
+    if( !fromCtor )
     {
-        useOldSize = FALSE; useOldPos = FALSE;
+        GetSize(& oldW, & oldH);
+        GetPosition(& oldX, & oldY);
     }
 
-    if (useOldPos && useOldSize)
-        return;
-
-    if (m_drawingArea)
+    if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
     {
-        CanvasSetSize(x, y, width, height, sizeFlags);
-        return;
+        if ( x == -1 )
+            x = oldX;
+        if ( y == -1 )
+            y = oldY;
     }
-    Widget widget = (Widget) GetTopWidget();
-    if (!widget)
-        return;
-
-    bool managed = XtIsManaged( widget );
-    if (managed)
-        XtUnmanageChild(widget);
 
-    int xx = x; int yy = y;
-    AdjustForParentClientOrigin(xx, yy, sizeFlags);
-
-    if (!useOldPos)
+    wxSize size(-1, -1);
+    if ( width <= 0 )
     {
-        if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-            XtVaSetValues(widget, XmNx, xx, NULL);
-        if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-            XtVaSetValues(widget, XmNy, yy, NULL);
+        if ( ( sizeFlags & wxSIZE_AUTO_WIDTH ) && !fromCtor )
+        {
+            size = DoGetBestSize();
+            width = size.x;
+        }
+        else
+        {
+            width = oldW;
+        }
     }
-    if (!useOldSize)
+
+    if ( height == -1 )
     {
-        if (width > -1)
-            XtVaSetValues(widget, XmNwidth, width, NULL);
-        if (height > -1)
-            XtVaSetValues(widget, XmNheight, height, NULL);
+        if( ( sizeFlags & wxSIZE_AUTO_HEIGHT ) && !fromCtor )
+        {
+            if( size.x == -1 ) size = DoGetBestSize();
+            height = size.y;
+        }
+        else
+        {
+            height = oldH;
+        }
     }
 
-    if (managed)
-        XtManageChild(widget);
+    if ( x != oldX || y != oldY || width != oldW || height != oldH
+         || !wxNoOptimize::CanOptimize() )
+    {
+        if (m_drawingArea)
+        {
+            int flags = 0;
 
-    // How about this bit. Maybe we don't need to generate size events
-    // all the time -- they'll be generated when the window is sized anyway.
-#if 0
-    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-    sizeEvent.SetEventObject(this);
+            if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+                flags |= wxMOVE_X;
 
-      GetEventHandler()->ProcessEvent(sizeEvent);
-#endif // 0
+            if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+                flags |= wxMOVE_Y;
+
+            if (width > 0)
+                flags |= wxMOVE_WIDTH;
+
+            if (height > 0)
+                flags |= wxMOVE_HEIGHT;
+
+            int xx = x; int yy = y;
+            AdjustForParentClientOrigin(xx, yy, sizeFlags);
+            if( !fromCtor )
+                DoMoveWindow( xx, yy, width, height );
+            else
+                DoMoveWindowIntr( xx, yy, width, height, flags );
+
+            return;
+        }
+
+        Widget widget = (Widget) GetTopWidget();
+        if (!widget)
+            return;
+
+        bool managed = XtIsManaged( widget );
+        if (managed)
+            XtUnmanageChild(widget);
+
+        int xx = x;
+        int yy = y;
+        AdjustForParentClientOrigin(xx, yy, sizeFlags);
+
+        DoMoveWindow(xx, yy, width, height);
+
+        if (managed)
+            XtManageChild(widget);
+    }
 }
 
 void wxWindow::DoSetClientSize(int width, int height)
 {
     if (m_drawingArea)
     {
-        CanvasSetClientSize(width, height);
+        Widget drawingArea = (Widget) m_drawingArea;
+
+        XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
+
+        if (width > -1)
+            XtVaSetValues(drawingArea, XmNwidth, width, NULL);
+        if (height > -1)
+            XtVaSetValues(drawingArea, XmNheight, height, NULL);
+
+        XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
         return;
     }
 
@@ -1196,11 +1370,6 @@ void wxWindow::DoSetClientSize(int width, int height)
         XtVaSetValues(widget, XmNwidth, width, NULL);
     if (height > -1)
         XtVaSetValues(widget, XmNheight, height, NULL);
-
-    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-    sizeEvent.SetEventObject(this);
-
-    GetEventHandler()->ProcessEvent(sizeEvent);
 }
 
 // For implementation purposes - sometimes decorations make the client area
@@ -1210,45 +1379,86 @@ wxPoint wxWindow::GetClientAreaOrigin() const
     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)
+void wxWindow::DoMoveWindowIntr(int xx, int yy, int w, int h,
+                                int flags)
 {
-    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
+    if (m_drawingArea)
     {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        x += pt.x; y += pt.y;
-    }
-}
+        Widget drawingArea = (Widget) m_drawingArea;
+        Widget borderOrScrolled = m_borderWidget ?
+            (Widget) m_borderWidget :
+            (Widget) m_scrolledWindow;
+
+        bool managed = XtIsManaged(borderOrScrolled);
+        if (managed)
+            XtUnmanageChild (borderOrScrolled);
+        XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
+
+        if (flags & wxMOVE_X)
+            XtVaSetValues (borderOrScrolled,
+                           XmNx, xx,
+                           NULL);
+        if (flags & wxMOVE_Y)
+            XtVaSetValues (borderOrScrolled,
+                           XmNy, yy,
+                           NULL);
+
+        if (flags & wxMOVE_WIDTH)
+        {
+            if (m_borderWidget)
+            {
+                XtVaSetValues ((Widget) m_borderWidget, XmNwidth, w, NULL);
+                short thick, margin;
+                XtVaGetValues ((Widget) m_borderWidget,
+                               XmNshadowThickness, &thick,
+                               XmNmarginWidth, &margin,
+                               NULL);
+                w -= 2 * (thick + margin);
+            }
 
-void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
-{
-    m_minWidth = minW;
-    m_minHeight = minH;
-    m_maxWidth = maxW;
-    m_maxHeight = maxH;
+            if( w < 1 ) w = 1;
+            XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
+        }
 
-    wxFrame *frame = wxDynamicCast(this, wxFrame);
-    if ( !frame )
-    {
-        // TODO what about dialogs?
-        return;
+        if (flags & wxMOVE_HEIGHT)
+        {
+            if (m_borderWidget)
+            {
+                XtVaSetValues ((Widget) m_borderWidget, XmNheight, h, NULL);
+                short thick, margin;
+                XtVaGetValues ((Widget) m_borderWidget,
+                               XmNshadowThickness, &thick,
+                               XmNmarginHeight, &margin,
+                               NULL);
+                h -= 2 * (thick + margin);
+            }
+
+            if( h < 1 ) h = 1;
+            XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL);
+        }
+
+        if (managed)
+            XtManageChild (borderOrScrolled);
+        XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
     }
+    else
+    {
+        if( w < 1 ) w = 1;
+        if( h < 1 ) h = 1;
 
-    Widget widget = (Widget) frame->GetShellWidget();
+        XtVaSetValues((Widget)GetTopWidget(),
+                      XmNx, xx,
+                      XmNy, yy,
+                      XmNwidth, w,
+                      XmNheight, h,
+                      NULL);
+    }
+}
 
-    if (minW > -1)
-        XtVaSetValues(widget, XmNminWidth, minW, NULL);
-    if (minH > -1)
-        XtVaSetValues(widget, XmNminHeight, minH, NULL);
-    if (maxW > -1)
-        XtVaSetValues(widget, XmNmaxWidth, maxW, NULL);
-    if (maxH > -1)
-        XtVaSetValues(widget, XmNmaxHeight, maxH, NULL);
-    if (incW > -1)
-        XtVaSetValues(widget, XmNwidthInc, incW, NULL);
-    if (incH > -1)
-        XtVaSetValues(widget, XmNheightInc, incH, NULL);
+void wxWindow::DoMoveWindow(int x, int y, int width, int height)
+{
+    DoMoveWindowIntr (x, y, width, height,
+                      wxMOVE_X|wxMOVE_Y|wxMOVE_WIDTH|wxMOVE_HEIGHT);
 }
 
 // ---------------------------------------------------------------------------
@@ -1257,9 +1467,9 @@ void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, in
 
 int wxWindow::GetCharHeight() const
 {
-    wxCHECK_MSG( m_windowFont.Ok(), 0, "valid window font needed" );
+    wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
 
-    WXFontStructPtr pFontStruct = m_windowFont.GetFontStruct(1.0, GetXDisplay());
+    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
 
     int direction, ascent, descent;
     XCharStruct overall;
@@ -1272,9 +1482,9 @@ int wxWindow::GetCharHeight() const
 
 int wxWindow::GetCharWidth() const
 {
-    wxCHECK_MSG( m_windowFont.Ok(), 0, "valid window font needed" );
+    wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
 
-    WXFontStructPtr pFontStruct = m_windowFont.GetFontStruct(1.0, GetXDisplay());
+    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
 
     int direction, ascent, descent;
     XCharStruct overall;
@@ -1291,15 +1501,15 @@ void wxWindow::GetTextExtent(const wxString& string,
 {
     wxFont *fontToUse = (wxFont *)theFont;
     if (!fontToUse)
-        fontToUse = (wxFont *) & m_windowFont;
-
-    wxCHECK_RET( fontToUse.Ok(), "valid window font needed" );
+        fontToUse = (wxFont *) & m_font;
 
-    WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay());
+    wxCHECK_RET( fontToUse->Ok(), "valid window font needed" );
+    
+    WXFontStructPtr pFontStruct = fontToUse->GetFontStruct(1.0, GetXDisplay());
 
     int direction, ascent, descent2;
     XCharStruct overall;
-    int slen;
+    int slen = string.Len();
 
 #if 0
     if (use16)
@@ -1318,12 +1528,18 @@ void wxWindow::GetTextExtent(const wxString& string,
         *descent = descent2;
     if (externalLeading)
         *externalLeading = 0;
+
 }
 
 // ----------------------------------------------------------------------------
 // painting
 // ----------------------------------------------------------------------------
 
+void wxWindow::AddUpdateRect(int x, int y, int w, int h)
+{
+    m_updateRegion.Union( x, y, w, h );
+}
+
 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
     m_needsRefresh = TRUE;
@@ -1368,26 +1584,6 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
     XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
 }
 
-void wxWindow::Clear()
-{
-    wxClientDC dc(this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
-}
-
-void wxWindow::ClearUpdateRects()
-{
-    wxNode* node = m_updateRects.First();
-    while (node)
-    {
-        wxRect* rect = (wxRect*) node->Data();
-        delete rect;
-        node = node->Next();
-    }
-    m_updateRects.Clear();
-}
-
 void wxWindow::DoPaint()
 {
     //TODO : make a temporary gc so we can do the XCopyArea below
@@ -1406,7 +1602,7 @@ void wxWindow::DoPaint()
       // otherwise we don't know how many pixels have been scrolled. We might
       // solve this in the future by defining virtual wxWindow functions to get
       // the scroll position in pixels. Or, each kind of scrolled window has to
-      // implement backing stores itself, using generic wxWindows code.
+      // implement backing stores itself, using generic wxWidgets code.
       wxScrolledWindow* scrolledWindow = wxDynamicCast(this, wxScrolledWindow);
       if ( scrolledWindow )
       {
@@ -1448,8 +1644,9 @@ void wxWindow::DoPaint()
     }
     else
     {
+        wxWindowDC dc(this);
         // Set an erase event first
-        wxEraseEvent eraseEvent(GetId());
+        wxEraseEvent eraseEvent(GetId(), &dc);
         eraseEvent.SetEventObject(this);
         GetEventHandler()->ProcessEvent(eraseEvent);
 
@@ -1468,7 +1665,7 @@ void wxWindow::DoPaint()
 // Responds to colour changes: passes event on to children.
 void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
-    wxWindowList::Node *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {
         // Only propagate to non-top-level windows
@@ -1484,11 +1681,12 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
     }
 }
 
-void wxWindow::OnIdle(wxIdleEvent& event)
+void wxWindow::OnInternalIdle()
 {
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)
-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
 // ----------------------------------------------------------------------------
@@ -1497,6 +1695,7 @@ void wxWindow::OnIdle(wxIdleEvent& event)
 
 bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
 {
+#if wxUSE_ACCEL
     if (!m_acceleratorTable.Ok())
         return FALSE;
 
@@ -1508,8 +1707,8 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& 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
@@ -1523,10 +1722,11 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
             wxFrame* frame = wxDynamicCast(parent, wxFrame);
             if ( frame )
             {
+#if wxUSE_MENUS
                 // Try for a menu command
                 if (frame->GetMenuBar())
                 {
-                    wxMenuItem* item = frame->GetMenuBar()->FindItemForId(entry->GetCommand());
+                    wxMenuItem* item = frame->GetMenuBar()->FindItem(entry->GetCommand());
                     if (item)
                     {
                         wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
@@ -1537,6 +1737,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
                         return frame->GetEventHandler()->ProcessEvent(commandEvent);
                     }
                 }
+#endif
             }
 
             // Find a child matching the command id
@@ -1558,6 +1759,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
             return FALSE;
         } // matches event
     }// for
+#endif
 
     // We didn't match the key event against an accelerator.
     return FALSE;
@@ -1568,32 +1770,37 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// function which maintain the global hash table mapping Widgets to wxWindows
+// function which maintain the global hash table mapping Widgets to wxWidgets
 // ----------------------------------------------------------------------------
 
 bool wxAddWindowToTable(Widget w, wxWindow *win)
 {
     wxWindow *oldItem = NULL;
-    if ((oldItem = (wxWindow *)gs_wxWidgetHashTable->Get ((long) w)))
+    if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
     {
         wxLogDebug("Widget table clash: new widget is %ld, %s",
                    (long)w, win->GetClassInfo()->GetClassName());
         return FALSE;
     }
 
-    gs_wxWidgetHashTable->Put((long) w, win);
+    wxWidgetHashTable->Put((long) w, win);
+
+    wxLogTrace("widget", "Widget 0x%p <-> window %p (%s)",
+               (WXWidget)w, win, win->GetClassInfo()->GetClassName());
 
     return TRUE;
 }
 
 wxWindow *wxGetWindowFromTable(Widget w)
 {
-    return (wxWindow *)gs_wxWidgetHashTable->Get((long) w);
+    return (wxWindow *)wxWidgetHashTable->Get((long) w);
 }
 
 void wxDeleteWindowFromTable(Widget w)
 {
-    gs_wxWidgetHashTable->Delete((long)w);
+    wxLogTrace("widget", "Widget 0x%p", (WXWidget)w);
+
+    wxWidgetHashTable->Delete((long)w);
 }
 
 // ----------------------------------------------------------------------------
@@ -1601,18 +1808,16 @@ void wxDeleteWindowFromTable(Widget w)
 // ----------------------------------------------------------------------------
 
 // Add to hash table, add event handler
-bool wxWindow::AttachWidget (wxWindow* parent, WXWidget mainWidget,
+bool wxWindow::AttachWidget (wxWindow* WXUNUSED(parent), WXWidget mainWidget,
                              WXWidget formWidget, int x, int y, int width, int height)
 {
     wxAddWindowToTable((Widget) mainWidget, this);
-    if (CanAddEventHandler())
-    {
-        XtAddEventHandler((Widget) mainWidget,
-            ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
-            False,
-            wxPanelItemEventHandler,
-            (XtPointer) this);
-    }
+    XtAddEventHandler( (Widget) mainWidget,
+                       ButtonPressMask | ButtonReleaseMask
+                     | PointerMotionMask,
+                       False,
+                       wxPanelItemEventHandler,
+                       (XtPointer) this);
 
     if (!formWidget)
     {
@@ -1646,14 +1851,12 @@ bool wxWindow::AttachWidget (wxWindow* parent, WXWidget mainWidget,
 // Remove event handler, remove from hash table
 bool wxWindow::DetachWidget(WXWidget widget)
 {
-    if (CanAddEventHandler())
-    {
-        XtRemoveEventHandler((Widget) widget,
-            ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
-            False,
-            wxPanelItemEventHandler,
-            (XtPointer)this);
-    }
+    XtRemoveEventHandler( (Widget) widget,
+                          ButtonPressMask | ButtonReleaseMask
+                        | PointerMotionMask,
+                          False,
+                          wxPanelItemEventHandler,
+                          (XtPointer)this);
 
     wxDeleteWindowFromTable((Widget) widget);
     return TRUE;
@@ -1663,10 +1866,19 @@ bool wxWindow::DetachWidget(WXWidget widget)
 // Motif-specific accessors
 // ----------------------------------------------------------------------------
 
-// Get the underlying X window
+WXWindow wxWindow::GetClientXWindow() const
+{
+    Widget wMain = (Widget)GetClientWidget();
+    if ( wMain )
+        return (WXWindow) XtWindow(wMain);
+    else
+        return (WXWindow) 0;
+}
+
+// Get the underlying X window
 WXWindow wxWindow::GetXWindow() const
 {
-    Widget wMain = GetMainWidget();
+    Widget wMain = (Widget)GetMainWidget();
     if ( wMain )
         return (WXWindow) XtWindow(wMain);
     else
@@ -1676,7 +1888,7 @@ WXWindow wxWindow::GetXWindow() const
 // Get the underlying X display
 WXDisplay *wxWindow::GetXDisplay() const
 {
-    Widget wMain = GetMainWidget();
+    Widget wMain = (Widget)GetMainWidget();
     if ( wMain )
         return (WXDisplay*) XtDisplay(wMain);
     else
@@ -1715,7 +1927,8 @@ WXWidget wxWindow::GetLabelWidget() const
 
 // All widgets should have this as their resize proc.
 // OnSize sent to wxWindow via client data.
-void wxWidgetResizeProc(Widget w, XConfigureEvent *event, String args[], int *num_args)
+void wxWidgetResizeProc(Widget w, XConfigureEvent *WXUNUSED(event),
+                        String WXUNUSED(args)[], int *WXUNUSED(num_args))
 {
     wxWindow *win = wxGetWindowFromTable(w);
     if (!win)
@@ -1740,27 +1953,17 @@ static void wxCanvasRepaintProc(Widget drawingArea,
 
     XEvent * event = cbs->event;
     wxWindow * win = (wxWindow *) clientData;
-    Display * display = (Display *) win->GetXDisplay();
 
     switch (event->type)
     {
     case Expose:
         {
-            wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y,
-                event->xexpose.width, event->xexpose.height);
-
-            win->m_updateRects.Append((wxObject*) rect);
+            win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
+                               event->xexpose.width, event->xexpose.height);
 
             if (event -> xexpose.count == 0)
             {
-#if 0
-                wxPaintEvent event(win->GetId());
-                event.SetEventObject(win);
-                win->GetEventHandler()->ProcessEvent(event);
-#endif // 0
-
                 win->DoPaint();
-                win->ClearUpdateRects();
             }
             break;
         }
@@ -1769,7 +1972,7 @@ static void wxCanvasRepaintProc(Widget drawingArea,
 
 // Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4)
 static void wxCanvasEnterLeave(Widget drawingArea,
-                               XtPointer clientData,
+                               XtPointer WXUNUSED(clientData),
                                XCrossingEvent * event)
 {
     XmDrawingAreaCallbackStruct cbs;
@@ -1784,7 +1987,8 @@ static void wxCanvasEnterLeave(Widget drawingArea,
 }
 
 // Fix to make it work under Motif 1.0 (!)
-static void wxCanvasMotionEvent (Widget drawingArea, XButtonEvent * event)
+static void wxCanvasMotionEvent (Widget WXUNUSED(drawingArea),
+                                 XButtonEvent *WXUNUSED(event))
 {
 #if XmVersion <= 1000
     XmDrawingAreaCallbackStruct cbs;
@@ -1799,11 +2003,11 @@ static void wxCanvasMotionEvent (Widget drawingArea, XButtonEvent * event)
 }
 
 static void wxCanvasInputEvent(Widget drawingArea,
-                               XtPointer data,
+                               XtPointer WXUNUSED(data),
                                XmDrawingAreaCallbackStruct * cbs)
 {
     wxWindow *canvas = wxGetWindowFromTable(drawingArea);
-    XEvent local_event;
+    XEvent* xevent = cbs->event;
 
     if (canvas==NULL)
         return;
@@ -1811,9 +2015,7 @@ static void wxCanvasInputEvent(Widget drawingArea,
     if (cbs->reason != XmCR_INPUT)
         return;
 
-    local_event = *(cbs->event);    // We must keep a copy!
-
-    switch (local_event.xany.type)
+    switch (xevent->xany.type)
     {
     case EnterNotify:
     case LeaveNotify:
@@ -1821,189 +2023,21 @@ static void wxCanvasInputEvent(Widget drawingArea,
     case ButtonRelease:
     case MotionNotify:
         {
-            wxEventType eventType = wxEVT_NULL;
-
-            if (local_event.xany.type == EnterNotify)
-            {
-                //if (local_event.xcrossing.mode!=NotifyNormal)
-                //  return ; // Ignore grab events
-                eventType = wxEVT_ENTER_WINDOW;
-                //            canvas->GetEventHandler()->OnSetFocus();
-            }
-            else if (local_event.xany.type == LeaveNotify)
-            {
-                //if (local_event.xcrossing.mode!=NotifyNormal)
-                //  return ; // Ignore grab events
-                eventType = wxEVT_LEAVE_WINDOW;
-                //            canvas->GetEventHandler()->OnKillFocus();
-            }
-            else if (local_event.xany.type == MotionNotify)
-            {
-                eventType = wxEVT_MOTION;
-                if (local_event.xmotion.is_hint == NotifyHint)
-                {
-                    Window root, child;
-                    Display *dpy = XtDisplay (drawingArea);
-
-                    XQueryPointer (dpy, XtWindow (drawingArea),
-                        &root, &child,
-                        &local_event.xmotion.x_root,
-                        &local_event.xmotion.y_root,
-                        &local_event.xmotion.x,
-                        &local_event.xmotion.y,
-                        &local_event.xmotion.state);
-                }
-                else
-                {
-                }
-            }
-
-            else if (local_event.xany.type == ButtonPress)
-            {
-                if (local_event.xbutton.button == Button1)
-                {
-                    eventType = wxEVT_LEFT_DOWN;
-                    canvas->m_button1Pressed = TRUE;
-                }
-                else if (local_event.xbutton.button == Button2)
-                {
-                    eventType = wxEVT_MIDDLE_DOWN;
-                    canvas->m_button2Pressed = TRUE;
-                }
-                else if (local_event.xbutton.button == Button3)
-                {
-                    eventType = wxEVT_RIGHT_DOWN;
-                    canvas->m_button3Pressed = TRUE;
-                }
-            }
-            else if (local_event.xany.type == ButtonRelease)
+            wxMouseEvent wxevent(0);
+            if (wxTranslateMouseEvent(wxevent, canvas, drawingArea, xevent))
             {
-                if (local_event.xbutton.button == Button1)
-                {
-                    eventType = wxEVT_LEFT_UP;
-                    canvas->m_button1Pressed = FALSE;
-                }
-                else if (local_event.xbutton.button == Button2)
-                {
-                    eventType = wxEVT_MIDDLE_UP;
-                    canvas->m_button2Pressed = FALSE;
-                }
-                else if (local_event.xbutton.button == Button3)
-                {
-                    eventType = wxEVT_RIGHT_UP;
-                    canvas->m_button3Pressed = FALSE;
-                }
+                canvas->GetEventHandler()->ProcessEvent(wxevent);
             }
-
-            wxMouseEvent wxevent (eventType);
-            wxevent.m_eventHandle = (char *) &local_event;
-
-            wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
-                || (event_left_is_down (&local_event)
-                && (eventType != wxEVT_LEFT_UP)));
-            wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)
-                || (event_middle_is_down (&local_event)
-                && (eventType != wxEVT_MIDDLE_UP)));
-            wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)
-                || (event_right_is_down (&local_event)
-                && (eventType != wxEVT_RIGHT_UP)));
-
-            wxevent.m_shiftDown = local_event.xbutton.state & ShiftMask;
-            wxevent.m_controlDown = local_event.xbutton.state & ControlMask;
-            wxevent.m_altDown = local_event.xbutton.state & Mod3Mask;
-            wxevent.m_metaDown = local_event.xbutton.state & Mod1Mask;
-            wxevent.SetTimestamp(local_event.xbutton.time);
-
-            // Now check if we need to translate this event into a double click
-            if (TRUE) // canvas->doubleClickAllowed)
-            {
-                if (wxevent.ButtonDown())
-                {
-                    long dclickTime = XtGetMultiClickTime((Display*) wxGetDisplay());
-
-                    // get button and time-stamp
-                    int button = 0;
-                    if      (wxevent.LeftDown())   button = 1;
-                    else if (wxevent.MiddleDown()) button = 2;
-                    else if (wxevent.RightDown())  button = 3;
-                    long ts = wxevent.GetTimestamp();
-                    // check, if single or double click
-                    if (canvas->m_lastButton && canvas->m_lastButton==button && (ts - canvas->m_lastTS) < dclickTime)
-                    {
-                        // I have a dclick
-                        canvas->m_lastButton = 0;
-                        switch ( eventType )
-                        {
-                        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;
-                        }
-
-                    }
-                    else
-                    {
-                        // not fast enough or different button
-                        canvas->m_lastTS     = ts;
-                        canvas->m_lastButton = button;
-                    }
-                }
-            }
-
-            wxevent.SetId(canvas->GetId());
-            wxevent.SetEventObject(canvas);
-            wxevent.m_x = local_event.xbutton.x;
-            wxevent.m_y = local_event.xbutton.y;
-            canvas->GetEventHandler()->ProcessEvent (wxevent);
-#if 0
-            if (eventType == wxEVT_ENTER_WINDOW ||
-                    eventType == wxEVT_LEAVE_WINDOW ||
-                    eventType == wxEVT_MOTION
-               )
-                return;
-#endif // 0
             break;
-      }
+        }
     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, xevent))
             {
                 // Implement wxFrame::OnCharHook by checking ancestor.
-                wxWindow *parent = canvas->GetParent();
-                while (parent && !parent->IsKindOf(CLASSINFO(wxFrame)))
+                wxWindow *parent = canvas;
+                while (parent && !parent->IsTopLevel())
                     parent = parent->GetParent();
 
                 if (parent)
@@ -2020,33 +2054,16 @@ static void wxCanvasInputEvent(Widget drawingArea,
                 // Only process OnChar if OnKeyDown didn't swallow it
                 if (!canvas->GetEventHandler()->ProcessEvent (event))
                 {
-                  event.SetEventType(wxEVT_CHAR);
-                  canvas->GetEventHandler()->ProcessEvent (event);
-        }
+                    event.SetEventType(wxEVT_CHAR);
+                    canvas->GetEventHandler()->ProcessEvent (event);
+                }
             }
             break;
         }
     case KeyRelease:
         {
-            KeySym keySym;
-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL);
-            int id = wxCharCodeXToWX (keySym);
-
             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, xevent))
             {
                 canvas->GetEventHandler()->ProcessEvent (event);
             }
@@ -2054,7 +2071,7 @@ static void wxCanvasInputEvent(Widget drawingArea,
         }
     case FocusIn:
         {
-            if (local_event.xfocus.detail != NotifyPointer)
+            if (xevent->xfocus.detail != NotifyPointer)
             {
                 wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId());
                 event.SetEventObject(canvas);
@@ -2064,7 +2081,7 @@ static void wxCanvasInputEvent(Widget drawingArea,
         }
     case FocusOut:
         {
-            if (local_event.xfocus.detail != NotifyPointer)
+            if (xevent->xfocus.detail != NotifyPointer)
             {
                 wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId());
                 event.SetEventObject(canvas);
@@ -2078,13 +2095,13 @@ static void wxCanvasInputEvent(Widget drawingArea,
 }
 
 static void wxPanelItemEventHandler(Widget    wid,
-                                    XtPointer client_data,
+                                    XtPointer WXUNUSED(client_data),
                                     XEvent*   event,
                                     Boolean  *continueToDispatch)
 {
     // Widget can be a label or the actual widget.
 
-    wxWindow *window = wxGetWindowFromTable(drawingArea);
+    wxWindow *window = wxGetWindowFromTable(wid);
     if (window)
     {
         wxMouseEvent wxevent(0);
@@ -2106,55 +2123,52 @@ static void wxPanelItemEventHandler(Widget    wid,
 
 static void wxScrollBarCallback(Widget scrollbar,
                                 XtPointer clientData,
-                                XmScaleCallbackStruct *cbs)
+                                XmScrollBarCallbackStruct *cbs)
 {
-    Widget scrolledWindow = XtParent (scrollbar);
     wxWindow *win = wxGetWindowFromTable(scrollbar);
-    int orientation = (int) clientData;
+    wxOrientation orientation = (wxOrientation)(int)clientData;
 
     wxEventType eventType = wxEVT_NULL;
     switch (cbs->reason)
     {
     case XmCR_INCREMENT:
         {
-            eventType = wxEVT_SCROLL_LINEDOWN;
+            eventType = wxEVT_SCROLLWIN_LINEDOWN;
             break;
         }
     case XmCR_DECREMENT:
         {
-            eventType = wxEVT_SCROLL_LINEUP;
+            eventType = wxEVT_SCROLLWIN_LINEUP;
             break;
         }
     case XmCR_DRAG:
         {
-            eventType = wxEVT_SCROLL_THUMBTRACK;
+            eventType = wxEVT_SCROLLWIN_THUMBTRACK;
             break;
         }
     case XmCR_VALUE_CHANGED:
         {
-            // TODO: Should this be intercepted too, or will it cause
-            // duplicate events?
-            eventType = wxEVT_SCROLL_THUMBTRACK;
+            eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
             break;
         }
     case XmCR_PAGE_INCREMENT:
         {
-            eventType = wxEVT_SCROLL_PAGEDOWN;
+            eventType = wxEVT_SCROLLWIN_PAGEDOWN;
             break;
         }
     case XmCR_PAGE_DECREMENT:
         {
-            eventType = wxEVT_SCROLL_PAGEUP;
+            eventType = wxEVT_SCROLLWIN_PAGEUP;
             break;
         }
     case XmCR_TO_TOP:
         {
-            eventType = wxEVT_SCROLL_TOP;
+            eventType = wxEVT_SCROLLWIN_TOP;
             break;
         }
     case XmCR_TO_BOTTOM:
         {
-            eventType = wxEVT_SCROLL_BOTTOM;
+            eventType = wxEVT_SCROLLWIN_BOTTOM;
             break;
         }
     default:
@@ -2165,11 +2179,10 @@ static void wxScrollBarCallback(Widget scrollbar,
         }
     }
 
-    wxScrollEvent event(eventType, win->GetId());
-    event.SetEventObject(win);
-    event.SetPosition(cbs->value);
-    event.SetOrientation( (orientation == XmHORIZONTAL) ? wxHORIZONTAL : wxVERTICAL );
-
+    wxScrollWinEvent event(eventType,
+                           cbs->value,
+                           orientation);
+    event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent(event);
 }
 
@@ -2185,289 +2198,115 @@ void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event,
 
     switch(event -> type)
     {
-    case Expose :
+    case Expose:
         {
             window = (Window) win -> GetXWindow();
             display = (Display *) win -> GetXDisplay();
 
-            wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y,
-                event->xexpose.width, event->xexpose.height);
-            win->m_updateRects.Append((wxObject*) rect);
+            win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
+                               event->xexpose.width, event->xexpose.height);
 
             if (event -> xexpose.count == 0)
             {
                 win->DoPaint();
-
-                win->ClearUpdateRects();
             }
-            break;
-        }
-    }
-}
-
-// ----------------------------------------------------------------------------
-// CanvaseXXXSize() functions
-// ----------------------------------------------------------------------------
-
-// SetSize, but as per old wxCanvas (with drawing widget etc.)
-void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags)
-{
-    // A bit of optimization to help sort out the flickers.
-    int oldX, oldY, oldW, oldH;
-    GetSize(& oldW, & oldH);
-    GetPosition(& oldX, & oldY);
-
-    bool useOldPos = FALSE;
-    bool useOldSize = FALSE;
-
-    if ((x == -1) && (x == -1) && ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0))
-        useOldPos = TRUE;
-    else if (x == oldX && y == oldY)
-        useOldPos = TRUE;
-
-    if ((w == -1) && (h == -1))
-        useOldSize = TRUE;
-    else if (w == oldW && h == oldH)
-        useOldSize = TRUE;
-
-    if (!wxNoOptimize::CanOptimize())
-    {
-        useOldSize = FALSE; useOldPos = FALSE;
-    }
-
-    if (useOldPos && useOldSize)
-        return;
-
-    Widget drawingArea = (Widget) m_drawingArea;
-    bool managed = XtIsManaged(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-
-    if (managed)
-        XtUnmanageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-    XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
-
-    int xx = x; int yy = y;
-    AdjustForParentClientOrigin(xx, yy, sizeFlags);
-
-    if (!useOldPos)
-    {
-        if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        {
-            XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
-                XmNx, xx, NULL);
-        }
-
-        if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        {
-            XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
-                XmNy, yy, NULL);
-        }
-    }
-
-    if (!useOldSize)
-    {
-
-        if (w > -1)
-        {
-            if (m_borderWidget)
-            {
-                XtVaSetValues ((Widget) m_borderWidget, XmNwidth, w, NULL);
-                short thick, margin;
-                XtVaGetValues ((Widget) m_borderWidget,
-                    XmNshadowThickness, &thick,
-                    XmNmarginWidth, &margin,
-                    NULL);
-                w -= 2 * (thick + margin);
-            }
-
-            XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
-
-            Dimension spacing;
-            Widget sbar;
-            XtVaGetValues ((Widget) m_scrolledWindow,
-                XmNspacing, &spacing,
-                XmNverticalScrollBar, &sbar,
-                NULL);
-            Dimension wsbar;
-            if (sbar)
-                XtVaGetValues (sbar, XmNwidth, &wsbar, NULL);
-            else
-                wsbar = 0;
-
-            w -= (spacing + wsbar);
-
-            //      XtVaSetValues ((Widget) m_drawingArea, XmNwidth, w, NULL);
-        }
-        if (h > -1)
-        {
-            if (m_borderWidget)
-            {
-                XtVaSetValues ((Widget) m_borderWidget, XmNheight, h, NULL);
-                short thick, margin;
-                XtVaGetValues ((Widget) m_borderWidget,
-                    XmNshadowThickness, &thick,
-                    XmNmarginHeight, &margin,
-                    NULL);
-                h -= 2 * (thick + margin);
-            }
-
-            XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL);
-
-            Dimension spacing;
-            Widget sbar;
-            XtVaGetValues ((Widget) m_scrolledWindow,
-                XmNspacing, &spacing,
-                XmNhorizontalScrollBar, &sbar,
-                NULL);
-            Dimension wsbar;
-            if (sbar)
-                XtVaGetValues (sbar, XmNheight, &wsbar, NULL);
-            else
-                wsbar = 0;
-
-            h -= (spacing + wsbar);
-
-            //      XtVaSetValues ((Widget) m_drawingArea, XmNheight, h, NULL);
 
+            break;
         }
     }
-
-    if (managed)
-        XtManageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-    XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
-
-#if 0
-    int ww, hh;
-    GetClientSize (&ww, &hh);
-    wxSizeEvent sizeEvent(wxSize(ww, hh), GetId());
-    sizeEvent.SetEventObject(this);
-
-      GetEventHandler()->ProcessEvent(sizeEvent);
-#endif // 0
-}
-
-void wxWindow::CanvasSetClientSize (int w, int h)
-{
-    Widget drawingArea = (Widget) m_drawingArea;
-
-    XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
-
-    if (w > -1)
-        XtVaSetValues ((Widget) m_drawingArea, XmNwidth, w, NULL);
-    if (h > -1)
-        XtVaSetValues ((Widget) m_drawingArea, XmNheight, h, NULL);
-
-#if 0
-    // TODO: is this necessary?
-    allowRepainting = FALSE;
-
-    XSync (XtDisplay (drawingArea), FALSE);
-    XEvent event;
-    while (XtAppPending (wxTheApp->appContext))
-    {
-        XFlush (XtDisplay (drawingArea));
-        XtAppNextEvent (wxTheApp->appContext, &event);
-        XtDispatchEvent (&event);
-    }
-#endif // 0
-
-    XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
-
-#if 0
-       allowRepainting = TRUE;
-       DoRefresh ();
-
-       wxSizeEvent sizeEvent(wxSize(w, h), GetId());
-       sizeEvent.SetEventObject(this);
-
-       GetEventHandler()->ProcessEvent(sizeEvent);
-#endif // 0
-}
-
-void wxWindow::CanvasGetClientSize (int *w, int *h) const
-{
-    // Must return the same thing that was set via SetClientSize
-    Dimension xx, yy;
-    XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL);
-    *w = xx;
-    *h = yy;
-}
-
-void wxWindow::CanvasGetSize (int *w, int *h) const
-{
-    Dimension xx, yy;
-    if ((Widget) m_borderWidget)
-        XtVaGetValues ((Widget) m_borderWidget, XmNwidth, &xx, XmNheight, &yy, NULL);
-    else if ((Widget) m_scrolledWindow)
-        XtVaGetValues ((Widget) m_scrolledWindow, XmNwidth, &xx, XmNheight, &yy, NULL);
-    else
-        XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL);
-
-    *w = xx;
-    *h = yy;
-}
-
-void wxWindow::CanvasGetPosition (int *x, int *y) const
-{
-    Position xx, yy;
-    XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, &xx, XmNy, &yy, NULL);
-
-    // We may be faking the client origin.
-    // So a window that's really at (0, 30) may appear
-    // (to wxWin apps) to be at (0, 0).
-    if (GetParent())
-    {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        xx -= pt.x;
-        yy -= pt.y;
-    }
-
-    *x = xx;
-    *y = yy;
 }
 
 // ----------------------------------------------------------------------------
 // TranslateXXXEvent() functions
 // ----------------------------------------------------------------------------
 
-bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent)
+bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
+                           Widget widget, const XEvent *xevent)
 {
     switch (xevent->xany.type)
     {
-    case EnterNotify:
-    case LeaveNotify:
-    case ButtonPress:
-    case ButtonRelease:
-    case MotionNotify:
+        case EnterNotify:
+        case LeaveNotify:
+#if 0
+            fprintf(stderr, "Widget 0x%p <-> window %p (%s), %s\n",
+                    (WXWidget)widget, win, win->GetClassInfo()->GetClassName(),
+                    (xevent->xany.type == EnterNotify ? "ENTER" : "LEAVE"));
+#endif
+        case ButtonPress:
+        case ButtonRelease:
+        case MotionNotify:
         {
+            int eventx = xevent->xbutton.x, eventy = xevent->xbutton.y;
+
             wxEventType eventType = wxEVT_NULL;
 
             if (xevent->xany.type == LeaveNotify)
             {
-                win->m_button1Pressed = FALSE;
-                win->m_button2Pressed = FALSE;
-                win->m_button3Pressed = FALSE;
-                return FALSE;
+                eventType = wxEVT_LEAVE_WINDOW;
+            }
+            if (xevent->xany.type == EnterNotify)
+            {
+                eventType = wxEVT_ENTER_WINDOW;
             }
             else if (xevent->xany.type == MotionNotify)
             {
                 eventType = wxEVT_MOTION;
+
+                if (xevent->xmotion.is_hint == NotifyHint)
+                {
+                    Window root, child;
+                    int x_root, y_root;
+                    unsigned int state;
+                    Display *dpy = XtDisplay (widget);
+
+                    XQueryPointer (dpy, XtWindow (widget),
+                        &root, &child,
+                        &x_root, &y_root, &eventx, &eventy, &state);
+                }
             }
             else if (xevent->xany.type == ButtonPress)
             {
+                wxevent.SetTimestamp(xevent->xbutton.time);
+                int button = 0;
                 if (xevent->xbutton.button == Button1)
                 {
                     eventType = wxEVT_LEFT_DOWN;
-                    win->m_button1Pressed = TRUE;
+                    button = 1;
                 }
                 else if (xevent->xbutton.button == Button2)
                 {
                     eventType = wxEVT_MIDDLE_DOWN;
-                    win->m_button2Pressed = TRUE;
+                    button = 2;
                 }
                 else if (xevent->xbutton.button == Button3)
                 {
                     eventType = wxEVT_RIGHT_DOWN;
-                    win->m_button3Pressed = TRUE;
+                    button = 3;
+                }
+
+                // check for a double click
+                //
+                long dclickTime = XtGetMultiClickTime(xevent->xany.display);
+                long ts = wxevent.GetTimestamp();
+
+                int buttonLast = win->GetLastClickedButton();
+                long lastTS = win->GetLastClickTime();
+                if ( buttonLast && buttonLast == button &&
+                     (ts - lastTS) < dclickTime )
+                {
+                    // I have a dclick
+                    win->SetLastClick(0, ts);
+                    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
+                {
+                    // not fast enough or different button
+                    win->SetLastClick(button, ts);
                 }
             }
             else if (xevent->xany.type == ButtonRelease)
@@ -2475,23 +2314,23 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
                 if (xevent->xbutton.button == Button1)
                 {
                     eventType = wxEVT_LEFT_UP;
-                    win->m_button1Pressed = FALSE;
                 }
                 else if (xevent->xbutton.button == Button2)
                 {
                     eventType = wxEVT_MIDDLE_UP;
-                    win->m_button2Pressed = FALSE;
                 }
                 else if (xevent->xbutton.button == Button3)
                 {
                     eventType = wxEVT_RIGHT_UP;
-                    win->m_button3Pressed = FALSE;
                 }
-                else return FALSE;
+                else
+                    return FALSE;
+            }
+            else
+            {
+                return FALSE;
             }
-            else return FALSE;
 
-            wxevent.m_eventHandle = (char *)xevent;
             wxevent.SetEventType(eventType);
 
             Position x1, y1;
@@ -2500,7 +2339,7 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
             int x2, y2;
             win->GetPosition(&x2, &y2);
 
-            // The button x/y must be translated to wxWindows
+            // The button x/y must be translated to wxWidgets
             // window space - the widget might be a label or button,
             // within a form.
             int dx = 0;
@@ -2511,8 +2350,8 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
                 dy = y1;
             }
 
-            wxevent.m_x = xevent->xbutton.x + dx;
-            wxevent.m_y = xevent->xbutton.y + dy;
+            wxevent.m_x = eventx + dx;
+            wxevent.m_y = eventy + dy;
 
             wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
                 || (event_left_is_down (xevent)
@@ -2526,27 +2365,35 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
 
             wxevent.m_shiftDown = xevent->xbutton.state & ShiftMask;
             wxevent.m_controlDown = xevent->xbutton.state & ControlMask;
+            wxevent.m_altDown = xevent->xbutton.state & Mod3Mask;
+            wxevent.m_metaDown = xevent->xbutton.state & Mod1Mask;
+
+            wxevent.SetId(win->GetId());
+            wxevent.SetEventObject(win);
+
             return TRUE;
         }
     }
     return FALSE;
 }
 
-bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent)
+bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
+                         Widget WXUNUSED(widget), const XEvent *xevent)
 {
     switch (xevent->xany.type)
     {
     case KeyPress:
+    case KeyRelease:
         {
             char buf[20];
 
             KeySym keySym;
-#if 0
-            XComposeStatus compose;
-            (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, &compose);
-#endif // 0
-            (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
+            (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;
@@ -2635,8 +2482,7 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
             result = wxNO_COLORS;
     }
 
-    return (result);
-
+    return result;
 }
 
 // Changes the foreground and background colours to be derived from the current
@@ -2646,83 +2492,36 @@ void wxWindow::ChangeBackgroundColour()
 {
     WXWidget mainWidget = GetMainWidget();
     if ( mainWidget )
-        DoChangeBackgroundColour(mainWidget, m_backgroundColour);
-
-    // This not necessary
-#if 0
-
-    if (m_scrolledWindow && (GetMainWidget() != m_scrolledWindow))
-    {
-        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);
-
-        if (m_hScrollBar)
-            DoChangeBackgroundColour(m_hScrollBar, backgroundColour);
-        if (m_vScrollBar)
-            DoChangeBackgroundColour(m_vScrollBar, backgroundColour);
-    }
-#endif
+        wxDoChangeBackgroundColour(mainWidget, m_backgroundColour);
 }
 
 void wxWindow::ChangeForegroundColour()
 {
     WXWidget mainWidget = GetMainWidget();
     if ( mainWidget )
-        DoChangeForegroundColour(mainWidget, m_foregroundColour);
+        wxDoChangeForegroundColour(mainWidget, m_foregroundColour);
     if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
-        DoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);
-}
-
-// Change a widget's foreground and background colours.
-void wxWindow::DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
-{
-    // When should we specify the foreground, if it's calculated
-    // by wxComputeColours?
-    // Solution: say we start with the default (computed) foreground colour.
-    // If we call SetForegroundColour explicitly for a control or window,
-    // then the foreground is changed.
-    // Therefore SetBackgroundColour computes the foreground colour, and
-    // SetForegroundColour changes the foreground colour. The ordering is
-    // important.
-
-    Widget w = (Widget)widget;
-    XtVaSetValues(
-                  w,
-                  XmNforeground, foregroundColour.AllocColour(XtDisplay(w)),
-                  NULL
-                 );
+        wxDoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);
 }
 
-void wxWindow::DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour)
+bool wxWindow::SetBackgroundColour(const wxColour& col)
 {
-    wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
-        (wxColour*) NULL);
+    if ( !wxWindowBase::SetBackgroundColour(col) )
+        return FALSE;
 
-    XtVaSetValues ((Widget) widget,
-        XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
-        XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
-        XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
-        XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
-        NULL);
+    ChangeBackgroundColour();
 
-    if (changeArmColour)
-        XtVaSetValues ((Widget) widget,
-        XmNarmColor, g_itemColors[wxSELE_INDEX].pixel,
-        NULL);
+    return TRUE;
 }
 
-void wxWindow::SetBackgroundColour(const wxColour& col)
+bool wxWindow::SetForegroundColour(const wxColour& col)
 {
-    m_backgroundColour = col;
-    ChangeBackgroundColour();
-}
+    if ( !wxWindowBase::SetForegroundColour(col) )
+        return FALSE;
 
-void wxWindow::SetForegroundColour(const wxColour& col)
-{
-    m_foregroundColour = col;
     ChangeForegroundColour();
+
+    return TRUE;
 }
 
 void wxWindow::ChangeFont(bool keepOriginalSize)
@@ -2731,17 +2530,12 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
     // to its original size! We therefore have to set the size
     // back again. TODO: a better way in Motif?
     Widget w = (Widget) GetLabelWidget(); // Usually the main widget
-    if (w && m_windowFont.Ok())
+    if (w && m_font.Ok())
     {
         int width, height, width1, height1;
         GetSize(& width, & height);
 
-        // lesstif 0.87 hangs here
-#ifndef LESSTIF_VERSION
-        XtVaSetValues (w,
-            XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(w)),
-            NULL);
-#endif
+        wxDoChangeFont( GetLabelWidget(), m_font );
 
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
@@ -2758,27 +2552,45 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
 wxWindow *wxGetActiveWindow()
 {
     // TODO
+    wxFAIL_MSG("Not implemented");
     return NULL;
 }
 
-// ----------------------------------------------------------------------------
-// wxNoOptimize: switch off size optimization
-// ----------------------------------------------------------------------------
-
-int wxNoOptimize::m_count = 0;
-
-wxNoOptimize::wxNoOptimize()
+/* static */
+wxWindow *wxWindowBase::GetCapture()
 {
-    m_count ++;
+    return (wxWindow *)g_captureWindow;
 }
 
-wxNoOptimize::~wxNoOptimize()
+
+// Find the wxWindow at the current mouse position, returning the mouse
+// position.
+wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {
-    m_count --;
+    return wxFindWindowAtPoint(wxGetMousePosition());
 }
 
-bool wxNoOptimize::CanOptimize()
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
 {
-    return (m_count == 0);
+    Display *display = wxGlobalDisplay();
+    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;
+