]> git.saurik.com Git - wxWidgets.git/blobdiff - src/motif/window.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
implement editing_started and _done events for GTK+ >= 2.6
[wxWidgets.git] / src / motif / window.cpp
diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 3f2ba314ed696989087ca321be2589f4d879bb5b..efc13e52739d446f4e9778ee4206bea3ead9f1a5 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -1,40 +1,72 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        windows.cpp
+// Name:        src/motif/window.cpp
 // Purpose:     wxWindow
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxWindow
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "window.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#define XtScreen XTSCREEN
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/hash.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/button.h"
+    #include "wx/menu.h"
+    #include "wx/settings.h"
+    #include "wx/scrolwin.h"
+    #include "wx/layout.h"
+    #include "wx/menuitem.h"
+    #include "wx/module.h"
 #endif
 
 #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/menuitem.h"
-#include "wx/log.h"
-
-#if  USE_DRAG_AND_DROP
-#include "wx/dnd.h"
+#include "wx/evtloop.h"
+
+#if  wxUSE_DRAG_AND_DROP
+    #include "wx/dnd.h"
 #endif
 
 #endif
 
+// DoSetSizeIntr and DoMoveWindowIntr
+// PROBLEM:
+// under Motif composite controls (such as wxCalendarCtrl or generic wxSpinCtrl
+// did not 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/Xm.h>
 
 #include <Xm/DrawingA.h>
@@ -42,2251 +74,2630 @@
 #include <Xm/ScrollBar.h>
 #include <Xm/Frame.h>
 #include <Xm/Label.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"
 
 #include <string.h>
 
 
 #include "wx/motif/private.h"
 
 #include <string.h>
 
-#define SCROLL_MARGIN 4
-void wxCanvasRepaintProc (Widget, XtPointer, XmDrawingAreaCallbackStruct * cbs);
-void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs);
-void wxCanvasMotionEvent (Widget, XButtonEvent * event);
-void wxCanvasEnterLeave (Widget drawingArea, XtPointer clientData, XCrossingEvent * event);
+// ----------------------------------------------------------------------------
+// global variables for this module
+// ----------------------------------------------------------------------------
 
 
-#define event_left_is_down(x) ((x)->xbutton.state & Button1Mask)
-#define event_middle_is_down(x) ((x)->xbutton.state & Button2Mask)
-#define event_right_is_down(x) ((x)->xbutton.state & Button3Mask)
+extern wxHashTable *wxWidgetHashTable;
+static wxWindow* g_captureWindow = NULL;
 
 
-extern wxList wxPendingDelete;
 
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
 
 
-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
-  EVT_CHAR(wxWindow::OnChar)
-  EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-  EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-  EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-  EVT_IDLE(wxWindow::OnIdle)
-END_EVENT_TABLE()
+static void wxCanvasRepaintProc(Widget, XtPointer, XmDrawingAreaCallbackStruct * cbs);
+static void wxCanvasInputEvent(Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs);
+static void wxCanvasMotionEvent(Widget, XButtonEvent * event);
+static void wxCanvasEnterLeave(Widget drawingArea, XtPointer clientData, XCrossingEvent * event);
+static void wxScrollBarCallback(Widget widget, XtPointer clientData,
+                                XmScrollBarCallbackStruct *cbs);
+static void wxPanelItemEventHandler(Widget    wid,
+                                    XtPointer client_data,
+                                    XEvent*   event,
+                                    Boolean  *continueToDispatch);
 
 
-#endif
+// unused for now
+#if 0
 
 
+// Helper function for 16-bit fonts
+static int str16len(const char *s)
+{
+    int count = 0;
 
 
-// Constructor
-wxWindow::wxWindow()
-{
-    // Generic
-    m_windowId = 0;
-    m_windowStyle = 0;
-    m_windowParent = NULL;
-    m_windowEventHandler = this;
-    m_windowName = "";
-    m_windowCursor = *wxSTANDARD_CURSOR;
-    m_children = new wxList;
-    m_constraints = NULL;
-    m_constraintsInvolvedIn = NULL;
-    m_windowSizer = NULL;
-    m_sizerParent = NULL;
-    m_autoLayout = FALSE;
-    m_windowValidator = NULL;
-    m_defaultItem = NULL;
-    m_returnCode = 0;
-    m_caretWidth = 0; m_caretHeight = 0;
-    m_caretEnabled = FALSE;
-    m_caretShown = FALSE;
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
-    m_foregroundColour = *wxBLACK;
-    m_defaultForegroundColour = *wxBLACK ;
-    m_defaultBackgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
-
-#if  USE_DRAG_AND_DROP
-    m_pDropTarget = NULL;
-#endif
+    while (s[0] && s[1]) {
+        count++;
+        s += 2;
+    }
 
 
-    /// Motif-specific
-    m_mainWidget = (WXWidget) 0;
-    m_button1Pressed = FALSE;
-    m_button2Pressed = FALSE;
-    m_button3Pressed = FALSE;
-    m_winCaptured = FALSE;
-    m_isShown = TRUE;
-    m_hScrollBar = (WXWidget) 0;
-    m_vScrollBar = (WXWidget) 0;
-    m_borderWidget = (WXWidget) 0;
-    m_scrolledWindow = (WXWidget) 0;
-    m_drawingArea = (WXWidget) 0;
-    m_hScroll = FALSE;
-    m_vScroll = FALSE;
-    m_hScrollingEnabled = FALSE;
-    m_vScrollingEnabled = FALSE;
-    m_backingPixmap = (WXPixmap) 0;
-    m_pixmapWidth = 0;
-    m_pixmapHeight = 0;
-    m_pixmapOffsetX = 0;
-    m_pixmapOffsetY = 0;
-    m_lastTS = 0;
-    m_lastButton = 0;
+    return count;
 }
 
 }
 
-// Destructor
-wxWindow::~wxWindow()
-{
-  //// Motif-specific
+#endif // 0
 
 
-  // If m_drawingArea, we're a fully-fledged window with drawing area, scrollbars etc. (what wxCanvas used to be)
-  if (m_drawingArea)
-  {
-    // Destroy children before destroying self
-    DestroyChildren();
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
 
 
-    if (m_backingPixmap)
-      XFreePixmap (XtDisplay ((Widget) GetMainWidget()), (Pixmap) m_backingPixmap);
+#define event_left_is_down(x) ((x)->xbutton.state & Button1Mask)
+#define event_middle_is_down(x) ((x)->xbutton.state & Button2Mask)
+#define event_right_is_down(x) ((x)->xbutton.state & Button3Mask)
 
 
-    Widget w = (Widget) m_drawingArea;
-    wxDeleteWindowFromTable(w);
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
 
 
-    if (w)
-      XtDestroyWidget(w);
-    m_mainWidget = (WXWidget) 0;
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
 
 
-    // Only if we're _really_ a canvas (not a dialog box/panel)
-    if (m_scrolledWindow)
-    {
-      wxDeleteWindowFromTable((Widget) m_scrolledWindow);
-    }
+    BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
+        EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
+    END_EVENT_TABLE()
 
 
-    if (m_hScrollBar)
-    {
-      XtUnmanageChild ((Widget) m_hScrollBar);
-      XtDestroyWidget ((Widget) m_hScrollBar);
-    }
-    if (m_vScrollBar)
-    {
-      XtUnmanageChild ((Widget) m_vScrollBar);
-      XtDestroyWidget ((Widget) m_vScrollBar);
-    }
-    if (m_scrolledWindow)
-    {
-      XtUnmanageChild ((Widget) m_scrolledWindow);
-      XtDestroyWidget ((Widget) m_scrolledWindow);
-    }
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
 
 
-    if (m_borderWidget)
+void wxWindow::UnmanageAndDestroy(WXWidget widget)
+{
+    Widget w = (Widget)widget;
+    if ( w )
     {
     {
-      XtDestroyWidget ((Widget) m_borderWidget);
-      m_borderWidget = (WXWidget) 0;
+        XtUnmanageChild(w);
+        XtDestroyWidget(w);
     }
     }
-  }
+}
 
 
+bool wxWindow::MapOrUnmap(WXWidget widget, bool domap)
+{
+    Widget w = (Widget)widget;
+    if ( !w )
+        return false;
 
 
-  //// Generic stuff
+    //   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 );
 
 
-       // Have to delete constraints/sizer FIRST otherwise
-       // sizers may try to look at deleted windows as they
-       // delete themselves.
-#if USE_CONSTRAINTS
-    DeleteRelatedConstraints();
-    if (m_constraints)
+    // if the widget is not unmanaged, it still intercepts
+    // mouse events, even if it is not mapped (and hence invisible)
+    if ( domap )
     {
     {
-        // This removes any dangling pointers to this window
-        // in other windows' constraintsInvolvedIn lists.
-        UnsetConstraints(m_constraints);
-        delete m_constraints;
-        m_constraints = NULL;
+        XtManageChild(w);
+        // XtMapWidget(w);
     }
     }
-    if (m_windowSizer)
+    else
     {
     {
-        delete m_windowSizer;
-        m_windowSizer = NULL;
+        XtUnmanageChild(w);
+        // XtUnmapWidget(w);
     }
     }
-    // If this is a child of a sizer, remove self from parent
-    if (m_sizerParent)
-        m_sizerParent->RemoveChild((wxWindow *)this);
-#endif
-
-    if (m_windowParent)
-        m_windowParent->RemoveChild(this);
 
 
-    DestroyChildren();
+    return true;
+}
 
 
-    // Destroy the window
-    if (GetMainWidget())
-    {
-      wxDeleteWindowFromTable((Widget) GetMainWidget());
-      XtDestroyWidget((Widget) GetMainWidget());
-      SetMainWidget((WXWidget) NULL);
-    }
+// ----------------------------------------------------------------------------
+// constructors
+// ----------------------------------------------------------------------------
 
 
-    delete m_children;
-    m_children = NULL;
+void wxWindow::Init()
+{
+    // Motif-specific
+    m_needsRefresh = true;
+    m_mainWidget = (WXWidget) 0;
 
 
-    // Just in case the window has been Closed, but
-    // we're then deleting immediately: don't leave
-    // dangling pointers.
-    wxPendingDelete.DeleteObject(this);
+    m_winCaptured = false;
 
 
-    if ( m_windowValidator )
-           delete m_windowValidator;
-}
+    m_isShown = true;
 
 
-// Destroy the window (delayed, if a managed window)
-bool wxWindow::Destroy()
-{
-    delete this;
-    return TRUE;
-}
+    m_hScrollBar =
+    m_vScrollBar =
+    m_borderWidget =
+    m_scrolledWindow =
+    m_drawingArea = (WXWidget) 0;
 
 
-// Constructor
-bool wxWindow::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
-{
-    // Generic
-    m_windowId = 0;
-    m_windowStyle = 0;
-    m_windowParent = NULL;
-    m_windowEventHandler = this;
-    m_windowName = "";
-    m_windowCursor = *wxSTANDARD_CURSOR;
-    m_constraints = NULL;
-    m_constraintsInvolvedIn = NULL;
-    m_windowSizer = NULL;
-    m_sizerParent = NULL;
-    m_autoLayout = FALSE;
-    m_windowValidator = NULL;
-#if USE_DRAG_AND_DROP
-    m_pDropTarget = NULL;
-#endif
-    m_caretWidth = 0; m_caretHeight = 0;
-    m_caretEnabled = FALSE;
-    m_caretShown = FALSE;
-    m_minSizeX = -1;
-    m_minSizeY = -1;
-    m_maxSizeX = -1;
-    m_maxSizeY = -1;
-    m_defaultItem = NULL;
-    m_windowParent = NULL;
+    m_scrollPosX =
+    m_scrollPosY = 0;
 
 
-    // Motif-specific
-    m_mainWidget = (WXWidget) 0;
-    m_button1Pressed = FALSE;
-    m_button2Pressed = FALSE;
-    m_button3Pressed = FALSE;
-    m_winCaptured = FALSE;
-    m_isShown = TRUE;
-    m_hScrollBar = (WXWidget) 0;
-    m_vScrollBar = (WXWidget) 0;
-    m_borderWidget = (WXWidget) 0;
-    m_scrolledWindow = (WXWidget) 0;
-    m_drawingArea = (WXWidget) 0;
-    m_hScroll = FALSE;
-    m_vScroll = FALSE;
-    m_hScrollingEnabled = FALSE;
-    m_vScrollingEnabled = FALSE;
     m_backingPixmap = (WXPixmap) 0;
     m_backingPixmap = (WXPixmap) 0;
-    m_pixmapWidth = 0;
+    m_pixmapWidth =
     m_pixmapHeight = 0;
     m_pixmapHeight = 0;
-    m_pixmapOffsetX = 0;
-    m_pixmapOffsetY = 0;
-
-    if (!parent)
-        return FALSE;
-
-    if (parent) parent->AddChild(this);
 
 
-    m_returnCode = 0;
-
-    SetName(name);
+    m_pixmapOffsetX =
+    m_pixmapOffsetY = 0;
 
 
-    if ( id == -1 )
-       m_windowId = (int)NewControlId();
-    else
-       m_windowId = id;
+    m_lastTS = 0;
+    m_lastButton = 0;
+}
 
 
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
-    m_foregroundColour = *wxBLACK;
-    m_defaultForegroundColour = *wxBLACK ;
-    m_defaultBackgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
+// real construction (Init() must have been called before!)
+bool wxWindow::Create(wxWindow *parent, wxWindowID id,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxString& name)
+{
+    wxCHECK_MSG( parent, false, "can't create wxWindow without parent" );
 
 
-    m_windowStyle = style;
+    CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
 
 
-    if ( id == -1 )
-       m_windowId = (int)NewControlId();
-    else
-       m_windowId = id;
+    parent->AddChild(this);
+    PreCreation();
 
     //// TODO: we should probably optimize by only creating a
     //// a drawing area if we have one or more scrollbars (wxVSCROLL/wxHSCROLL).
     //// But for now, let's simplify things by always creating the
     //// drawing area, since otherwise the translations are different.
 
 
     //// TODO: we should probably optimize by only creating a
     //// a drawing area if we have one or more scrollbars (wxVSCROLL/wxHSCROLL).
     //// But for now, let's simplify things by always creating the
     //// drawing area, since otherwise the translations are different.
 
-  // New translations for getting mouse motion feedback
-  String translations =
-  "<Btn1Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
-     <Btn2Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
-     <Btn3Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
-     <BtnMotion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
-     <Btn1Down>: DrawingAreaInput() ManagerGadgetArm()\n\
-     <Btn2Down>: DrawingAreaInput() ManagerGadgetArm()\n\
-     <Btn3Down>: DrawingAreaInput() ManagerGadgetArm()\n\
-     <Btn1Up>: DrawingAreaInput() ManagerGadgetActivate()\n\
-     <Btn2Up>: DrawingAreaInput() ManagerGadgetActivate()\n\
-     <Btn3Up>: DrawingAreaInput() ManagerGadgetActivate()\n\
-     <Motion>: wxCanvasMotionEvent() DrawingAreaInput()\n\
-     <EnterWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
-     <LeaveWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
-     <Key>: DrawingAreaInput()";
-
-  XtActionsRec actions[1];
-  actions[0].string = "wxCanvasMotionEvent";
-  actions[0].proc = (XtActionProc) wxCanvasMotionEvent;
-  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_scrolledWindow = (WXWidget) XtVaCreateManagedWidget ("scrolledWindow",
-                                           xmScrolledWindowWidgetClass, m_borderWidget ? (Widget) m_borderWidget : parentWidget,
+    // New translations for getting mouse motion feedback
+    static const String translations = wxMOTIF_STR(
+"<Btn1Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
+<Btn2Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
+<Btn3Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
+<BtnMotion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
+<Btn1Down>: DrawingAreaInput() ManagerGadgetArm()\n\
+<Btn2Down>: DrawingAreaInput() ManagerGadgetArm()\n\
+<Btn3Down>: DrawingAreaInput() ManagerGadgetArm()\n\
+<Btn1Up>: DrawingAreaInput() ManagerGadgetActivate()\n\
+<Btn2Up>: DrawingAreaInput() ManagerGadgetActivate()\n\
+<Btn3Up>: DrawingAreaInput() ManagerGadgetActivate()\n\
+<Motion>: wxCanvasMotionEvent() DrawingAreaInput()\n\
+<EnterWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
+<LeaveWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
+<Key>: DrawingAreaInput()");
+
+    XtActionsRec actions[1];
+    actions[0].string = wxMOTIF_STR("wxCanvasMotionEvent");
+    actions[0].proc = (XtActionProc) wxCanvasMotionEvent;
+    XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
+
+    Widget parentWidget = (Widget) parent->GetClientWidget();
+    m_borderWidget = wxCreateBorderWidget( (WXWidget)parentWidget, style );
+
+    m_scrolledWindow = (WXWidget)XtVaCreateManagedWidget
+                                 (
+                                  "scrolledWindow",
+                                  xmScrolledWindowWidgetClass,
+                                  m_borderWidget ? (Widget) m_borderWidget
+                                                 : parentWidget,
+                                  XmNresizePolicy, XmRESIZE_NONE,
                                   XmNspacing, 0,
                                   XmNspacing, 0,
-                                 XmNscrollingPolicy, XmAPPLICATION_DEFINED,
-                                           NULL);
-
-  XtTranslations ptr;
-  m_drawingArea = (WXWidget) XtVaCreateWidget ((char*) (const char*) name,
-                                  xmDrawingAreaWidgetClass, (Widget) m_scrolledWindow,
-                                        XmNunitType, XmPIXELS,
-//                                      XmNresizePolicy, XmRESIZE_ANY,
-                                        XmNresizePolicy, XmRESIZE_NONE,
-                                         XmNmarginHeight, 0,
-                                         XmNmarginWidth, 0,
-             XmNtranslations, ptr = XtParseTranslationTable (translations),
-                                        NULL);
-  /*
-  if (GetWindowStyleFlag() & wxOVERRIDE_KEY_TRANSLATIONS)
-  {
-    XtFree ((char *) ptr);
-    ptr = XtParseTranslationTable ("<Key>: DrawingAreaInput()");
-    XtOverrideTranslations ((Widget) m_drawingArea, ptr);
-    XtFree ((char *) ptr);
-  }
-  */
+                                  XmNscrollingPolicy, XmAPPLICATION_DEFINED,
+                                  //XmNscrollBarDisplayPolicy, XmAS_NEEDED,
+                                  NULL
+                                 );
+
+    XtTranslations ptr = XtParseTranslationTable(translations);
+    m_drawingArea = (WXWidget)XtVaCreateWidget
+                              (
+                               name,
+                               xmDrawingAreaWidgetClass, (Widget) m_scrolledWindow,
+                               XmNunitType, XmPIXELS,
+                               // XmNresizePolicy, XmRESIZE_ANY,
+                               XmNresizePolicy, XmRESIZE_NONE,
+                               XmNmarginHeight, 0,
+                               XmNmarginWidth, 0,
+                               XmNtranslations, ptr,
+                               NULL
+                              );
+    XtFree((char *) ptr);
+
+#if 0
+    if (GetWindowStyleFlag() & wxOVERRIDE_KEY_TRANSLATIONS)
+    {
+        ptr = XtParseTranslationTable ("<Key>: DrawingAreaInput()");
+        XtOverrideTranslations ((Widget) m_drawingArea, ptr);
+        XtFree ((char *) ptr);
+    }
+#endif // 0
 
 
-  wxAddWindowToTable((Widget) m_drawingArea, this);
-  wxAddWindowToTable((Widget) m_scrolledWindow, this);
+    wxAddWindowToTable((Widget) m_drawingArea, this);
+    wxAddWindowToTable((Widget) m_scrolledWindow, this);
 
 
-  /*
-   * This order is very important in Motif 1.2.1
-   *
-   */
+    // This order is very important in Motif 1.2.1
+    XtRealizeWidget ((Widget) m_scrolledWindow);
+    XtRealizeWidget ((Widget) m_drawingArea);
+    XtManageChild ((Widget) m_drawingArea);
 
 
-  XtRealizeWidget ((Widget) m_scrolledWindow);
-  XtRealizeWidget ((Widget) m_drawingArea);
-  XtManageChild ((Widget) m_drawingArea);
+    ptr = XtParseTranslationTable("<Configure>: resize()");
+    XtOverrideTranslations((Widget) m_drawingArea, ptr);
+    XtFree ((char *) ptr);
 
 
-  XtOverrideTranslations ((Widget) m_drawingArea,
-                  ptr = XtParseTranslationTable ("<Configure>: resize()"));
-  XtFree ((char *) ptr);
+    XtAddCallback ((Widget) m_drawingArea, XmNexposeCallback, (XtCallbackProc) wxCanvasRepaintProc, (XtPointer) this);
+    XtAddCallback ((Widget) m_drawingArea, XmNinputCallback, (XtCallbackProc) wxCanvasInputEvent, (XtPointer) this);
 
 
-  XtAddCallback ((Widget) m_drawingArea, XmNexposeCallback, (XtCallbackProc) wxCanvasRepaintProc, (XtPointer) this);
-  XtAddCallback ((Widget) m_drawingArea, XmNinputCallback, (XtCallbackProc) wxCanvasInputEvent, (XtPointer) this);
+    XtAddEventHandler(
+                      (Widget)m_drawingArea,
+                       PointerMotionHintMask | EnterWindowMask |
+                       LeaveWindowMask | FocusChangeMask,
+                       False,
+                       (XtEventHandler) wxCanvasEnterLeave,
+                       (XtPointer) this
+                     );
 
 
-  /* TODO?
-  display = XtDisplay (scrolledWindow);
-  xwindow = XtWindow (drawingArea);
-  */
+    XmScrolledWindowSetAreas(
+                             (Widget)m_scrolledWindow,
+                             (Widget) 0, (Widget) 0,
+                             (Widget) m_drawingArea);
 
 
-  XtAddEventHandler ((Widget) m_drawingArea, PointerMotionHintMask | EnterWindowMask | LeaveWindowMask | FocusChangeMask,
-    False, (XtEventHandler) wxCanvasEnterLeave, (XtPointer) this);
+    PostCreation();
 
 
-    return TRUE;
+    // Without this, the cursor may not be restored properly (e.g. in splitter
+    // sample).
+    SetCursor(*wxSTANDARD_CURSOR);
+    DoSetSizeIntr(pos.x, pos.y, size.x,size.y, wxSIZE_AUTO, true);
+    return true;
 }
 
 }
 
-void wxWindow::SetFocus()
+// Destructor
+wxWindow::~wxWindow()
 {
 {
-  XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT);
-  XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT);
-}
+    if (g_captureWindow == this)
+        g_captureWindow = NULL;
 
 
-void wxWindow::Enable(bool enable)
-{
-  if (GetMainWidget())
-  {
-    XtSetSensitive((Widget) GetMainWidget(), enable);
-    XmUpdateDisplay((Widget) GetMainWidget());
-  }
-}
+    m_isBeingDeleted = true;
 
 
-void wxWindow::CaptureMouse()
-{
-  if (m_winCaptured)
-    return;
-    
-  if (GetMainWidget())
-    XtAddGrab((Widget) GetMainWidget(), TRUE, FALSE);
+    // Motif-specific actions first
+    WXWidget wMain = GetMainWidget();
+    if ( wMain )
+    {
+        // Removes event handlers
+        DetachWidget(wMain);
+    }
 
 
-  m_winCaptured = TRUE;
-}
+    // If m_drawingArea, we're a fully-fledged window with drawing area,
+    // scrollbars etc. (what wxCanvas used to be)
+    if ( m_drawingArea )
+    {
+        // Destroy children before destroying self
+        DestroyChildren();
 
 
-void wxWindow::ReleaseMouse()
-{
-  if (!m_winCaptured)
-    return;
-    
-  if (GetMainWidget())
-    XtRemoveGrab((Widget) GetMainWidget());
-  m_winCaptured = FALSE;
-}
+        if (m_backingPixmap)
+            XFreePixmap (XtDisplay ((Widget) GetMainWidget()), (Pixmap) m_backingPixmap);
 
 
-// Push/pop event handler (i.e. allow a chain of event handlers
-// be searched)
-void wxWindow::PushEventHandler(wxEvtHandler *handler)
-{
-       handler->SetNextHandler(GetEventHandler());
-       SetEventHandler(handler);
-}
+        Widget w = (Widget) m_drawingArea;
+        wxDeleteWindowFromTable(w);
 
 
-wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
-{
-       if ( GetEventHandler() )
-       {
-               wxEvtHandler *handlerA = GetEventHandler();
-               wxEvtHandler *handlerB = handlerA->GetNextHandler();
-               handlerA->SetNextHandler(NULL);
-               SetEventHandler(handlerB);
-               if ( deleteHandler )
-               {
-                       delete handlerA;
-                       return NULL;
-               }
-               else
-                       return handlerA;
-       }
-       else
-               return NULL;
-}
+        if (w)
+        {
+            XtDestroyWidget(w);
+            m_drawingArea = (WXWidget) 0;
+        }
 
 
-#if    USE_DRAG_AND_DROP
+        // Only if we're _really_ a canvas (not a dialog box/panel)
+        if (m_scrolledWindow)
+        {
+            wxDeleteWindowFromTable((Widget) m_scrolledWindow);
+        }
 
 
-void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
-{
-  if ( m_pDropTarget != 0 ) {
-    delete m_pDropTarget;
-  }
+        if (m_hScrollBar)
+        {
+            wxDeleteWindowFromTable((Widget) m_hScrollBar);
+            XtUnmanageChild((Widget) m_hScrollBar);
+        }
+        if (m_vScrollBar)
+        {
+            wxDeleteWindowFromTable((Widget) m_vScrollBar);
+            XtUnmanageChild((Widget) m_vScrollBar);
+        }
 
 
-  m_pDropTarget = pDropTarget;
-  if ( m_pDropTarget != 0 )
-  {
-    // TODO
-  }
-}
+        if (m_hScrollBar)
+            XtDestroyWidget((Widget) m_hScrollBar);
+        if (m_vScrollBar)
+            XtDestroyWidget((Widget) m_vScrollBar);
 
 
-#endif
+        UnmanageAndDestroy(m_scrolledWindow);
 
 
-// Old style file-manager drag&drop
-void wxWindow::DragAcceptFiles(bool accept)
-{
-    // TODO
-}
+        if (m_borderWidget)
+        {
+            XtDestroyWidget ((Widget) m_borderWidget);
+            m_borderWidget = (WXWidget) 0;
+        }
+    }
+    else // Why wasn't this here before? JACS 8/3/2000
+        DestroyChildren();
 
 
-// Get total size
-void wxWindow::GetSize(int *x, int *y) const
-{
-  if (m_drawingArea)
-  {
-    CanvasGetSize(x, y);
-    return;
-  }
 
 
-  Widget widget = (Widget) GetMainWidget();
-  Dimension xx, yy;
-  XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
-  *x = xx; *y = yy;
+    // Destroy the window
+    if (GetMainWidget())
+    {
+        // If this line (XtDestroyWidget) causes a crash, you may comment it out.
+        // Child widgets will get destroyed automatically when a frame
+        // 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);
+    }
 }
 
 }
 
-void wxWindow::GetPosition(int *x, int *y) const
-{
-  if (m_drawingArea)
-  {
-    CanvasGetPosition(x, y);
-    return;
-  }
-  Widget widget = (Widget) GetMainWidget();
-  Position xx, yy;
-  XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL);
-  *x = xx; *y = yy;
-}
+// ----------------------------------------------------------------------------
+// scrollbar management
+// ----------------------------------------------------------------------------
 
 
-void wxWindow::ScreenToClient(int *x, int *y) const
+WXWidget wxWindow::DoCreateScrollBar(WXWidget parent,
+                                     wxOrientation orientation,
+                                     void (*callback)())
 {
 {
-    // TODO
-}
+    int orient = ( orientation & wxHORIZONTAL ) ? XmHORIZONTAL : XmVERTICAL;
+    Widget sb =
+        XtVaCreateManagedWidget( "scrollBarWidget",
+                                 xmScrollBarWidgetClass, (Widget)parent,
+                                 XmNorientation, orient,
+                                 XmNincrement, 1,
+                                 XmNvalue, 0,
+                                 NULL );
 
 
-void wxWindow::ClientToScreen(int *x, int *y) const
-{
-  Widget widget = (Widget) GetMainWidget();
-  Display *display = XtDisplay(widget);
-  Window rootWindow = RootWindowOfScreen(XtScreen(widget));
-  Window thisWindow;
-  if (this->IsKindOf(CLASSINFO(wxFrame)))
-  {
-    wxFrame *fr = (wxFrame *)this;
-    // TODO
-    //    thisWindow = XtWindow(fr->m_clientArea);
-  }
-  else
-    thisWindow = XtWindow((Widget)widget);
+    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 );
 
 
-  Window childWindow;
-  int xx = *x;
-  int yy = *y;
-  XTranslateCoordinates(display, thisWindow, rootWindow, xx, yy, x, y, &childWindow);
+    return (WXWidget)sb;
 }
 
 }
 
-void wxWindow::SetCursor(const wxCursor& cursor)
+// Helper function
+void wxWindow::CreateScrollbar(wxOrientation orientation)
 {
 {
-  m_windowCursor = cursor;
-  if (m_windowCursor.Ok())
-  {
-    /* TODO when wxCursor implemented
-    WXDisplay *dpy = GetXDisplay();
-    Cursor x_cursor = cursor.GetXCursor(dpy);
+    wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
 
 
-    Widget w = (Widget) GetMainWidget();
-    Window win = XtWindow(w);
-    XDefineCursor((Display*) dpy, win, x_cursor);
-    */
-  }
-}
+    XtVaSetValues( (Widget) m_scrolledWindow,
+                   XmNresizePolicy, XmRESIZE_NONE,
+                   NULL );
 
 
+    wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+    // Add scrollbars if required
+    if (orientation == wxHORIZONTAL)
+    {
+        m_hScrollBar = DoCreateScrollBar( m_scrolledWindow, wxHORIZONTAL,
+                                          (void (*)())wxScrollBarCallback );
 
 
-// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindow::GetClientSize(int *x, int *y) const
-{
-  Widget widget = (Widget) GetMainWidget();
-  Dimension xx, yy;
-  XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
-  *x = xx; *y = yy;
-}
+        wxDoChangeBackgroundColour(m_hScrollBar, backgroundColour, true);
 
 
-void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-  if (m_drawingArea)
-  {
-    CanvasSetSize(x, y, width, height, sizeFlags);
-    return;
-  }
-  Widget widget = (Widget) GetMainWidget();
+        XtRealizeWidget( (Widget)m_hScrollBar );
 
 
-  if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    XtVaSetValues(widget, XmNx, x, NULL);
-  if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    XtVaSetValues(widget, XmNy, y, NULL);
-  if (width > -1)
-    XtVaSetValues(widget, XmNwidth, width, NULL);
-  if (height > -1)
-    XtVaSetValues(widget, XmNheight, height, NULL);
+        XtVaSetValues((Widget) m_scrolledWindow,
+            XmNhorizontalScrollBar, (Widget) m_hScrollBar,
+            NULL);
 
 
-  wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-  sizeEvent.SetEventObject(this);
-  
-  GetEventHandler()->ProcessEvent(sizeEvent);
-}
+        wxAddWindowToTable( (Widget)m_hScrollBar, this );
+    }
+    else if (orientation == wxVERTICAL)
+    {
+        m_vScrollBar = DoCreateScrollBar( m_scrolledWindow, wxVERTICAL,
+                                          (void (*)())wxScrollBarCallback );
 
 
-void wxWindow::SetClientSize(int width, int height)
-{
-  if (m_drawingArea)
-  {
-    CanvasSetClientSize(width, height);
-    return;
-  }
+        wxDoChangeBackgroundColour(m_vScrollBar, backgroundColour, true);
 
 
-  Widget widget = (Widget) GetMainWidget();
+        XtRealizeWidget((Widget)m_vScrollBar);
 
 
-  if (width > -1)
-    XtVaSetValues(widget, XmNwidth, width, NULL);
-  if (height > -1)
-    XtVaSetValues(widget, XmNheight, height, NULL);
+        XtVaSetValues((Widget) m_scrolledWindow,
+            XmNverticalScrollBar, (Widget) m_vScrollBar,
+            NULL);
 
 
-  wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-  sizeEvent.SetEventObject(this);
-  
-  GetEventHandler()->ProcessEvent(sizeEvent);
-}
+        wxAddWindowToTable( (Widget)m_vScrollBar, this );
+    }
 
 
-// For implementation purposes - sometimes decorations make the client area
-// smaller
-wxPoint wxWindow::GetClientAreaOrigin() const
-{
-    return wxPoint(0, 0);
+    XtVaSetValues( (Widget) m_scrolledWindow,
+                   XmNresizePolicy, XmRESIZE_ANY,
+                   NULL );
 }
 
 }
 
-// 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::DestroyScrollbar(wxOrientation orientation)
 {
 {
-    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
-    {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        x += pt.x; y += pt.y;
-    }
-}
+    wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
 
 
-bool wxWindow::Show(bool show)
-{
-    if (show)
+    XtVaSetValues((Widget) m_scrolledWindow,
+                  XmNresizePolicy, XmRESIZE_NONE,
+                  NULL);
+    String stringSB = orientation == wxHORIZONTAL ?
+        XmNhorizontalScrollBar : XmNverticalScrollBar;
+    WXWidget* widgetSB = orientation == wxHORIZONTAL ?
+        &m_hScrollBar : &m_vScrollBar;
+
+    if( *widgetSB )
     {
     {
-       if (m_borderWidget || m_scrolledWindow)
-       {
-           XtMapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-       }
-       else
-       {
-           XtMapWidget((Widget) GetMainWidget());
-       }
+        wxDeleteWindowFromTable( (Widget)*widgetSB );
+        XtDestroyWidget( (Widget)*widgetSB );
+        *widgetSB = (WXWidget)NULL;
     }
     }
-    else
-    {
-       if (m_borderWidget || m_scrolledWindow)
-       {
-           XtUnmapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-       }
-       else
-       {
-           XtUnmapWidget((Widget) GetMainWidget());
-       }
-    }
-
-  /*
-    Window xwin = (Window) GetXWindow();
-    Display *xdisp = (Display*) GetXDisplay();
-    if (show)
-        XMapWindow(xdisp, xwin);
-    else
-        XUnmapWindow(xdisp, xwin);
-   */
 
 
-    m_isShown = show;
+    XtVaSetValues( (Widget)m_scrolledWindow,
+                   stringSB, (Widget) 0,
+                   NULL );
 
 
-    return TRUE;
+    XtVaSetValues((Widget) m_scrolledWindow,
+                  XmNresizePolicy, XmRESIZE_ANY,
+                  NULL);
 }
 
 }
 
-bool wxWindow::IsShown() const
-{
-    return m_isShown;
-}
+// ---------------------------------------------------------------------------
+// basic operations
+// ---------------------------------------------------------------------------
 
 
-int wxWindow::GetCharHeight() const
+void wxWindow::SetFocus()
 {
 {
-    // TODO
-    return 0;
+    Widget wMain = (Widget) GetMainWidget();
+    XmProcessTraversal(wMain, XmTRAVERSE_CURRENT);
+    XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT);
 }
 
 }
 
-int wxWindow::GetCharWidth() const
-{
-    // TODO
-    return 0;
+// Get the window with the focus
+wxWindow *wxWindowBase::DoFindFocus()
+{
+    // TODO Problems:
+    // (1) Can there be multiple focussed widgets in an application?
+    // In which case we need to find the top-level window that's
+    // currently active.
+    // (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::compatibility_iterator node = wxTopLevelWindows.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *win = node->GetData();
+
+        Widget w = XmGetFocusWidget ((Widget) win->GetTopWidget());
+
+        if (w != (Widget) NULL)
+        {
+            winFocus = wxGetWindowFromTable(w);
+            if ( winFocus )
+                break;
+        }
+    }
+
+    return winFocus;
 }
 
 }
 
-void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
-                           int *descent, int *externalLeading, const wxFont *theFont, bool) const
+bool wxWindow::Enable(bool enable)
 {
 {
-  wxFont *fontToUse = (wxFont *)theFont;
-  if (!fontToUse)
-    fontToUse = (wxFont *) & m_windowFont;
+    if ( !wxWindowBase::Enable(enable) )
+        return false;
 
 
-    // TODO
+    Widget wMain = (Widget)GetMainWidget();
+    if ( wMain )
+    {
+        XtSetSensitive(wMain, enable);
+        XmUpdateDisplay(wMain);
+    }
+
+    return true;
 }
 
 }
 
-void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
+bool wxWindow::Show(bool show)
 {
 {
-    Display *display = XtDisplay((Widget) GetMainWidget());
-    Window thisWindow = XtWindow((Widget) GetMainWidget());
-
-    XExposeEvent dummyEvent;
-    int width, height;
-    GetSize(&width, &height);
+    if ( !wxWindowBase::Show(show) )
+        return false;
 
 
-    dummyEvent.type = Expose;
-    dummyEvent.display = display;
-    dummyEvent.send_event = True;
-    dummyEvent.window = thisWindow;
-    if (rect)
+    if (m_borderWidget || m_scrolledWindow)
     {
     {
-      dummyEvent.x = rect->x;
-      dummyEvent.y = rect->y;
-      dummyEvent.width = rect->width;
-      dummyEvent.height = rect->height;
+        MapOrUnmap(m_borderWidget ? m_borderWidget : m_scrolledWindow, show);
+        // MapOrUnmap(m_drawingArea, show);
     }
     else
     {
     }
     else
     {
-      dummyEvent.x = 0;
-      dummyEvent.y = 0;
-      dummyEvent.width = width;
-      dummyEvent.height = height;
-    }
-    dummyEvent.count = 0;
-
-    if (eraseBack)
-    {
-        wxClientDC dc(this);
-        dc.Clear();
+        if ( !MapOrUnmap(GetTopWidget(), show) )
+            MapOrUnmap(GetMainWidget(), show);
     }
 
     }
 
-    XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
+    return true;
 }
 
 }
 
-// Responds to colour changes: passes event on to children.
-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
+// Raise the window to the top of the Z order
+void wxWindow::Raise()
 {
 {
-    wxNode *node = GetChildren()->First();
-    while ( node )
-    {
-        // Only propagate to non-top-level windows
-        wxWindow *win = (wxWindow *)node->Data();
-        if ( win->GetParent() )
-        {
-            wxSysColourChangedEvent event2;
-            event.m_eventObject = win;
-            win->GetEventHandler()->ProcessEvent(event2);
-        }
-
-        node = node->Next();
-    }
+    Widget wTop = (Widget) GetTopWidget();
+    Window window = XtWindow(wTop);
+    XRaiseWindow(XtDisplay(wTop), window);
 }
 
 }
 
-// This can be called by the app (or wxWindows) to do default processing for the current
-// event. Save message/event info in wxWindow so they can be used in this function.
-long wxWindow::Default()
+// Lower the window to the bottom of the Z order
+void wxWindow::Lower()
 {
 {
-    // TODO
-    return 0;
+    Widget wTop = (Widget) GetTopWidget();
+    Window window = XtWindow(wTop);
+    XLowerWindow(XtDisplay(wTop), window);
 }
 
 }
 
-void wxWindow::InitDialog()
+void wxWindow::SetLabel(const wxString& label)
 {
 {
-  wxInitDialogEvent event(GetId());
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
+    XtVaSetValues((Widget)GetMainWidget(), XmNtitle,
+                  (const char*)label.mb_str(), NULL);
 }
 
 }
 
-// Default init dialog behaviour is to transfer data to window
-void wxWindow::OnInitDialog(wxInitDialogEvent& event)
+wxString wxWindow::GetLabel() const
 {
 {
-  TransferDataToWindow();
-}
+    char *label = NULL;
+    XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &label, NULL);
 
 
-// Caret manipulation
-void wxWindow::CreateCaret(int w, int h)
-{
-  m_caretWidth = w;
-  m_caretHeight = h;
-  m_caretEnabled = TRUE;
+    return wxString(label);
 }
 
 }
 
-void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
+void wxWindow::DoCaptureMouse()
 {
 {
-    // TODO
-}
+    g_captureWindow = this;
+    if ( m_winCaptured )
+        return;
 
 
-void wxWindow::ShowCaret(bool show)
-{
-    // TODO
-}
+    Widget wMain = (Widget)GetMainWidget();
+    if ( wMain )
+        XtAddGrab(wMain, True, False);
 
 
-void wxWindow::DestroyCaret()
-{
-    // TODO
-    m_caretEnabled = FALSE;
+    m_winCaptured = true;
 }
 
 }
 
-void wxWindow::SetCaretPos(int x, int y)
+void wxWindow::DoReleaseMouse()
 {
 {
-    // TODO
-}
+    g_captureWindow = NULL;
+    if ( !m_winCaptured )
+        return;
 
 
-void wxWindow::GetCaretPos(int *x, int *y) const
-{
-    // TODO
-}
+    Widget wMain = (Widget)GetMainWidget();
+    if ( wMain )
+        XtRemoveGrab(wMain);
 
 
-wxWindow *wxGetActiveWindow()
-{
-    // TODO
-    return NULL;
+    m_winCaptured = false;
 }
 
 }
 
-void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
+bool wxWindow::SetFont(const wxFont& font)
 {
 {
-    m_minSizeX = minW;
-    m_minSizeY = minH;
-    m_maxSizeX = maxW;
-    m_maxSizeY = maxH;
-
-    if (!this->IsKindOf(CLASSINFO(wxFrame)))
-      return;
+    if ( !wxWindowBase::SetFont(font) )
+    {
+        // nothing to do
+        return false;
+    }
 
 
-    wxFrame *frame = (wxFrame *)this;
+    ChangeFont();
 
 
-    /* Uncomment when wxFrame implemented
-    if (minW > -1)
-      XtVaSetValues((Widget) frame->m_frameShell, XmNminWidth, minW, NULL);
-    if (minH > -1)
-      XtVaSetValues((Widget) frame->m_frameShell, XmNminHeight, minH, NULL);
-    if (maxW > -1)
-      XtVaSetValues((Widget) frame->m_frameShell, XmNmaxWidth, maxW, NULL);
-    if (maxH > -1)
-      XtVaSetValues((Widget) frame->m_frameShell, XmNmaxHeight, maxH, NULL);
-    if (incW > -1)
-      XtVaSetValues((Widget) frame->m_frameShell, XmNwidthInc, incW, NULL);
-    if (incH > -1)
-      XtVaSetValues((Widget) frame->m_frameShell, XmNheightInc, incH, NULL);
-      */
+    return true;
 }
 
 }
 
-void wxWindow::Centre(int direction)
+bool wxWindow::SetCursor(const wxCursor& cursor)
 {
 {
-  int x, y, width, height, panel_width, panel_height, new_x, new_y;
-
-  wxWindow *father = (wxWindow *)GetParent();
-  if (!father)
-    return;
-
-  father->GetClientSize(&panel_width, &panel_height);
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
-
-  new_x = -1;
-  new_y = -1;
+    if ( !wxWindowBase::SetCursor(cursor) )
+    {
+        // no change
+        return false;
+    }
 
 
-  if (direction & wxHORIZONTAL)
-    new_x = (int)((panel_width - width)/2);
+    //    wxASSERT_MSG( m_cursor.Ok(),
+    //                  wxT("cursor must be valid after call to the base version"));
+    const wxCursor* cursor2 = NULL;
+    if (m_cursor.Ok())
+        cursor2 = & m_cursor;
+    else
+        cursor2 = wxSTANDARD_CURSOR;
 
 
-  if (direction & wxVERTICAL)
-    new_y = (int)((panel_height - height)/2);
+    WXDisplay *dpy = GetXDisplay();
+    WXCursor x_cursor = cursor2->GetXCursor(dpy);
 
 
-  SetSize(new_x, new_y, -1, -1);
+    Widget w = (Widget) GetMainWidget();
+    Window win = XtWindow(w);
+    XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);
 
 
+    return true;
 }
 
 // Coordinates relative to the window
 void wxWindow::WarpPointer (int x, int y)
 {
 }
 
 // Coordinates relative to the window
 void wxWindow::WarpPointer (int x, int y)
 {
-  XWarpPointer (XtDisplay((Widget) GetClientWidget()), None, XtWindow((Widget) GetClientWidget()), 0, 0, 0, 0, x, y);
-}
+    Widget wClient = (Widget)GetClientWidget();
 
 
-void wxWindow::OnEraseBackground(wxEraseEvent& event)
-{
-    // TODO
-    Default();
+    XWarpPointer(XtDisplay(wClient), None, XtWindow(wClient), 0, 0, 0, 0, x, y);
 }
 
 }
 
+// ---------------------------------------------------------------------------
+// scrolling stuff
+// ---------------------------------------------------------------------------
+
 int wxWindow::GetScrollPos(int orient) const
 {
 int wxWindow::GetScrollPos(int orient) const
 {
-    // TODO
-    return 0;
+    if (orient == wxHORIZONTAL)
+        return m_scrollPosX;
+    else
+        return m_scrollPosY;
+
+#if 0
+    Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar);
+    if (scrollBar)
+    {
+        int pos;
+        XtVaGetValues(scrollBar, XmNvalue, &pos, NULL);
+        return pos;
+    }
+    else
+        return 0;
+#endif // 0
 }
 
 }
 
-// This now returns the whole range, not just the number
-// of positions that we can scroll.
+// This now returns the whole range, not just the number of positions that we
+// can scroll.
 int wxWindow::GetScrollRange(int orient) const
 {
 int wxWindow::GetScrollRange(int orient) const
 {
-    // TODO
-    return 0;
+    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 = 0;
+    if (scrollBar)
+        XtVaGetValues(scrollBar, XmNmaximum, &range, NULL);
+    return range;
 }
 
 int wxWindow::GetScrollThumb(int orient) const
 {
 }
 
 int wxWindow::GetScrollThumb(int orient) const
 {
-    // TODO
-    return 0;
+    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
+    //wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
+
+    int thumb = 0;
+    if (scrollBar)
+        XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL);
+    return thumb;
 }
 
 }
 
-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindow::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
 {
 {
-    // TODO
-    return;
+    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
+
+    if ( scrollBar )
+    {
+        XtVaSetValues (scrollBar, XmNvalue, pos, NULL);
+    }
+
+    SetInternalScrollPos((wxOrientation)orient, pos);
 }
 
 // New function that will replace some of the above.
 void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 }
 
 // New function that will replace some of the above.
 void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
-    int range, bool refresh)
+                            int range, bool WXUNUSED(refresh))
 {
 {
-    // TODO
-}
+    int oldW, oldH;
+    GetSize(& oldW, & oldH);
 
 
-// Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
-{
-    // TODO
-    return;
-}
+    if (range == 0)
+        range = 1;
+    if (thumbVisible == 0)
+        thumbVisible = 1;
 
 
-void wxWindow::SetFont(const wxFont& font)
-{
-    m_windowFont = font;
+    if (thumbVisible > range)
+        thumbVisible = range;
 
 
-    if (!m_windowFont.Ok())
-           return;
-    // TODO
-}
+    // Save the old state to see if it changed
+    WXWidget oldScrollBar = GetScrollbar((wxOrientation)orient);
 
 
-void wxWindow::OnChar(wxKeyEvent& event)
-{
-    if ( event.KeyCode() == WXK_TAB ) {
-        // propagate the TABs to the parent - it's up to it to decide what
-        // to do with it
-        if ( GetParent() ) {
-            if ( GetParent()->ProcessEvent(event) )
-                return;
+    if (orient == wxHORIZONTAL)
+    {
+        if (thumbVisible == range)
+        {
+            if (m_hScrollBar)
+                DestroyScrollbar(wxHORIZONTAL);
+        }
+        else
+        {
+            if (!m_hScrollBar)
+                CreateScrollbar(wxHORIZONTAL);
         }
     }
         }
     }
-}
-
-void wxWindow::OnPaint(wxPaintEvent& event)
-{
-       Default();
-}
+    if (orient == wxVERTICAL)
+    {
+        if (thumbVisible == range)
+        {
+            if (m_vScrollBar)
+                DestroyScrollbar(wxVERTICAL);
+        }
+        else
+        {
+            if (!m_vScrollBar)
+                CreateScrollbar(wxVERTICAL);
+        }
+    }
+    WXWidget newScrollBar =  GetScrollbar((wxOrientation)orient);
 
 
-bool wxWindow::IsEnabled() const
-{
-    // TODO
-    return FALSE;
-}
-
-// Dialog support: override these and call
-// base class members to add functionality
-// that can't be done using validators.
-// NOTE: these functions assume that controls
-// are direct children of this window, not grandchildren
-// or other levels of descendant.
-
-// Transfer values to controls. If returns FALSE,
-// it's an application error (pops up a dialog)
-bool wxWindow::TransferDataToWindow()
-{
-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() &&
-                    !child->GetValidator()->TransferToWindow() )
-               {
-                       wxMessageBox("Application Error", "Could not transfer data to window", wxOK|wxICON_EXCLAMATION);
-                       return FALSE;
-               }
-
-               node = node->Next();
-       }
-       return TRUE;
-}
-
-// Transfer values from controls. If returns FALSE,
-// validation failed: don't quit
-bool wxWindow::TransferDataFromWindow()
-{
-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() && !child->GetValidator()->TransferFromWindow() )
-               {
-                       return FALSE;
-               }
-
-               node = node->Next();
-       }
-       return TRUE;
-}
-
-bool wxWindow::Validate()
-{
-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this) )
-               {
-                       return FALSE;
-               }
-
-               node = node->Next();
-       }
-       return TRUE;
-}
+    if (oldScrollBar != newScrollBar)
+    {
+        // This is important! Without it, scrollbars misbehave badly.
+        XtUnrealizeWidget((Widget) m_scrolledWindow);
+        XmScrolledWindowSetAreas ((Widget) m_scrolledWindow, (Widget) m_hScrollBar, (Widget) m_vScrollBar, (Widget) m_drawingArea);
+        XtRealizeWidget((Widget) m_scrolledWindow);
+        XtManageChild((Widget) m_scrolledWindow);
+    }
 
 
-// Get the window with the focus
-wxWindow *wxWindow::FindFocus()
-{
-    // TODO
-    return NULL;
-}
+    if (newScrollBar)
+    {
+        XtVaSetValues((Widget) newScrollBar,
+        XmNvalue, pos,
+        XmNminimum, 0,
+        XmNmaximum, range,
+        XmNsliderSize, thumbVisible,
+        NULL);
+    }
 
 
-void wxWindow::AddChild(wxWindow *child)
-{
-    GetChildren()->Append(child);
-    child->m_windowParent = this;
-}
+    SetInternalScrollPos((wxOrientation)orient, pos);
 
 
-void wxWindow::RemoveChild(wxWindow *child)
-{
-    if (GetChildren())
-        GetChildren()->DeleteObject(child);
-    child->m_windowParent = NULL;
-}
+    int newW, newH;
+    GetSize(& newW, & newH);
 
 
-void wxWindow::DestroyChildren()
-{
-  if (GetChildren()) {
-    wxNode *node;
-    while ((node = GetChildren()->First()) != (wxNode *)NULL) {
-      wxWindow *child;
-      if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) {
-        delete child;
-               if ( GetChildren()->Member(child) )
-                       delete node;
-      }
-    } /* while */
-  }
+    // Adjusting scrollbars can resize the canvas accidentally
+    if (newW != oldW || newH != oldH)
+        SetSize(wxDefaultCoord, wxDefaultCoord, oldW, oldH);
 }
 
 }
 
-void wxWindow::MakeModal(bool modal)
+// Does a physical scroll
+void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
 {
-  // Disable all other windows
-  if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
-  {
-    wxNode *node = wxTopLevelWindows.First();
-    while (node)
-    {
-      wxWindow *win = (wxWindow *)node->Data();
-      if (win != this)
-        win->Enable(!modal);
-
-      node = node->Next();
-    }
-  }
-}
-
-void wxWindow::SetConstraints(wxLayoutConstraints *c)
-{
-  if (m_constraints)
-  {
-    UnsetConstraints(m_constraints);
-    delete m_constraints;
-  }
-  m_constraints = c;
-  if (m_constraints)
-  {
-    // Make sure other windows know they're part of a 'meaningful relationship'
-    if (m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this))
-      m_constraints->left.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this))
-      m_constraints->top.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this))
-      m_constraints->right.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this))
-      m_constraints->bottom.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this))
-      m_constraints->width.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this))
-      m_constraints->height.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this))
-      m_constraints->centreX.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this))
-      m_constraints->centreY.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-  }
-}
-
-// This removes any dangling pointers to this window
-// in other windows' constraintsInvolvedIn lists.
-void wxWindow::UnsetConstraints(wxLayoutConstraints *c)
-{
-  if (c)
-  {
-    if (c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this))
-      c->left.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this))
-      c->top.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this))
-      c->right.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this))
-      c->bottom.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this))
-      c->width.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this))
-      c->height.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this))
-      c->centreX.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this))
-      c->centreY.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-  }
-}
-
-// Back-pointer to other windows we're involved with, so if we delete
-// this window, we must delete any constraints we're involved with.
-void wxWindow::AddConstraintReference(wxWindow *otherWin)
-{
-  if (!m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn = new wxList;
-  if (!m_constraintsInvolvedIn->Member(otherWin))
-    m_constraintsInvolvedIn->Append(otherWin);
-}
-
-// REMOVE back-pointer to other windows we're involved with.
-void wxWindow::RemoveConstraintReference(wxWindow *otherWin)
-{
-  if (m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn->DeleteObject(otherWin);
-}
-
-// Reset any constraints that mention this window
-void wxWindow::DeleteRelatedConstraints()
-{
-  if (m_constraintsInvolvedIn)
-  {
-    wxNode *node = m_constraintsInvolvedIn->First();
-    while (node)
-    {
-      wxWindow *win = (wxWindow *)node->Data();
-      wxNode *next = node->Next();
-      wxLayoutConstraints *constr = win->GetConstraints();
-
-      // Reset any constraints involving this window
-      if (constr)
-      {
-        constr->left.ResetIfWin((wxWindow *)this);
-        constr->top.ResetIfWin((wxWindow *)this);
-        constr->right.ResetIfWin((wxWindow *)this);
-        constr->bottom.ResetIfWin((wxWindow *)this);
-        constr->width.ResetIfWin((wxWindow *)this);
-        constr->height.ResetIfWin((wxWindow *)this);
-        constr->centreX.ResetIfWin((wxWindow *)this);
-        constr->centreY.ResetIfWin((wxWindow *)this);
-      }
-      delete node;
-      node = next;
-    }
-    delete m_constraintsInvolvedIn;
-    m_constraintsInvolvedIn = NULL;
-  }
-}
-
-void wxWindow::SetSizer(wxSizer *sizer)
-{
-  m_windowSizer = sizer;
-  if (sizer)
-    sizer->SetSizerParent((wxWindow *)this);
-}
-
-/*
- * New version
- */
-
-bool wxWindow::Layout()
-{
-  if (GetConstraints())
-  {
-    int w, h;
-    GetClientSize(&w, &h);
-    GetConstraints()->width.SetValue(w);
-    GetConstraints()->height.SetValue(h);
-  }
-  
-  // If top level (one sizer), evaluate the sizer's constraints.
-  if (GetSizer())
-  {
-    int noChanges;
-    GetSizer()->ResetConstraints();   // Mark all constraints as unevaluated
-    GetSizer()->LayoutPhase1(&noChanges);
-    GetSizer()->LayoutPhase2(&noChanges);
-    GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes
-    return TRUE;
-  }
-  else
-  {
-    // Otherwise, evaluate child constraints
-    ResetConstraints();   // Mark all constraints as unevaluated
-    DoPhase(1);           // Just one phase need if no sizers involved
-    DoPhase(2);
-    SetConstraintSizes(); // Recursively set the real window sizes
-  }
-  return TRUE;
-}
-
-
-// Do a phase of evaluating constraints:
-// the default behaviour. wxSizers may do a similar
-// thing, but also impose their own 'constraints'
-// and order the evaluation differently.
-bool wxWindow::LayoutPhase1(int *noChanges)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    return constr->SatisfyConstraints((wxWindow *)this, noChanges);
-  }
-  else
-    return TRUE;
-}
-
-bool wxWindow::LayoutPhase2(int *noChanges)
-{
-  *noChanges = 0;
-  
-  // Layout children
-  DoPhase(1);
-  DoPhase(2);
-  return TRUE;
-}
-
-// Do a phase of evaluating child constraints
-bool wxWindow::DoPhase(int phase)
-{
-  int noIterations = 0;
-  int maxIterations = 500;
-  int noChanges = 1;
-  int noFailures = 0;
-  wxList succeeded;
-  while ((noChanges > 0) && (noIterations < maxIterations))
-  {
-    noChanges = 0;
-    noFailures = 0;
-    wxNode *node = GetChildren()->First();
-    while (node)
+    int x, y, w, h;
+    if (rect)
     {
     {
-      wxWindow *child = (wxWindow *)node->Data();
-      if (!child->IsKindOf(CLASSINFO(wxFrame)) && !child->IsKindOf(CLASSINFO(wxDialog)))
-      {
-        wxLayoutConstraints *constr = child->GetConstraints();
-        if (constr)
-        {
-          if (succeeded.Member(child))
-          {
-          }
-          else
-          {
-            int tempNoChanges = 0;
-            bool success = ( (phase == 1) ? child->LayoutPhase1(&tempNoChanges) : child->LayoutPhase2(&tempNoChanges) ) ;
-            noChanges += tempNoChanges;
-            if (success)
-            {
-              succeeded.Append(child);
-            }
-          }
-        }
-      }
-      node = node->Next();
-    }
-    noIterations ++;
-  }
-  return TRUE;
-}
-
-void wxWindow::ResetConstraints()
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    constr->left.SetDone(FALSE);
-    constr->top.SetDone(FALSE);
-    constr->right.SetDone(FALSE);
-    constr->bottom.SetDone(FALSE);
-    constr->width.SetDone(FALSE);
-    constr->height.SetDone(FALSE);
-    constr->centreX.SetDone(FALSE);
-    constr->centreY.SetDone(FALSE);
-  }
-  wxNode *node = GetChildren()->First();
-  while (node)
-  {
-    wxWindow *win = (wxWindow *)node->Data();
-    if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
-      win->ResetConstraints();
-    node = node->Next();
-  }
-}
-
-// Need to distinguish between setting the 'fake' size for
-// windows and sizers, and setting the real values.
-void wxWindow::SetConstraintSizes(bool recurse)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr && constr->left.GetDone() && constr->right.GetDone() &&
-                constr->width.GetDone() && constr->height.GetDone())
-  {
-    int x = constr->left.GetValue();
-    int y = constr->top.GetValue();
-    int w = constr->width.GetValue();
-    int h = constr->height.GetValue();
-
-    // If we don't want to resize this window, just move it...
-    if ((constr->width.GetRelationship() != wxAsIs) ||
-        (constr->height.GetRelationship() != wxAsIs))
-    {
-      // Calls Layout() recursively. AAAGH. How can we stop that.
-      // Simply take Layout() out of non-top level OnSizes.
-      SizerSetSize(x, y, w, h);
+        // Use specified rectangle
+        x = rect->x; y = rect->y; w = rect->width; h = rect->height;
     }
     else
     {
     }
     else
     {
-      SizerMove(x, y);
-    }
-  }
-  else if (constr)
-  {
-    char *windowClass = this->GetClassInfo()->GetClassName();
-
-    wxString winName;
-       if (GetName() == "")
-               winName = "unnamed";
-       else
-               winName = GetName();
-    wxDebugMsg("Constraint(s) not satisfied for window of type %s, name %s:\n", (const char *)windowClass, (const char *)winName);
-    if (!constr->left.GetDone())
-      wxDebugMsg("  unsatisfied 'left' constraint.\n");
-    if (!constr->right.GetDone())
-      wxDebugMsg("  unsatisfied 'right' constraint.\n");
-    if (!constr->width.GetDone())
-      wxDebugMsg("  unsatisfied 'width' constraint.\n");
-    if (!constr->height.GetDone())
-      wxDebugMsg("  unsatisfied 'height' constraint.\n");
-    wxDebugMsg("Please check constraints: try adding AsIs() constraints.\n");
-  }
-
-  if (recurse)
-  {
-    wxNode *node = GetChildren()->First();
-    while (node)
-    {
-      wxWindow *win = (wxWindow *)node->Data();
-      if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
-        win->SetConstraintSizes();
-      node = node->Next();
+        // Use whole client area
+        x = 0; y = 0;
+        GetClientSize(& w, & h);
     }
     }
-  }
-}
 
 
-// This assumes that all sizers are 'on' the same
-// window, i.e. the parent of this window.
-void wxWindow::TransformSizerToActual(int *x, int *y) const
-{
-  if (!m_sizerParent || m_sizerParent->IsKindOf(CLASSINFO(wxDialog)) ||
-                        m_sizerParent->IsKindOf(CLASSINFO(wxFrame)) )
-    return;
-    
-  int xp, yp;
-  m_sizerParent->GetPosition(&xp, &yp);
-  m_sizerParent->TransformSizerToActual(&xp, &yp);
-  *x += xp;
-  *y += yp;
-}
+    int x1 = (dx >= 0) ? x : x - dx;
+    int y1 = (dy >= 0) ? y : y - dy;
+    int w1 = w - abs(dx);
+    int h1 = h - abs(dy);
+    int x2 = (dx >= 0) ? x + dx : x;
+    int y2 = (dy >= 0) ? y + dy : y;
 
 
-void wxWindow::SizerSetSize(int x, int y, int w, int h)
-{
-       int xx = x;
-       int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  SetSize(xx, yy, w, h);
-}
+    wxClientDC dc(this);
 
 
-void wxWindow::SizerMove(int x, int y)
-{
-       int xx = x;
-       int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  Move(xx, yy);
-}
+    dc.SetLogicalFunction (wxCOPY);
 
 
-// Only set the size/position of the constraint (if any)
-void wxWindow::SetSizeConstraint(int x, int y, int w, int h)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    if (x != -1)
+    Widget widget = (Widget) GetMainWidget();
+    Window window = XtWindow(widget);
+    Display* display = XtDisplay(widget);
+
+    XCopyArea(display, window, window, (GC) dc.GetGC(),
+              x1, y1, w1, h1, x2, y2);
+
+    dc.SetAutoSetting(true);
+    wxBrush brush(GetBackgroundColour(), wxSOLID);
+    dc.SetBrush(brush); // FIXME: needed?
+
+    wxWindowList::compatibility_iterator cnode = m_children.GetFirst();
+    while (cnode)
     {
     {
-      constr->left.SetValue(x);
-      constr->left.SetDone(TRUE);
+        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();
     }
     }
-    if (y != -1)
+
+    // We'll add rectangles to the list of update rectangles according to which
+    // bits we've exposed.
+    wxList updateRects;
+
+    if (dx > 0)
     {
     {
-      constr->top.SetValue(y);
-      constr->top.SetDone(TRUE);
+        wxRect *rect = new wxRect;
+        rect->x = x;
+        rect->y = y;
+        rect->width = dx;
+        rect->height = h;
+
+        XFillRectangle(display, window,
+            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
+
+        rect->x = rect->x;
+        rect->y = rect->y;
+        rect->width = rect->width;
+        rect->height = rect->height;
+
+        updateRects.Append((wxObject*) rect);
     }
     }
-    if (w != -1)
+    else if (dx < 0)
     {
     {
-      constr->width.SetValue(w);
-      constr->width.SetDone(TRUE);
+        wxRect *rect = new wxRect;
+
+        rect->x = x + w + dx;
+        rect->y = y;
+        rect->width = -dx;
+        rect->height = h;
+
+        XFillRectangle(display, window,
+            (GC) dc.GetGC(), rect->x, rect->y, rect->width,
+            rect->height);
+
+        rect->x = rect->x;
+        rect->y = rect->y;
+        rect->width = rect->width;
+        rect->height = rect->height;
+
+        updateRects.Append((wxObject*) rect);
     }
     }
-    if (h != -1)
+    if (dy > 0)
     {
     {
-      constr->height.SetValue(h);
-      constr->height.SetDone(TRUE);
+        wxRect *rect = new wxRect;
+
+        rect->x = x;
+        rect->y = y;
+        rect->width = w;
+        rect->height = dy;
+
+        XFillRectangle(display, window,
+            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
+
+        rect->x = rect->x;
+        rect->y = rect->y;
+        rect->width = rect->width;
+        rect->height = rect->height;
+
+        updateRects.Append((wxObject*) rect);
     }
     }
-  }
-}
+    else if (dy < 0)
+    {
+        wxRect *rect = new wxRect;
 
 
-void wxWindow::MoveConstraint(int x, int y)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    if (x != -1)
+        rect->x = x;
+        rect->y = y + h + dy;
+        rect->width = w;
+        rect->height = -dy;
+
+        XFillRectangle(display, window,
+            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
+
+        rect->x = rect->x;
+        rect->y = rect->y;
+        rect->width = rect->width;
+        rect->height = rect->height;
+
+        updateRects.Append((wxObject*) rect);
+    }
+    dc.SetBrush(wxNullBrush);
+
+    // Now send expose events
+
+    wxList::compatibility_iterator  node = updateRects.GetFirst();
+    while (node)
     {
     {
-      constr->left.SetValue(x);
-      constr->left.SetDone(TRUE);
+        wxRect* rect = (wxRect*) node->GetData();
+        XExposeEvent event;
+
+        event.type = Expose;
+        event.display = display;
+        event.send_event = True;
+        event.window = window;
+
+        event.x = rect->x;
+        event.y = rect->y;
+        event.width = rect->width;
+        event.height = rect->height;
+
+        event.count = 0;
+
+        XSendEvent(display, window, False, ExposureMask, (XEvent *)&event);
+
+        node = node->GetNext();
+
     }
     }
-    if (y != -1)
+
+    // Delete the update rects
+    node = updateRects.GetFirst();
+    while (node)
     {
     {
-      constr->top.SetValue(y);
-      constr->top.SetDone(TRUE);
+        wxRect* rect = (wxRect*) node->GetData();
+        delete rect;
+        node = node->GetNext();
     }
     }
-  }
-}
 
 
-void wxWindow::GetSizeConstraint(int *w, int *h) const
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetSize(w, h);
+    XmUpdateDisplay((Widget) GetMainWidget());
 }
 
 }
 
-void wxWindow::GetClientSizeConstraint(int *w, int *h) const
+// ---------------------------------------------------------------------------
+// drag and drop
+// ---------------------------------------------------------------------------
+
+#if wxUSE_DRAG_AND_DROP
+
+void wxWindow::SetDropTarget(wxDropTarget * WXUNUSED(pDropTarget))
 {
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetClientSize(w, h);
+    // TODO
 }
 
 }
 
-void wxWindow::GetPositionConstraint(int *x, int *y) const
+#endif
+
+// Old style file-manager drag&drop
+void wxWindow::DragAcceptFiles(bool WXUNUSED(accept))
 {
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *x = constr->left.GetValue();
-    *y = constr->top.GetValue();
-  }
-  else
-    GetPosition(x, y);
+    // TODO
 }
 
 }
 
-bool wxWindow::Close(bool force)
-{
-  wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
-  event.SetEventObject(this);
-  event.SetForce(force);
+// ----------------------------------------------------------------------------
+// tooltips
+// ----------------------------------------------------------------------------
 
 
-  return GetEventHandler()->ProcessEvent(event);
-}
+#if wxUSE_TOOLTIPS
 
 
-wxObject* wxWindow::GetChild(int number) const
+void wxWindow::DoSetToolTip(wxToolTip * WXUNUSED(tooltip))
 {
 {
-  // Return a pointer to the Nth object in the window
-  if (!GetChildren())
-    return(NULL) ;
-  wxNode *node = GetChildren()->First();
-  int n = number;
-  while (node && n--)
-    node = node->Next() ;
-  if (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
-    return(obj) ;
-  }
-  else
-    return NULL ;
+    // TODO
 }
 
 }
 
-void wxWindow::OnDefaultAction(wxControl *initiatingItem)
-{
-    // Obsolete function
-}
+#endif // wxUSE_TOOLTIPS
 
 
-void wxWindow::Clear()
-{
-       wxClientDC dc(this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
-}
+// ----------------------------------------------------------------------------
+// popup menus
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS
 
 
-// Fits the panel around the items
-void wxWindow::Fit()
+bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 {
-       int maxX = 0;
-       int maxY = 0;
-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *win = (wxWindow *)node->Data();
-               int wx, wy, ww, wh;
-               win->GetPosition(&wx, &wy);
-               win->GetSize(&ww, &wh);
-               if ( wx + ww > maxX )
-                       maxX = wx + ww;
-               if ( wy + wh > maxY )
-                       maxY = wy + wh;
+    if ( x == wxDefaultCoord && y == wxDefaultCoord )
+    {
+        wxPoint mouse = ScreenToClient(wxGetMousePosition());
+        x = mouse.x; y = mouse.y;
+    }
 
 
-               node = node->Next();
-       }
-       SetClientSize(maxX + 5, maxY + 5);
-}
+    Widget widget = (Widget) GetMainWidget();
 
 
-void wxWindow::SetValidator(const wxValidator& validator)
-{
-       if ( m_windowValidator )
-               delete m_windowValidator;
-       m_windowValidator = validator.Clone();
+    /* 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 ( m_windowValidator )
-               m_windowValidator->SetWindow(this) ;
-}
+    if (menu->GetParent() && (menu->GetId() != -1))
+        return false;
 
 
-// Find a window by id or name
-wxWindow *wxWindow::FindWindow(long id)
-{
-       if ( GetId() == id)
-               return this;
+    if (menu->GetMainWidget())
+    {
+        menu->DestroyMenu(true);
+    }
 
 
-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               wxWindow *found = child->FindWindow(id);
-               if ( found )
-                       return found;
-               node = node->Next();
-       }
-       return NULL;
-}
+    menu->SetId(1); /* Mark as popped-up */
+    menu->CreateMenu(NULL, widget, menu, 0);
+    menu->SetInvokingWindow(this);
 
 
-wxWindow *wxWindow::FindWindow(const wxString& name)
-{
-       if ( GetName() == name)
-               return this;
+    menu->UpdateUI();
 
 
-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               wxWindow *found = child->FindWindow(name);
-               if ( found )
-                       return found;
-               node = node->Next();
-       }
-       return NULL;
-}
+    //  menu->SetParent(parent);
+    //  parent->children->Append(menu);  // Store menu for later deletion
 
 
-void wxWindow::OnIdle(wxIdleEvent& event)
-{
-/* TODO: you may need to do something like this
- * if your GUI doesn't generate enter/leave events
+    Widget menuWidget = (Widget) menu->GetMainWidget();
+
+    int rootX = 0;
+    int rootY = 0;
 
 
-    // Check if we need to send a LEAVE event
-    if (m_mouseInWindow)
+    int deviceX = x;
+    int deviceY = y;
+    /*
+    if (this->IsKindOf(CLASSINFO(wxCanvas)))
     {
     {
-        POINT pt;
-        ::GetCursorPos(&pt);
-        if (::WindowFromPoint(pt) != (HWND) GetHWND())
-        {
-            // Generate a LEAVE event
-            m_mouseInWindow = FALSE;
-            MSWOnMouseLeave(pt.x, pt.y, 0);
-        }
+    wxCanvas *canvas = (wxCanvas *) this;
+    deviceX = canvas->GetDC ()->LogicalToDeviceX (x);
+    deviceY = canvas->GetDC ()->LogicalToDeviceY (y);
     }
     }
-*/
+    */
 
 
-    // This calls the UI-update mechanism (querying windows for
-    // menu/toolbar/control state information)
-       UpdateWindowUI();
-}
+    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);
 
 
-// Raise the window to the top of the Z order
-void wxWindow::Raise()
-{
-    Window window = XtWindow((Widget) GetMainWidget());
-    XRaiseWindow(XtDisplay((Widget) GetMainWidget()), window);
-}
+    XButtonPressedEvent event;
+    event.type = ButtonPress;
+    event.button = 1;
 
 
-// Lower the window to the bottom of the Z order
-void wxWindow::Lower()
-{
-    Window window = XtWindow((Widget) GetMainWidget());
-    XLowerWindow(XtDisplay((Widget) GetMainWidget()), window);
-}
+    event.x = deviceX;
+    event.y = deviceY;
 
 
-bool wxWindow::AcceptsFocus() const
-{
-  return IsShown() && IsEnabled();
-}
+    event.x_root = rootX;
+    event.y_root = rootY;
 
 
-// Update region access
-wxRegion wxWindow::GetUpdateRegion() const
-{
-    return m_updateRegion;
-}
+    XmMenuPosition (menuWidget, &event);
+    XtManageChild (menuWidget);
 
 
-bool wxWindow::IsExposed(int x, int y, int w, int h) const
-{
-    return (m_updateRegion.Contains(x, y, w, h) != wxOutRegion);
-}
+    // 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>
 
 
-bool wxWindow::IsExposed(const wxPoint& pt) const
-{
-    return (m_updateRegion.Contains(pt) != wxOutRegion);
-}
+    wxEventLoop evtLoop;
 
 
-bool wxWindow::IsExposed(const wxRect& rect) const
-{
-    return (m_updateRegion.Contains(rect) != wxOutRegion);
+    while (menu->GetId() == 1)
+    {
+        wxDoEventLoopIteration( evtLoop );
+    }
+
+    return true;
 }
 
 }
 
-/*
- * Allocates control IDs
- */
+#endif
+
+// ---------------------------------------------------------------------------
+// moving and resizing
+// ---------------------------------------------------------------------------
 
 
-int wxWindow::NewControlId()
+bool wxWindow::PreResize()
 {
 {
-    static int s_controlId = 0;
-    s_controlId ++;
-    return s_controlId;
+    return true;
 }
 
 }
 
-void wxWindow::SetAcceleratorTable(const wxAcceleratorTable& accel)
+// Get total size
+void wxWindow::DoGetSize(int *x, int *y) const
 {
 {
-    m_acceleratorTable = accel;
+    Widget widget = (Widget)( !m_drawingArea ? GetTopWidget() :
+                              ( m_borderWidget ? m_borderWidget :
+                                m_scrolledWindow ? m_scrolledWindow :
+                                m_drawingArea ) );
+    Dimension xx, yy;
+
+    if (widget)
+        XtVaGetValues( widget,
+                       XmNwidth, &xx,
+                       XmNheight, &yy,
+                       NULL );
+    if(x) *x = widget ? xx : -1; 
+    if(y) *y = widget ? yy : -1;
 }
 
 }
 
-// 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 wxWindow::DoGetPosition(int *x, int *y) const
 {
 {
-    wxWindow *win = (wxWindow *)wxWidgetHashTable->Get((long)w);
-    if (!win)
-        return;
+    Widget widget = (Widget)
+        ( m_drawingArea ?
+          ( m_borderWidget ? m_borderWidget : m_scrolledWindow ) :
+          GetTopWidget() );
 
 
-    if (win->PreResize())
+    Position xx, yy;
+    XtVaGetValues(widget, 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())
     {
     {
-        int width, height;
-        win->GetSize(&width, &height);
-        wxSizeEvent sizeEvent(wxSize(width, height), win->GetId());
-        sizeEvent.SetEventObject(win);
-        win->GetEventHandler()->ProcessEvent(sizeEvent);
+        wxPoint pt(GetParent()->GetClientAreaOrigin());
+        xx = (Position)(xx - pt.x);
+        yy = (Position)(yy - pt.y);
     }
     }
+
+    if(x) *x = xx;
+    if(y) *y = yy;
 }
 
 }
 
-bool wxAddWindowToTable(Widget w, wxWindow *win)
+void wxWindow::DoScreenToClient(int *x, int *y) const
 {
 {
-  wxWindow *oldItem = NULL;
-#if DEBUG
-//  printf("Adding widget %ld, name = %s\n", w, win->GetClassInfo()->GetClassName());
-#endif
-  if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
-  {
-    char buf[300];
-    sprintf(buf, "Widget table clash: new widget is %ld, %s", (long)w, win->GetClassInfo()->GetClassName());
-    wxError (buf);
-    fflush(stderr);
-    sprintf(buf, "Old widget was %s", oldItem->GetClassInfo()->GetClassName());
-    wxError (buf);
-    return FALSE;
-  }
+    Widget widget = (Widget) GetClientWidget();
+    Display *display = XtDisplay((Widget) GetMainWidget());
+    Window rootWindow = RootWindowOfScreen(XtScreen(widget));
+    Window thisWindow = XtWindow(widget);
 
 
-  wxWidgetHashTable->Put ((long) w, win);
-  return TRUE;
+    Window childWindow;
+    int xx = x ? *x : 0;
+    int yy = y ? *y : 0;
+    XTranslateCoordinates(display, rootWindow, thisWindow,
+                          xx, yy, x ? x : &xx, y ? y : &yy,
+                          &childWindow);
 }
 
 }
 
-wxWindow *wxGetWindowFromTable(Widget w)
+void wxWindow::DoClientToScreen(int *x, int *y) const
 {
 {
-  return (wxWindow *)wxWidgetHashTable->Get ((long) w);
+    Widget widget = (Widget) GetClientWidget();
+    Display *display = XtDisplay(widget);
+    Window rootWindow = RootWindowOfScreen(XtScreen(widget));
+    Window thisWindow = XtWindow(widget);
+
+    Window childWindow;
+    int xx = x ? *x : 0;
+    int yy = y ? *y : 0;
+    XTranslateCoordinates(display, thisWindow, rootWindow,
+                          xx, yy, x ? x : &xx, y ? y : &yy,
+                          &childWindow);
 }
 
 }
 
-void wxDeleteWindowFromTable(Widget w)
-{
-#if DEBUG
-//  printf("Deleting widget %ld\n", w);
-#endif
-//  wxWindow *win = (wxWindow *)wxWidgetHashTable->Get ((long) w);
 
 
-  wxWidgetHashTable->Delete((long)w);
-}
-  
-// Get the underlying X window and display
-WXWindow wxWindow::GetXWindow() const
+// Get size *available for subwindows* i.e. excluding menu bar etc.
+void wxWindow::DoGetClientSize(int *x, int *y) const
 {
 {
-    return (WXWindow) XtWindow((Widget) GetMainWidget());
+    Widget widget = (Widget) GetClientWidget();
+    Dimension xx, yy;
+    XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
+    if(x) *x = xx; if(y) *y = yy;
 }
 
 }
 
-WXDisplay *wxWindow::GetXDisplay() const
+void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 {
-    return (WXDisplay*) XtDisplay((Widget) GetMainWidget());
+    DoSetSizeIntr(x, y, width, height, sizeFlags, false);
 }
 
 }
 
-WXWidget wxWindow::GetMainWidget() const
+void wxWindow::DoSetSizeIntr(int x, int y, int width, int height,
+                             int sizeFlags, bool fromCtor)
 {
 {
-    if (m_drawingArea)
-      return m_drawingArea;
-    else
-      return m_mainWidget;
-}
+    // A bit of optimization to help sort out the flickers.
+    int oldX = -1, oldY = -1, oldW = -1, oldH = -1;
 
 
-WXWidget wxWindow::GetClientWidget() const
-{
-    if (m_drawingArea != (WXWidget) 0)
-        return m_drawingArea;
-    else
-        return m_mainWidget;
-}
+    if( !fromCtor )
+    {
+        GetSize(& oldW, & oldH);
+        GetPosition(& oldX, & oldY);
+    }
 
 
-void wxCanvasRepaintProc (Widget drawingArea, XtPointer clientData,
- XmDrawingAreaCallbackStruct * cbs)
-{
-    if (!wxWidgetHashTable->Get ((long) (Widget) drawingArea))
-       return;
+    if (x == -1)
+        x = oldX;
+    if (x == -1)
+        x = oldY;
 
 
-    XEvent * event = cbs->event;
-    wxWindow * canvas = (wxWindow *) clientData;
-    Display * display = (Display *) canvas->GetXDisplay();
-    //    GC gc = (GC) canvas->GetDC()->gc;
+    if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+    {
+        if ( width == -1 )
+            width = oldW;
+        if ( height == -1 )
+            height = oldH;
+    }
 
 
-    switch (event->type)
+    wxSize size(wxDefaultSize);
+    if ( width <= 0 )
     {
     {
-      case Expose:
-      {
-       /* TODO
-        wxCanvasDC* canvasDC = canvas->GetDC();
-        if (canvasDC)
-       {
-          if (canvasDC->onpaint_reg)
-            XDestroyRegion(canvasDC->onpaint_reg);
-          canvasDC->onpaint_reg = XCreateRegion();
-          
-       }
-       */
-
-       int n = canvas->m_updateRects.Number();
-        XRectangle* xrects = new XRectangle[n];
-        int i;
-       for (i = 0; i < canvas->m_updateRects.Number(); i++)
-       {
-         wxRect* rect = (wxRect*) canvas->m_updateRects.Nth(i)->Data();
-         xrects[i].x = rect->x;
-          xrects[i].y = rect->y;
-          xrects[i].width = rect->width;
-          xrects[i].height = rect->height;
-         /* TODO (?) Actually ignore it I think.
-          if (canvasDC)
-            XUnionRectWithRegion(&(xrects[i]), canvasDC->onpaint_reg,
-              canvasDC->onpaint_reg);
-      */
-       }
-       /* TODO must clip the area being repainted. So we need a gc.
-         * Alternatively, wxPaintDC must do the clipping
-         * when it's created.
-        XSetClipRectangles(display, gc, 0, 0, xrects, n, Unsorted);
-       */
-
-        canvas->DoPaint() ; // xrects, n);
-        delete[] xrects;
-
-        canvas->m_updateRects.Clear();
-
-       /*
-        if (canvasDC)
-       {
-          XDestroyRegion(canvasDC->onpaint_reg);
-          canvasDC->onpaint_reg = NULL;
-       }
-
-       XGCValues gc_val;
-       gc_val.clip_mask = None;
-       XChangeGC(display, gc, GCClipMask, &gc_val);
-       */
-
-       break;
+        if ( ( sizeFlags & wxSIZE_AUTO_WIDTH ) && !fromCtor )
+        {
+            size = DoGetBestSize();
+            width = size.x;
+        }
+        else
+        {
+            width = oldW;
+        }
     }
     }
-    default:
+
+    if ( height == -1 )
     {
     {
-       cout << "\n\nNew Event ! is = " << event -> type << "\n";
-       break;
+        if( ( sizeFlags & wxSIZE_AUTO_HEIGHT ) && !fromCtor )
+        {
+            if( size.x == -1 ) size = DoGetBestSize();
+            height = size.y;
+        }
+        else
+        {
+            height = oldH;
+        }
     }
     }
-  }
-}
 
 
-// Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4)
-void 
-wxCanvasEnterLeave (Widget drawingArea, XtPointer clientData, XCrossingEvent * event)
-{
-  XmDrawingAreaCallbackStruct cbs;
-  XEvent ev;
+    if ( x != oldX || y != oldY || width != oldW || height != oldH
+         || !wxNoOptimize::CanOptimize() )
+    {
+        if (m_drawingArea)
+        {
+            int flags = 0;
 
 
-  //if (event->mode!=NotifyNormal)
-  //  return ;
+            if (x != oldX)
+                flags |= wxMOVE_X;
 
 
-//  ev = *((XEvent *) event); // Causes Purify error (copying too many bytes)
-  ((XCrossingEvent &) ev) = *event;
+            if (y != oldY)
+                flags |= wxMOVE_Y;
 
 
-  cbs.reason = XmCR_INPUT;
-  cbs.event = &ev;
+            if (width > 0)
+                flags |= wxMOVE_WIDTH;
 
 
-  wxCanvasInputEvent (drawingArea, (XtPointer) NULL, &cbs);
-}
+            if (height > 0)
+                flags |= wxMOVE_HEIGHT;
 
 
-// Fix to make it work under Motif 1.0 (!)
-void wxCanvasMotionEvent (Widget drawingArea, XButtonEvent * event)
-{
-#if   XmVersion<=1000
+            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;
+        }
 
 
-  XmDrawingAreaCallbackStruct cbs;
-  XEvent ev;
+        Widget widget = (Widget) GetTopWidget();
+        if (!widget)
+            return;
 
 
-  //ev.xbutton = *event;
-  ev = *((XEvent *) event);
-  cbs.reason = XmCR_INPUT;
-  cbs.event = &ev;
+        bool managed = XtIsManaged( widget );
+        if (managed)
+            XtUnmanageChild(widget);
 
 
-  wxCanvasInputEvent (drawingArea, (XtPointer) NULL, &cbs);
-#endif
+        int xx = x;
+        int yy = y;
+        AdjustForParentClientOrigin(xx, yy, sizeFlags);
+
+        DoMoveWindow(xx, yy, width, height);
+
+        if (managed)
+            XtManageChild(widget);
+    }
 }
 
 }
 
-void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs)
+void wxWindow::DoSetClientSize(int width, int height)
 {
 {
-  wxWindow *canvas = (wxWindow *) wxWidgetHashTable->Get ((long) (Widget) drawingArea);
-  XEvent local_event;
+    if (m_drawingArea)
+    {
+        Widget drawingArea = (Widget) m_drawingArea;
+
+        XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
 
 
-  if (canvas==NULL)
-    return ;
+        if (width > -1)
+            XtVaSetValues(drawingArea, XmNwidth, width, NULL);
+        if (height > -1)
+            XtVaSetValues(drawingArea, XmNheight, height, NULL);
+
+        XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
+        return;
+    }
 
 
-  if (cbs->reason != XmCR_INPUT)
-    return;
+    Widget widget = (Widget) GetTopWidget();
 
 
-  local_event = *(cbs->event); // We must keep a copy!
+    if (width > -1)
+        XtVaSetValues(widget, XmNwidth, width, NULL);
+    if (height > -1)
+        XtVaSetValues(widget, XmNheight, height, NULL);
+}
 
 
-  switch (local_event.xany.type)
+void wxWindow::DoMoveWindowIntr(int xx, int yy, int w, int h,
+                                int flags)
+{
+    if (m_drawingArea)
     {
     {
-    case EnterNotify:
-    case LeaveNotify:
-    case ButtonPress:
-    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)
-         {
-           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;
-             }
-         }
-
-       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);
-       canvas->GetEventHandler()->ProcessEvent (wxevent);
-       /*
-       if (eventType == wxEVT_ENTER_WINDOW ||
-           eventType == wxEVT_LEAVE_WINDOW ||
-           eventType == wxEVT_MOTION
-         )
-         return;
-         */
-       break;
-      }
-    case KeyPress:
-      {
-       KeySym keySym;
-//     XComposeStatus compose;
-//     (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, &compose);
-       (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL);
-       int id = wxCharCodeXToWX (keySym);
-
-       wxKeyEvent event (wxEVT_CHAR);
-
-       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)
+        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)
         {
         {
-          // Implement wxFrame::OnCharHook by checking ancestor.
-          wxWindow *parent = canvas->GetParent();
-          while (parent && !parent->IsKindOf(CLASSINFO(wxFrame)))
-            parent = parent->GetParent();
-            
-          if (parent)
-          {
-            event.SetEventType(wxEVT_CHAR_HOOK);
-            if (parent->GetEventHandler()->ProcessEvent(event))
-              return;
-            event.SetEventType(wxEVT_CHAR);
-          }
-
-         canvas->GetEventHandler()->ProcessEvent (event);
+            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);
+            }
+
+            if( w < 1 ) w = 1;
+            XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
         }
         }
-       break;
-      }
-    case FocusIn:
-      {
-        if (local_event.xfocus.detail != NotifyPointer)
-       {
-          wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId());
-          event.SetEventObject(canvas);
-          canvas->GetEventHandler()->ProcessEvent(event);
+
+        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);
         }
         }
-       break;
-      }
-    case FocusOut:
-      {
-        if (local_event.xfocus.detail != NotifyPointer)
-       {
-          wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId());
-          event.SetEventObject(canvas);
-          canvas->GetEventHandler()->ProcessEvent(event);
-       }
-        break;
-      }
-    default:
-      break;
+
+        if (managed)
+            XtManageChild (borderOrScrolled);
+        XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
+    }
+    else
+    {
+        if( w < 1 ) w = 1;
+        if( h < 1 ) h = 1;
+
+        XtVaSetValues((Widget)GetTopWidget(),
+                      XmNx, xx,
+                      XmNy, yy,
+                      XmNwidth, w,
+                      XmNheight, h,
+                      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);
+}
+
+// ---------------------------------------------------------------------------
+// text metrics
+// ---------------------------------------------------------------------------
+
+int wxWindow::GetCharHeight() const
+{
+    int height;
+
+    if (m_font.Ok())
+        wxGetTextExtent (GetXDisplay(), m_font, 1.0,
+                         "x", NULL, &height, NULL, NULL);
+    else
+        wxGetTextExtent (this, "x", NULL, &height, NULL, NULL);
+
+    return height;
+}
+
+int wxWindow::GetCharWidth() const
+{
+    int width;
+
+    if (m_font.Ok())
+        wxGetTextExtent (GetXDisplay(), m_font, 1.0,
+                         "x", &width, NULL, NULL, NULL);
+    else
+        wxGetTextExtent (this, "x", &width, NULL, NULL, NULL);
+
+    return width;
+}
+
+void wxWindow::GetTextExtent(const wxString& string,
+                             int *x, int *y,
+                             int *descent, int *externalLeading,
+                             const wxFont *theFont) const
+{
+    const wxFont *fontToUse = theFont ? theFont : &m_font;
+
+    if (externalLeading)
+        *externalLeading = 0;
+    if (fontToUse->Ok())
+        wxGetTextExtent (GetXDisplay(), *fontToUse, 1.0,
+                         string, x, y, NULL, descent);
+    else
+        wxGetTextExtent (this, string, x, y, NULL, descent);
+}
+
+// ----------------------------------------------------------------------------
+// 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)
+{
+    Widget widget = (Widget) GetMainWidget();
+    if (!widget)
+        return;
+    m_needsRefresh = true;
+    Display *display = XtDisplay(widget);
+    Window thisWindow = XtWindow(widget);
+
+    XExposeEvent dummyEvent;
+    int width, height;
+    GetSize(&width, &height);
+
+    dummyEvent.type = Expose;
+    dummyEvent.display = display;
+    dummyEvent.send_event = True;
+    dummyEvent.window = thisWindow;
+    if (rect)
+    {
+        dummyEvent.x = rect->x;
+        dummyEvent.y = rect->y;
+        dummyEvent.width = rect->width;
+        dummyEvent.height = rect->height;
+    }
+    else
+    {
+        dummyEvent.x = 0;
+        dummyEvent.y = 0;
+        dummyEvent.width = width;
+        dummyEvent.height = height;
+    }
+    dummyEvent.count = 0;
+
+    if (eraseBack)
+    {
+        wxClientDC dc(this);
+        wxBrush backgroundBrush(GetBackgroundColour(), wxSOLID);
+        dc.SetBackground(backgroundBrush);
+        if (rect)
+            dc.Clear(*rect);
+        else
+            dc.Clear();
     }
     }
+
+    XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
 }
 
 void wxWindow::DoPaint()
 {
 }
 
 void wxWindow::DoPaint()
 {
-  //TODO : make a temporary gc so we can do the XCopyArea below
-  if (0) // m_backingPixmap)
+    //TODO : make a temporary gc so we can do the XCopyArea below
+    if (m_backingPixmap && !m_needsRefresh)
     {
     {
-      /*
-      Widget drawingArea = (Widget) m_drawingArea;
-      //      int orig = GetDC()->GetLogicalFunction();
-      //      GetDC()->SetLogicalFunction (wxCOPY);
+      wxPaintDC dc(this);
+
+      GC tempGC = (GC) dc.GetBackingGC();
 
 
-      // TODO: it may not be necessary to store m_pixmapOffsetX/Y; we
-      // should be able to calculate them.
-      XCopyArea (XtDisplay (drawingArea), m_backingPixmap, XtWindow (drawingArea), GetDC ()->gc,
-                m_pixmapOffsetX, m_pixmapOffsetY,
-                m_pixmapWidth, m_pixmapHeight,
-                0, 0);
+      Widget widget = (Widget) GetMainWidget();
 
 
-      //      GetDC()->SetLogicalFunction (orig);
-      */
+      int scrollPosX = 0;
+      int scrollPosY = 0;
+
+      // We have to test whether it's a wxScrolledWindow (hack!) because
+      // 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 wxWidgets code.
+      wxScrolledWindow* scrolledWindow = wxDynamicCast(this, wxScrolledWindow);
+      if ( scrolledWindow )
+      {
+          int x, y;
+          scrolledWindow->CalcScrolledPosition(0, 0, &x, &y);
+
+          scrollPosX = - x;
+          scrollPosY = - y;
+      }
+
+      // TODO: This could be optimized further by only copying the areas in the
+      //       current update region.
+
+      // Only blit the part visible in the client area. The backing pixmap
+      // always starts at 0, 0 but we may be looking at only a portion of it.
+      wxSize clientArea = GetClientSize();
+      int toBlitX = m_pixmapWidth - scrollPosX;
+      int toBlitY = m_pixmapHeight - scrollPosY;
+
+      // Copy whichever is samller, the amount of pixmap we have to copy,
+      // or the size of the client area.
+      toBlitX = wxMin(toBlitX, clientArea.x);
+      toBlitY = wxMin(toBlitY, clientArea.y);
+
+      // Make sure we're not negative
+      toBlitX = wxMax(0, toBlitX);
+      toBlitY = wxMax(0, toBlitY);
+
+      XCopyArea
+      (
+       XtDisplay(widget),
+       (Pixmap) m_backingPixmap,
+       XtWindow (widget),
+       tempGC,
+       scrollPosX, scrollPosY, // Start at the scroll position
+       toBlitX, toBlitY,       // How much of the pixmap to copy
+       0, 0                    // Destination
+      );
     }
     }
-  else
+    else
     {
     {
+        wxWindowDC dc(this);
+        // Set an erase event first
+        wxEraseEvent eraseEvent(GetId(), &dc);
+        eraseEvent.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(eraseEvent);
+
         wxPaintEvent event(GetId());
         event.SetEventObject(this);
         GetEventHandler()->ProcessEvent(event);
         wxPaintEvent event(GetId());
         event.SetEventObject(this);
         GetEventHandler()->ProcessEvent(event);
+
+        m_needsRefresh = false;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+
+// Responds to colour changes: passes event on to children.
+void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+    while ( node )
+    {
+        // Only propagate to non-top-level windows
+        wxWindow *win = node->GetData();
+        if ( win->GetParent() )
+        {
+            wxSysColourChangedEvent event2;
+            event.SetEventObject(win);
+            win->GetEventHandler()->ProcessEvent(event2);
+        }
+
+        node = node->GetNext();
     }
 }
 
     }
 }
 
-// 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::OnInternalIdle()
+{
+    // This calls the UI-update mechanism (querying windows for
+    // menu/toolbar/control state information)
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
+
+// ----------------------------------------------------------------------------
+// accelerators
+// ----------------------------------------------------------------------------
+
+bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
 {
 {
-  Widget drawingArea = (Widget) m_drawingArea;
-  bool managed = XtIsManaged(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
+#if wxUSE_ACCEL
+    if (!m_acceleratorTable.Ok())
+        return false;
+
+    int count = m_acceleratorTable.GetCount();
+    wxAcceleratorEntry* entries = m_acceleratorTable.GetEntries();
+    int i;
+    for (i = 0; i < count; i++)
+    {
+        wxAcceleratorEntry* entry = & (entries[i]);
+        if (entry->MatchesEvent(event))
+        {
+            // 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
+            wxWindow* parent = this;
+            while ( parent && !parent->IsTopLevel() )
+                parent = parent->GetParent();
+
+            if (!parent)
+                return false;
 
 
-  if (managed)
-    XtUnmanageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-  XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
+            wxFrame* frame = wxDynamicCast(parent, wxFrame);
+            if ( frame )
+            {
+#if wxUSE_MENUS
+                // Try for a menu command
+                if (frame->GetMenuBar())
+                {
+                    wxMenuItem* item = frame->GetMenuBar()->FindItem(entry->GetCommand());
+                    if (item)
+                    {
+                        wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
+                        commandEvent.SetEventObject(frame);
+
+                        // If ProcessEvent returns true (it was handled), then
+                        // the calling code will skip the event handling.
+                        return frame->GetEventHandler()->ProcessEvent(commandEvent);
+                    }
+                }
+#endif
+            }
+
+            // Find a child matching the command id
+            wxWindow* child = parent->FindWindow(entry->GetCommand());
+
+            // No such child
+            if (!child)
+                return false;
+
+            // Now we process those kinds of windows that we can.
+            // For now, only buttons.
+            if ( wxDynamicCast(child, wxButton) )
+            {
+                wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId());
+                commandEvent.SetEventObject(child);
+                return child->GetEventHandler()->ProcessEvent(commandEvent);
+            }
+
+            return false;
+        } // matches event
+    }// for
+#endif
+
+    // We didn't match the key event against an accelerator.
+    return false;
+}
+
+// ============================================================================
+// Motif-specific stuff from here on
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// function which maintain the global hash table mapping Widgets to wxWidgets
+// ----------------------------------------------------------------------------
 
 
-  if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+bool wxAddWindowToTable(Widget w, wxWindow *win)
+{
+    const long key = (long)w;
+    if ( wxWidgetHashTable->Get(key))
     {
     {
-      XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
-                    XmNx, x, NULL);
+        wxLogDebug("Widget table clash: new widget is %ld, %s",
+                   key, win->GetClassInfo()->GetClassName());
+        return false;
     }
 
     }
 
-  if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    wxWidgetHashTable->Put(key, win);
+
+    wxLogTrace("widget", "Widget 0x%p <-> window %p (%s)",
+               w, win, win->GetClassInfo()->GetClassName());
+
+    return true;
+}
+
+wxWindow *wxGetWindowFromTable(Widget w)
+{
+    return (wxWindow *)wxWidgetHashTable->Get((long) w);
+}
+
+void wxDeleteWindowFromTable(Widget w)
+{
+    wxLogTrace("widget", "Widget 0x%p", (WXWidget)w);
+
+    wxWidgetHashTable->Delete((long)w);
+}
+
+// ----------------------------------------------------------------------------
+// add/remove window from the table
+// ----------------------------------------------------------------------------
+
+// Add to hash table, add event handler
+bool wxWindow::AttachWidget (wxWindow* WXUNUSED(parent), WXWidget mainWidget,
+                             WXWidget formWidget, int x, int y, int width, int height)
+{
+    wxAddWindowToTable((Widget) mainWidget, this);
+    XtAddEventHandler( (Widget) mainWidget,
+                       ButtonPressMask | ButtonReleaseMask
+                     | PointerMotionMask,
+                       False,
+                       wxPanelItemEventHandler,
+                       (XtPointer) this);
+
+    if (!formWidget)
     {
     {
-      XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
-                    XmNy, y, NULL);
+        XtTranslations ptr;
+        XtOverrideTranslations ((Widget) mainWidget,
+            ptr = XtParseTranslationTable ("<Configure>: resize()"));
+        XtFree ((char *) ptr);
     }
 
     }
 
-  if (w > -1)
+    // Some widgets have a parent form widget, e.g. wxRadioBox
+    if (formWidget)
     {
     {
-      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);
-       }
+        if (!wxAddWindowToTable((Widget) formWidget, this))
+            return false;
+
+        XtTranslations ptr;
+        XtOverrideTranslations ((Widget) formWidget,
+            ptr = XtParseTranslationTable ("<Configure>: resize()"));
+        XtFree ((char *) ptr);
+    }
+
+    if (x == -1)
+        x = 0;
+    if (y == -1)
+        y = 0;
+    DoSetSize (x, y, width, height, wxSIZE_USE_EXISTING);
+
+    return true;
+}
+
+// Remove event handler, remove from hash table
+bool wxWindow::DetachWidget(WXWidget widget)
+{
+    XtRemoveEventHandler( (Widget) widget,
+                          ButtonPressMask | ButtonReleaseMask
+                        | PointerMotionMask,
+                          False,
+                          wxPanelItemEventHandler,
+                          (XtPointer)this);
+
+    wxDeleteWindowFromTable((Widget) widget);
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// Motif-specific accessors
+// ----------------------------------------------------------------------------
+
+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 = (Widget)GetMainWidget();
+    if ( wMain )
+        return (WXWindow) XtWindow(wMain);
+    else
+        return (WXWindow) 0;
+}
+
+// Get the underlying X display
+WXDisplay *wxWindow::GetXDisplay() const
+{
+    Widget wMain = (Widget)GetMainWidget();
+    if ( wMain )
+        return (WXDisplay*) XtDisplay(wMain);
+    else
+        return (WXDisplay*) NULL;
+}
 
 
-      XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
+WXWidget wxWindow::GetMainWidget() const
+{
+    if (m_drawingArea)
+        return m_drawingArea;
+    else
+        return m_mainWidget;
+}
+
+WXWidget wxWindow::GetClientWidget() const
+{
+    if (m_drawingArea != (WXWidget) 0)
+        return m_drawingArea;
+    else
+        return GetMainWidget();
+}
 
 
-      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;
+WXWidget wxWindow::GetTopWidget() const
+{
+    return GetMainWidget();
+}
 
 
-      w -= (spacing + wsbar);
+WXWidget wxWindow::GetLabelWidget() const
+{
+    return GetMainWidget();
+}
+
+// ----------------------------------------------------------------------------
+// Motif callbacks
+// ----------------------------------------------------------------------------
+
+// All widgets should have this as their resize proc.
+// OnSize sent to wxWindow via client data.
+void wxWidgetResizeProc(Widget w, XConfigureEvent *WXUNUSED(event),
+                        String WXUNUSED(args)[], int *WXUNUSED(num_args))
+{
+    wxWindow *win = wxGetWindowFromTable(w);
+    if (!win)
+        return;
 
 
-      XtVaSetValues ((Widget) m_drawingArea, XmNwidth, w, NULL);
+    if (win->PreResize())
+    {
+        wxSize newSize(win->GetSize());
+        wxSizeEvent sizeEvent(newSize, win->GetId());
+        sizeEvent.SetEventObject(win);
+        win->GetEventHandler()->ProcessEvent(sizeEvent);
     }
     }
-  if (h > -1)
+}
+
+static void wxCanvasRepaintProc(Widget drawingArea,
+                                XtPointer clientData,
+                                XmDrawingAreaCallbackStruct * cbs)
+{
+    if (!wxGetWindowFromTable(drawingArea))
+        return;
+
+    XEvent * event = cbs->event;
+    wxWindow * win = (wxWindow *) clientData;
+
+    switch (event->type)
     {
     {
-      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);
-       }
+    case Expose:
+        {
+            win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
+                               event->xexpose.width, event->xexpose.height);
+
+            if (event -> xexpose.count == 0)
+            {
+                win->DoPaint();
+            }
+            break;
+        }
+    }
+}
+
+// Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4)
+static void wxCanvasEnterLeave(Widget drawingArea,
+                               XtPointer WXUNUSED(clientData),
+                               XCrossingEvent * event)
+{
+    XmDrawingAreaCallbackStruct cbs;
+    XEvent ev;
+
+    ((XCrossingEvent &) ev) = *event;
+
+    cbs.reason = XmCR_INPUT;
+    cbs.event = &ev;
 
 
-      XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL);
+    wxCanvasInputEvent(drawingArea, (XtPointer) NULL, &cbs);
+}
+
+// Fix to make it work under Motif 1.0 (!)
+static void wxCanvasMotionEvent (Widget WXUNUSED(drawingArea),
+                                 XButtonEvent *WXUNUSED(event))
+{
+#if XmVersion <= 1000
+    XmDrawingAreaCallbackStruct cbs;
+    XEvent ev;
 
 
-      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;
+    ev = *((XEvent *) event);
+    cbs.reason = XmCR_INPUT;
+    cbs.event = &ev;
 
 
-      h -= (spacing + wsbar);
+    wxCanvasInputEvent (drawingArea, (XtPointer) NULL, &cbs);
+#endif // XmVersion <= 1000
+}
+
+static void wxCanvasInputEvent(Widget drawingArea,
+                               XtPointer WXUNUSED(data),
+                               XmDrawingAreaCallbackStruct * cbs)
+{
+    wxWindow *canvas = wxGetWindowFromTable(drawingArea);
+    XEvent* xevent = cbs->event;
 
 
-      XtVaSetValues ((Widget) m_drawingArea, XmNheight, h, NULL);
+    if (canvas==NULL)
+        return;
+
+    if (cbs->reason != XmCR_INPUT)
+        return;
+
+    switch (xevent->xany.type)
+    {
+    case EnterNotify:
+    case LeaveNotify:
+    case ButtonPress:
+    case ButtonRelease:
+    case MotionNotify:
+        {
+            wxMouseEvent wxevent(0);
+            if (wxTranslateMouseEvent(wxevent, canvas, drawingArea, xevent))
+            {
+                canvas->GetEventHandler()->ProcessEvent(wxevent);
+            }
+            break;
+        }
+    case KeyPress:
+        {
+            wxKeyEvent event (wxEVT_CHAR);
+            if (wxTranslateKeyEvent (event, canvas, (Widget) 0, xevent))
+            {
+                // Implement wxFrame::OnCharHook by checking ancestor.
+                wxWindow *parent = canvas;
+                while (parent && !parent->IsTopLevel())
+                    parent = parent->GetParent();
+
+                if (parent)
+                {
+                    event.SetEventType(wxEVT_CHAR_HOOK);
+                    if (parent->GetEventHandler()->ProcessEvent(event))
+                        return;
+                }
+
+                // For simplicity, OnKeyDown is the same as OnChar
+                // TODO: filter modifier key presses from OnChar
+                event.SetEventType(wxEVT_KEY_DOWN);
+
+                // Only process OnChar if OnKeyDown didn't swallow it
+                if (!canvas->GetEventHandler()->ProcessEvent (event))
+                {
+                    event.SetEventType(wxEVT_CHAR);
+                    canvas->GetEventHandler()->ProcessEvent (event);
+                }
+            }
+            break;
+        }
+    case KeyRelease:
+        {
+            wxKeyEvent event (wxEVT_KEY_UP);
+            if (wxTranslateKeyEvent (event, canvas, (Widget) 0, xevent))
+            {
+                canvas->GetEventHandler()->ProcessEvent (event);
+            }
+            break;
+        }
+    case FocusIn:
+        {
+            if (xevent->xfocus.detail != NotifyPointer)
+            {
+                wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId());
+                event.SetEventObject(canvas);
+                canvas->GetEventHandler()->ProcessEvent(event);
+            }
+            break;
+        }
+    case FocusOut:
+        {
+            if (xevent->xfocus.detail != NotifyPointer)
+            {
+                wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId());
+                event.SetEventObject(canvas);
+                canvas->GetEventHandler()->ProcessEvent(event);
+            }
+            break;
+        }
+    default:
+        break;
+    }
+}
+
+static void wxPanelItemEventHandler(Widget    wid,
+                                    XtPointer WXUNUSED(client_data),
+                                    XEvent*   event,
+                                    Boolean  *continueToDispatch)
+{
+    // Widget can be a label or the actual widget.
+
+    wxWindow *window = wxGetWindowFromTable(wid);
+    if (window)
+    {
+        wxMouseEvent wxevent(0);
+        if (wxTranslateMouseEvent(wxevent, window, wid, event))
+        {
+            window->GetEventHandler()->ProcessEvent(wxevent);
+        }
     }
     }
-  if (managed)
-    XtManageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-  XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
 
 
-  int ww, hh;
-  GetClientSize (&ww, &hh);
-  wxSizeEvent sizeEvent(wxSize(ww, hh), GetId());
-  sizeEvent.SetEventObject(this);
-  
-  GetEventHandler()->ProcessEvent(sizeEvent);
+    // TODO: probably the key to allowing default behaviour to happen. Say we
+    // set a m_doDefault flag to false at the start of this function. Then in
+    // e.g. wxWindow::OnMouseEvent we can call Default() which sets this flag to
+    // true, indicating that default processing can happen. Thus, behaviour can
+    // appear to be overridden just by adding an event handler and not calling
+    // wxWindow::OnWhatever. ALSO, maybe we can use this instead of the current
+    // way of handling drawing area events, to simplify things.
+    *continueToDispatch = True;
 }
 
 }
 
-void wxWindow::CanvasSetClientSize (int w, int h)
+static void wxScrollBarCallback(Widget scrollbar,
+                                XtPointer clientData,
+                                XmScrollBarCallbackStruct *cbs)
 {
 {
-  Widget drawingArea = (Widget) m_drawingArea;
+    wxWindow *win = wxGetWindowFromTable(scrollbar);
+    wxCHECK_RET( win, _T("invalid widget in scrollbar callback") );
+
+    wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);
+
+    wxEventType eventType = wxEVT_NULL;
+    switch (cbs->reason)
+    {
+    case XmCR_INCREMENT:
+        {
+            eventType = wxEVT_SCROLLWIN_LINEDOWN;
+            break;
+        }
+    case XmCR_DECREMENT:
+        {
+            eventType = wxEVT_SCROLLWIN_LINEUP;
+            break;
+        }
+    case XmCR_DRAG:
+        {
+            eventType = wxEVT_SCROLLWIN_THUMBTRACK;
+            break;
+        }
+    case XmCR_VALUE_CHANGED:
+        {
+            eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
+            break;
+        }
+    case XmCR_PAGE_INCREMENT:
+        {
+            eventType = wxEVT_SCROLLWIN_PAGEDOWN;
+            break;
+        }
+    case XmCR_PAGE_DECREMENT:
+        {
+            eventType = wxEVT_SCROLLWIN_PAGEUP;
+            break;
+        }
+    case XmCR_TO_TOP:
+        {
+            eventType = wxEVT_SCROLLWIN_TOP;
+            break;
+        }
+    case XmCR_TO_BOTTOM:
+        {
+            eventType = wxEVT_SCROLLWIN_BOTTOM;
+            break;
+        }
+    default:
+        {
+            // Should never get here
+            wxFAIL_MSG("Unknown scroll event.");
+            break;
+        }
+    }
 
 
-  XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
+    wxScrollWinEvent event(eventType,
+                           cbs->value,
+                           orientation);
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent(event);
+}
 
 
-  if (w > -1)
-    XtVaSetValues ((Widget) m_drawingArea, XmNwidth, w, NULL);
-  if (h > -1)
-    XtVaSetValues ((Widget) m_drawingArea, XmNheight, h, NULL);
-  /* TODO: is this necessary?
-  allowRepainting = FALSE;
+// For repainting arbitrary windows
+void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
+{
+    wxWindow* win = wxGetWindowFromTable(w);
+    if (!win)
+        return;
 
 
-  XSync (XtDisplay (drawingArea), FALSE);
-  XEvent event;
-  while (XtAppPending (wxTheApp->appContext))
+    switch ( event->type )
     {
     {
-      XFlush (XtDisplay (drawingArea));
-      XtAppNextEvent (wxTheApp->appContext, &event);
-      XtDispatchEvent (&event);
+        case Expose:
+        {
+            win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
+                               event->xexpose.width, event->xexpose.height);
+
+            if ( event->xexpose.count == 0 )
+            {
+                win->DoPaint();
+            }
+
+            break;
+        }
     }
     }
-    */
+}
+
+// ----------------------------------------------------------------------------
+// TranslateXXXEvent() functions
+// ----------------------------------------------------------------------------
+
+bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
+                           Widget widget, const XEvent *xevent)
+{
+    switch (xevent->xany.type)
+    {
+        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;
 
 
-  XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
+            wxEventType eventType = wxEVT_NULL;
 
 
-  /* TODO
-  allowRepainting = TRUE;
-  DoRefresh ();
-  */
+            if (xevent->xany.type == LeaveNotify)
+            {
+                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;
+                    button = 1;
+                }
+                else if (xevent->xbutton.button == Button2)
+                {
+                    eventType = wxEVT_MIDDLE_DOWN;
+                    button = 2;
+                }
+                else if (xevent->xbutton.button == Button3)
+                {
+                    eventType = wxEVT_RIGHT_DOWN;
+                    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)
+            {
+                if (xevent->xbutton.button == Button1)
+                {
+                    eventType = wxEVT_LEFT_UP;
+                }
+                else if (xevent->xbutton.button == Button2)
+                {
+                    eventType = wxEVT_MIDDLE_UP;
+                }
+                else if (xevent->xbutton.button == Button3)
+                {
+                    eventType = wxEVT_RIGHT_UP;
+                }
+                else
+                    return false;
+            }
+            else
+            {
+                return false;
+            }
+
+            wxevent.SetEventType(eventType);
+
+            Position x1, y1;
+            XtVaGetValues(widget, XmNx, &x1, XmNy, &y1, NULL);
 
 
-  wxSizeEvent sizeEvent(wxSize(w, h), GetId());
-  sizeEvent.SetEventObject(this);
-  
-  GetEventHandler()->ProcessEvent(sizeEvent);
+            int x2, y2;
+            win->GetPosition(&x2, &y2);
+
+            // 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;
+            int dy = 0;
+            if (widget != (Widget)win->GetMainWidget())
+            {
+                dx = x1;
+                dy = y1;
+            }
+
+            wxevent.m_x = eventx + dx;
+            wxevent.m_y = eventy + dy;
+
+            wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
+                || (event_left_is_down (xevent)
+                && (eventType != wxEVT_LEFT_UP)));
+            wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)
+                || (event_middle_is_down (xevent)
+                && (eventType != wxEVT_MIDDLE_UP)));
+            wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)
+                || (event_right_is_down (xevent)
+                && (eventType != wxEVT_RIGHT_UP)));
+
+            wxevent.m_shiftDown = (xevent->xbutton.state & ShiftMask) == ShiftMask;
+            wxevent.m_controlDown = (xevent->xbutton.state & ControlMask) == ControlMask;
+            wxevent.m_altDown = (xevent->xbutton.state & Mod3Mask) == Mod3Mask;
+            wxevent.m_metaDown = (xevent->xbutton.state & Mod1Mask) == Mod1Mask;
+
+            wxevent.SetId(win->GetId());
+            wxevent.SetEventObject(win);
+
+            return true;
+        }
+    }
+    return false;
 }
 
 }
 
-void wxWindow::CanvasGetClientSize (int *w, int *h) const
+bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
+                         Widget WXUNUSED(widget), const XEvent *xevent)
 {
 {
-  // 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;
+    switch (xevent->xany.type)
+    {
+    case KeyPress:
+    case KeyRelease:
+        {
+            char buf[20];
+
+            KeySym keySym;
+            (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 & ControlMask)
+                wxevent.m_controlDown = true;
+            if (xevent->xkey.state & Mod3Mask)
+                wxevent.m_altDown = true;
+            if (xevent->xkey.state & Mod1Mask)
+                wxevent.m_metaDown = true;
+            wxevent.SetEventObject(win);
+            wxevent.m_keyCode = id;
+            wxevent.SetTimestamp(xevent->xkey.time);
+
+            wxevent.m_x = xevent->xbutton.x;
+            wxevent.m_y = xevent->xbutton.y;
+
+            if (id > -1)
+                return true;
+
+            return false;
+        }
+    default:
+        break;
+    }
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// Colour stuff
+// ----------------------------------------------------------------------------
+
+#define YAllocColor XAllocColor
+XColor g_itemColors[5];
+int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore)
+{
+    int result;
+    static XmColorProc colorProc;
+
+    result = wxNO_COLORS;
+
+    if (back)
+    {
+        g_itemColors[0].red = (unsigned short)(((long) back->Red ()) << 8);
+        g_itemColors[0].green = (unsigned short)(((long) back->Green ()) << 8);
+        g_itemColors[0].blue = (unsigned short)(((long) back->Blue ()) << 8);
+        g_itemColors[0].flags = DoRed | DoGreen | DoBlue;
+        if (colorProc == (XmColorProc) NULL)
+        {
+            // Get a ptr to the actual function
+            colorProc = XmSetColorCalculation ((XmColorProc) NULL);
+            // And set it back to motif.
+            XmSetColorCalculation (colorProc);
+        }
+        (*colorProc) (&g_itemColors[wxBACK_INDEX],
+            &g_itemColors[wxFORE_INDEX],
+            &g_itemColors[wxSELE_INDEX],
+            &g_itemColors[wxTOPS_INDEX],
+            &g_itemColors[wxBOTS_INDEX]);
+        result = wxBACK_COLORS;
+    }
+    if (fore)
+    {
+        g_itemColors[wxFORE_INDEX].red = (unsigned short)(((long) fore->Red ()) << 8);
+        g_itemColors[wxFORE_INDEX].green = (unsigned short)(((long) fore->Green ()) << 8);
+        g_itemColors[wxFORE_INDEX].blue = (unsigned short)(((long) fore->Blue ()) << 8);
+        g_itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue;
+        if (result == wxNO_COLORS)
+            result = wxFORE_COLORS;
+    }
+
+    Display *dpy = display;
+    Colormap cmap = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dpy);
+
+    if (back)
+    {
+        /* 5 Colours to allocate */
+        for (int i = 0; i < 5; i++)
+            if (!YAllocColor (dpy, cmap, &g_itemColors[i]))
+                result = wxNO_COLORS;
+    }
+    else if (fore)
+    {
+        /* Only 1 colour to allocate */
+        if (!YAllocColor (dpy, cmap, &g_itemColors[wxFORE_INDEX]))
+            result = wxNO_COLORS;
+    }
+
+    return result;
+}
+
+// Changes the foreground and background colours to be derived from the current
+// background colour. To change the foreground colour, you must call
+// SetForegroundColour explicitly.
+void wxWindow::ChangeBackgroundColour()
+{
+    WXWidget mainWidget = GetMainWidget();
+    if ( mainWidget )
+        wxDoChangeBackgroundColour(mainWidget, m_backgroundColour);
+    if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
+        wxDoChangeForegroundColour(m_scrolledWindow, m_backgroundColour);
+}
+
+void wxWindow::ChangeForegroundColour()
+{
+    WXWidget mainWidget = GetMainWidget();
+    if ( mainWidget )
+        wxDoChangeForegroundColour(mainWidget, m_foregroundColour);
+    if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
+        wxDoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);
 }
 
 }
 
-void wxWindow::CanvasGetSize (int *w, int *h) const
+bool wxWindow::SetBackgroundColour(const wxColour& col)
 {
 {
-  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);
+    if ( !wxWindowBase::SetBackgroundColour(col) )
+        return false;
 
 
-  *w = xx;
-  *h = yy;
+    ChangeBackgroundColour();
+
+    return true;
+}
+
+bool wxWindow::SetForegroundColour(const wxColour& col)
+{
+    if ( !wxWindowBase::SetForegroundColour(col) )
+        return false;
+
+    ChangeForegroundColour();
+
+    return true;
+}
+
+void wxWindow::ChangeFont(bool keepOriginalSize)
+{
+    // Note that this causes the widget to be resized back
+    // 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_font.Ok())
+    {
+        int width, height, width1, height1;
+        GetSize(& width, & height);
+
+        wxDoChangeFont( w, m_font );
+
+        GetSize(& width1, & height1);
+        if (keepOriginalSize && (width != width1 || height != height1))
+        {
+            SetSize(wxDefaultCoord, wxDefaultCoord, width, height);
+        }
+    }
+}
+
+// Post-creation
+void wxWindow::PostCreation()
+{
+    ChangeFont();
+    ChangeForegroundColour();
+    ChangeBackgroundColour();
+}
+
+// Pre-creation
+void wxWindow::PreCreation()
+{
+    InheritAttributes();
+}
+
+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------
+
+wxWindow *wxGetActiveWindow()
+{
+    // TODO
+    wxFAIL_MSG("Not implemented");
+    return NULL;
 }
 
 }
 
-void wxWindow::CanvasGetPosition (int *x, int *y) const
+/* static */
+wxWindow *wxWindowBase::GetCapture()
 {
 {
-  Position xx, yy;
-  XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, &xx, XmNy, &yy, NULL);
-  *x = xx;
-  *y = yy;
+    return (wxWindow *)g_captureWindow;
 }
 }
+
+
+// Find the wxWindow at the current mouse position, returning the mouse
+// position.
+wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+{
+    pt = wxGetMousePosition();
+    return wxFindWindowAtPoint(pt);
+}
+
+void wxGetMouseState(int& rootX, int& rootY, unsigned& maskReturn)
+{
+    Display *display = wxGlobalDisplay();
+    Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
+    Window rootReturn, childReturn;
+    int winX, winY;
+
+    XQueryPointer (display,
+                   rootWindow,
+                   &rootReturn,
+                   &childReturn,
+                   &rootX, &rootY, &winX, &winY, &maskReturn);
+}
+
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
+{
+    int x, y;
+    unsigned mask;
+
+    wxGetMouseState(x, y, mask);
+    return wxPoint(x, y);
+}
+
+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+    int x, y;
+    unsigned mask;
+
+    wxGetMouseState(x, y, mask);
+
+    ms.SetX(x);
+    ms.SetY(y);
+
+    ms.SetLeftDown(mask & Button1Mask);
+    ms.SetMiddleDown(mask & Button2Mask);
+    ms.SetRightDown(mask & Button3Mask);
+
+    ms.SetControlDown(mask & ControlMask);
+    ms.SetShiftDown(mask & ShiftMask);
+    ms.SetAltDown(mask & Mod3Mask);
+    ms.SetMetaDown(mask & Mod1Mask);
+
+    return ms;
+}
+
+
+#if wxMOTIF_NEW_FONT_HANDLING
+
+#include <Xm/XmP.h>
+
+void wxGetTextExtent(const wxWindow* window, const wxString& str,
+                     int* width, int* height, int* ascent, int* descent)
+{
+    Arg args[2];
+    int count = 0;
+    XmRendition rendition = NULL;
+    XmRenderTable table = NULL;
+    Widget w = (Widget) window->GetLabelWidget();
+
+    XtVaGetValues( w, XmNrenderTable, &table, NULL );
+    if (table == NULL)
+        table = XmeGetDefaultRenderTable(w, XmTEXT_RENDER_TABLE);
+
+    rendition = XmRenderTableGetRendition( table, "" );
+    XtSetArg( args[count], XmNfont, 0 ); ++count;
+    XtSetArg( args[count], XmNfontType, 0 ); ++count;
+    XmRenditionRetrieve( rendition, args, count );
+
+    if (args[1].value == XmFONT_IS_FONTSET)
+    {
+        XRectangle ink, logical;
+        WXFontSet fset = (WXFontSet) args[0].value;
+    
+        XmbTextExtents( (XFontSet)fset, str.c_str(), str.length(),
+                        &ink, &logical);
+
+        if( width ) *width = logical.width;
+        if( height ) *height = logical.height;
+        if( ascent ) *ascent = -logical.y;    
+        if( descent ) *descent = logical.height + logical.y;    
+    }
+    else
+    {
+        int direction, ascent2, descent2;
+        XCharStruct overall;
+        XFontStruct* fontStruct;
+
+        XmeRenderTableGetDefaultFont( table, &fontStruct );
+        XTextExtents(fontStruct, (const char*)str.c_str(), str.length(),
+                     &direction, &ascent2, &descent2, &overall);
+
+        if ( width ) *width = overall.width;
+        if ( height ) *height = ascent2 + descent2;
+        if ( descent ) *descent = descent2;
+        if ( ascent ) *ascent = ascent2;
+    }
+}
+
+#else // if !wxMOTIF_NEW_FONT_HANDLING
+
+void wxGetTextExtent(const wxWindow* window, const wxString& str,
+                     int* width, int* height, int* ascent, int* descent)
+{
+    XmFontList list = NULL;
+    XmFontContext cxt;
+    XmFontType type;
+    Widget w = (Widget) window->GetLabelWidget();
+
+    XtVaGetValues( w, XmNfontList, &list, NULL );
+    XmFontListInitFontContext( &cxt, list );
+
+    XmFontListEntry entry = XmFontListNextEntry( cxt );
+    XmFontListFreeFontContext( cxt );
+    XtPointer thing = XmFontListEntryGetFont( entry, &type );
+
+    if (type == XmFONT_IS_FONTSET)
+    {
+        XRectangle ink, logical;
+    
+        XmbTextExtents( (XFontSet)thing, str.c_str(), str.length(),
+                        &ink, &logical);
+
+        if( width ) *width = logical.width;
+        if( height ) *height = logical.height;
+        if( ascent ) *ascent = -logical.y;    
+        if( descent ) *descent = logical.height + logical.y;    
+    }
+    else
+    {
+        int direction, ascent2, descent2;
+        XCharStruct overall;
+
+        XTextExtents( (XFontStruct*)thing, (char*)(const char*)str.c_str(), str.length(),
+                     &direction, &ascent2, &descent2, &overall);
+
+        if ( width ) *width = overall.width;
+        if ( height ) *height = ascent2 + descent2;
+        if ( descent ) *descent = descent2;
+        if ( ascent ) *ascent = ascent2;
+    }
+}
+
+#endif // !wxMOTIF_NEW_FONT_HANDLING
+
+// ----------------------------------------------------------------------------
+// wxNoOptimize: switch off size optimization
+// ----------------------------------------------------------------------------
+
+int wxNoOptimize::ms_count = 0;
wxWidgets (Impactor)