X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50414e24a7aa082f2569666421d3ee1ea581a3cd..8aa04e8bf1638ed4d9355e560c8d718c8be4667a:/src/motif/window.cpp

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 3f2ba314ed..dc47a226d6 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -31,7 +31,7 @@
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
-#if  USE_DRAG_AND_DROP
+#if  wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"
 #endif
 
@@ -52,6 +52,12 @@ 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);
+static void wxScrollBarCallback(Widget widget, XtPointer clientData,
+                        XmScaleCallbackStruct *cbs);
+void wxPanelItemEventHandler (Widget    wid,
+                              XtPointer client_data,
+                              XEvent*   event,
+                              Boolean *continueToDispatch);
 
 #define event_left_is_down(x) ((x)->xbutton.state & Button1Mask)
 #define event_middle_is_down(x) ((x)->xbutton.state & Button2Mask)
@@ -95,14 +101,15 @@ wxWindow::wxWindow()
     m_caretWidth = 0; m_caretHeight = 0;
     m_caretEnabled = FALSE;
     m_caretShown = FALSE;
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
+    // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
+    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
     m_foregroundColour = *wxBLACK;
-    m_defaultForegroundColour = *wxBLACK ;
-    m_defaultBackgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
 
-#if  USE_DRAG_AND_DROP
+#if  wxUSE_DRAG_AND_DROP
     m_pDropTarget = NULL;
 #endif
+    m_clientObject = (wxClientData*) NULL;
+    m_clientData = NULL;
 
     /// Motif-specific
     m_mainWidget = (WXWidget) 0;
@@ -118,8 +125,6 @@ wxWindow::wxWindow()
     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;
@@ -127,65 +132,70 @@ wxWindow::wxWindow()
     m_pixmapOffsetY = 0;
     m_lastTS = 0;
     m_lastButton = 0;
+    m_canAddEventHandler = FALSE;
+    m_scrollPosX = 0;
+    m_scrollPosY = 0;
 }
 
 // Destructor
 wxWindow::~wxWindow()
 {
-  //// Motif-specific
+    //// Motif-specific
 
-  // 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();
+    if (GetMainWidget())
+        DetachWidget(GetMainWidget()); // Removes event handlers
 
-    if (m_backingPixmap)
-      XFreePixmap (XtDisplay ((Widget) GetMainWidget()), (Pixmap) m_backingPixmap);
+    // 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();
 
-    Widget w = (Widget) m_drawingArea;
-    wxDeleteWindowFromTable(w);
+        if (m_backingPixmap)
+        XFreePixmap (XtDisplay ((Widget) GetMainWidget()), (Pixmap) m_backingPixmap);
 
-    if (w)
-      XtDestroyWidget(w);
-    m_mainWidget = (WXWidget) 0;
+        Widget w = (Widget) m_drawingArea;
+        wxDeleteWindowFromTable(w);
 
-    // Only if we're _really_ a canvas (not a dialog box/panel)
-    if (m_scrolledWindow)
-    {
-      wxDeleteWindowFromTable((Widget) m_scrolledWindow);
-    }
+        if (w)
+            XtDestroyWidget(w);
+        m_mainWidget = (WXWidget) 0;
 
-    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);
-    }
+        // Only if we're _really_ a canvas (not a dialog box/panel)
+        if (m_scrolledWindow)
+        {
+            wxDeleteWindowFromTable((Widget) m_scrolledWindow);
+        }
 
-    if (m_borderWidget)
-    {
-      XtDestroyWidget ((Widget) m_borderWidget);
-      m_borderWidget = (WXWidget) 0;
-    }
-  }
+        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);
+        }
 
+        if (m_borderWidget)
+        {
+            XtDestroyWidget ((Widget) m_borderWidget);
+            m_borderWidget = (WXWidget) 0;
+        }
+    }
 
-  //// Generic stuff
+    //// Generic stuff
 
 	// Have to delete constraints/sizer FIRST otherwise
 	// sizers may try to look at deleted windows as they
 	// delete themselves.
-#if USE_CONSTRAINTS
+#if wxUSE_CONSTRAINTS
     DeleteRelatedConstraints();
     if (m_constraints)
     {
@@ -226,8 +236,10 @@ wxWindow::~wxWindow()
     // dangling pointers.
     wxPendingDelete.DeleteObject(this);
 
-    if ( m_windowValidator )
-	    delete m_windowValidator;
+    if ( m_windowValidator ) delete m_windowValidator;
+    if (m_clientObject) delete m_clientObject;
+
+    ClearUpdateRects();
 }
 
 // Destroy the window (delayed, if a managed window)
@@ -257,7 +269,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     m_sizerParent = NULL;
     m_autoLayout = FALSE;
     m_windowValidator = NULL;
-#if USE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP
     m_pDropTarget = NULL;
 #endif
     m_caretWidth = 0; m_caretHeight = 0;
@@ -269,8 +281,11 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     m_maxSizeY = -1;
     m_defaultItem = NULL;
     m_windowParent = NULL;
+    m_clientObject = (wxClientData*) NULL;
+    m_clientData = NULL;
 
     // Motif-specific
+    m_canAddEventHandler = FALSE;
     m_mainWidget = (WXWidget) 0;
     m_button1Pressed = FALSE;
     m_button2Pressed = FALSE;
@@ -284,13 +299,13 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     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_scrollPosX = 0;
+    m_scrollPosY = 0;
 
     if (!parent)
         return FALSE;
@@ -306,10 +321,9 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     else
 	m_windowId = id;
 
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
+    // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
+    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
     m_foregroundColour = *wxBLACK;
-    m_defaultForegroundColour = *wxBLACK ;
-    m_defaultBackgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
 
     m_windowStyle = style;
 
@@ -405,7 +419,68 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
   XtAddEventHandler ((Widget) m_drawingArea, PointerMotionHintMask | EnterWindowMask | LeaveWindowMask | FocusChangeMask,
     False, (XtEventHandler) wxCanvasEnterLeave, (XtPointer) this);
 
-    return TRUE;
+  // Add scrollbars if required
+  if (m_windowStyle & wxHSCROLL)
+  {
+      Widget hScrollBar = XtVaCreateManagedWidget ("hsb",
+				     xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
+						XmNorientation, XmHORIZONTAL,
+						NULL);
+      //	  XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
+	  XtAddCallback (hScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
+	  XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
+	  XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
+	  XtAddCallback (hScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
+	  XtAddCallback (hScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
+	  XtAddCallback (hScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
+	  XtAddCallback (hScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
+
+      XtVaSetValues (hScrollBar,
+		     XmNincrement, 1,
+		     XmNvalue, 0,
+		     NULL);
+
+      m_hScrollBar = (WXWidget) hScrollBar;
+      m_hScroll = TRUE;
+  }
+  if (m_windowStyle & wxVSCROLL)
+  {
+      Widget vScrollBar = XtVaCreateManagedWidget ("vsb",
+				     xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
+						XmNorientation, XmVERTICAL,
+						NULL);
+      //	  XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
+	  XtAddCallback (vScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
+	  XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
+	  XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
+	  XtAddCallback (vScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
+	  XtAddCallback (vScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
+	  XtAddCallback (vScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
+	  XtAddCallback (vScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
+
+      XtVaSetValues (vScrollBar,
+		     XmNincrement, 1,
+		     XmNvalue, 0,
+		     NULL);
+
+      m_vScrollBar = (WXWidget) vScrollBar;
+      m_vScroll = TRUE;
+  }
+
+  if (m_hScrollBar || m_vScrollBar)
+    XmScrolledWindowSetAreas ((Widget) m_scrolledWindow, (Widget) m_hScrollBar, (Widget) m_vScrollBar, (Widget) m_drawingArea);
+
+  if (m_hScrollBar)
+	XtRealizeWidget ((Widget) m_hScrollBar);
+  if (m_vScrollBar)
+	XtRealizeWidget ((Widget) m_vScrollBar);
+
+  // Without this, the cursor may not be restored properly
+  // (e.g. in splitter sample).
+  SetCursor(*wxSTANDARD_CURSOR);
+  SetSize(pos.x, pos.y, size.x, size.y);
+
+  return TRUE;
 }
 
 void wxWindow::SetFocus()
@@ -472,7 +547,7 @@ wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
 		return NULL;
 }
 
-#if    USE_DRAG_AND_DROP
+#if    wxUSE_DRAG_AND_DROP
 
 void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 {
@@ -504,7 +579,7 @@ void wxWindow::GetSize(int *x, int *y) const
     return;
   }
 
-  Widget widget = (Widget) GetMainWidget();
+  Widget widget = (Widget) GetTopWidget();
   Dimension xx, yy;
   XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
   *x = xx; *y = yy;
@@ -512,36 +587,47 @@ void wxWindow::GetSize(int *x, int *y) const
 
 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;
+    if (m_drawingArea)
+    {
+        CanvasGetPosition(x, y);
+        return;
+    }
+    Widget widget = (Widget) GetTopWidget();
+    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())
+    {
+        wxPoint pt(GetParent()->GetClientAreaOrigin());
+        xx -= pt.x;
+        yy -= pt.y;
+    }
+
+    *x = xx; *y = yy;
 }
 
 void wxWindow::ScreenToClient(int *x, int *y) const
 {
-    // TODO
+  Widget widget = (Widget) GetClientWidget();
+  Display *display = XtDisplay((Widget) GetMainWidget());
+  Window rootWindow = RootWindowOfScreen(XtScreen(widget));
+  Window thisWindow = XtWindow(widget);
+
+  Window childWindow;
+  int xx = *x;
+  int yy = *y;
+  XTranslateCoordinates(display, rootWindow, thisWindow, xx, yy, x, y, &childWindow);
 }
 
 void wxWindow::ClientToScreen(int *x, int *y) const
 {
-  Widget widget = (Widget) GetMainWidget();
+  Widget widget = (Widget) GetClientWidget();
   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);
+  Window thisWindow = XtWindow(widget);
 
   Window childWindow;
   int xx = *x;
@@ -554,14 +640,12 @@ void wxWindow::SetCursor(const wxCursor& cursor)
   m_windowCursor = cursor;
   if (m_windowCursor.Ok())
   {
-    /* TODO when wxCursor implemented
     WXDisplay *dpy = GetXDisplay();
-    Cursor x_cursor = cursor.GetXCursor(dpy);
+    WXCursor x_cursor = ((wxCursor&)cursor).GetXCursor(dpy);
 
     Widget w = (Widget) GetMainWidget();
     Window win = XtWindow(w);
-    XDefineCursor((Display*) dpy, win, x_cursor);
-    */
+    XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);
   }
 }
 
@@ -569,7 +653,7 @@ void wxWindow::SetCursor(const wxCursor& cursor)
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 void wxWindow::GetClientSize(int *x, int *y) const
 {
-  Widget widget = (Widget) GetMainWidget();
+  Widget widget = (Widget) GetClientWidget();
   Dimension xx, yy;
   XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
   *x = xx; *y = yy;
@@ -582,17 +666,29 @@ void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
     CanvasSetSize(x, y, width, height, sizeFlags);
     return;
   }
-  Widget widget = (Widget) GetMainWidget();
+  Widget widget = (Widget) GetTopWidget();
+  if (!widget)
+    return;
+
+  bool managed = XtIsManaged( widget );
+  if (managed)
+    XtUnmanageChild(widget);
+
+  int xx = x; int yy = y;
+  AdjustForParentClientOrigin(xx, yy, sizeFlags);
 
   if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    XtVaSetValues(widget, XmNx, x, NULL);
+    XtVaSetValues(widget, XmNx, xx, NULL);
   if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    XtVaSetValues(widget, XmNy, y, NULL);
+    XtVaSetValues(widget, XmNy, yy, NULL);
   if (width > -1)
     XtVaSetValues(widget, XmNwidth, width, NULL);
   if (height > -1)
     XtVaSetValues(widget, XmNheight, height, NULL);
 
+  if (managed)
+    XtManageChild(widget);
+
   wxSizeEvent sizeEvent(wxSize(width, height), GetId());
   sizeEvent.SetEventObject(this);
   
@@ -607,7 +703,7 @@ void wxWindow::SetClientSize(int width, int height)
     return;
   }
 
-  Widget widget = (Widget) GetMainWidget();
+  Widget widget = (Widget) GetTopWidget();
 
   if (width > -1)
     XtVaSetValues(widget, XmNwidth, width, NULL);
@@ -644,22 +740,26 @@ bool wxWindow::Show(bool show)
     {
        if (m_borderWidget || m_scrolledWindow)
        {
+           if (m_drawingArea)
+             XtMapWidget((Widget) m_drawingArea);
            XtMapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
        }
        else
        {
-           XtMapWidget((Widget) GetMainWidget());
+           XtMapWidget((Widget) GetTopWidget());
        }
     }
     else
     {
        if (m_borderWidget || m_scrolledWindow)
        {
+           if (m_drawingArea)
+             XtUnmapWidget((Widget) m_drawingArea);
            XtUnmapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
        }
        else
        {
-           XtUnmapWidget((Widget) GetMainWidget());
+           XtUnmapWidget((Widget) GetTopWidget());
        }
     }
 
@@ -684,24 +784,77 @@ bool wxWindow::IsShown() const
 
 int wxWindow::GetCharHeight() const
 {
-    // TODO
+  if (!m_windowFont.Ok())
     return 0;
+
+  WXFontStructPtr pFontStruct = m_windowFont.GetFontStruct(1.0, GetXDisplay());
+
+  int direction, ascent, descent;
+  XCharStruct overall;
+  XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
+        &descent, &overall);
+//  return (overall.ascent + overall.descent);
+  return (ascent + descent);
 }
 
 int wxWindow::GetCharWidth() const
 {
-    // TODO
+  if (!m_windowFont.Ok())
     return 0;
+
+  WXFontStructPtr pFontStruct = m_windowFont.GetFontStruct(1.0, GetXDisplay());
+
+  int direction, ascent, descent;
+  XCharStruct overall;
+  XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
+        &descent, &overall);
+  return overall.width;
+}
+
+/* Helper function for 16-bit fonts */
+static int str16len(const char *s)
+{
+  int count = 0;
+
+  while (s[0] && s[1]) {
+    count++;
+    s += 2;
+  }
+
+  return count;
 }
 
 void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
-                           int *descent, int *externalLeading, const wxFont *theFont, bool) const
+                           int *descent, int *externalLeading, const wxFont *theFont, bool use16) const
 {
   wxFont *fontToUse = (wxFont *)theFont;
   if (!fontToUse)
     fontToUse = (wxFont *) & m_windowFont;
 
-    // TODO
+  if (!fontToUse->Ok())
+    return;
+
+  WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay());
+
+  int direction, ascent, descent2;
+  XCharStruct overall;
+  int slen;
+  
+  if (use16) slen = str16len(string); else slen = strlen(string);
+
+  if (use16)
+    XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction,
+           &ascent, &descent2, &overall);
+  else
+     XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) string, slen, &direction,
+         &ascent, &descent2, &overall);
+
+  *x = (overall.width);
+  *y = (ascent + descent2);
+  if (descent)
+    *descent = descent2;
+  if (externalLeading)
+    *externalLeading = 0;
 }
 
 void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
@@ -736,6 +889,8 @@ void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
     if (eraseBack)
     {
         wxClientDC dc(this);
+        wxBrush backgroundBrush(GetBackgroundColour(), wxSOLID);
+        dc.SetBackground(backgroundBrush);
         dc.Clear();
     }
 
@@ -833,21 +988,20 @@ void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, in
       return;
 
     wxFrame *frame = (wxFrame *)this;
+    Widget widget = (Widget) frame->GetShellWidget();
 
-    /* Uncomment when wxFrame implemented
     if (minW > -1)
-      XtVaSetValues((Widget) frame->m_frameShell, XmNminWidth, minW, NULL);
+      XtVaSetValues(widget, XmNminWidth, minW, NULL);
     if (minH > -1)
-      XtVaSetValues((Widget) frame->m_frameShell, XmNminHeight, minH, NULL);
+      XtVaSetValues(widget, XmNminHeight, minH, NULL);
     if (maxW > -1)
-      XtVaSetValues((Widget) frame->m_frameShell, XmNmaxWidth, maxW, NULL);
+      XtVaSetValues(widget, XmNmaxWidth, maxW, NULL);
     if (maxH > -1)
-      XtVaSetValues((Widget) frame->m_frameShell, XmNmaxHeight, maxH, NULL);
+      XtVaSetValues(widget, XmNmaxHeight, maxH, NULL);
     if (incW > -1)
-      XtVaSetValues((Widget) frame->m_frameShell, XmNwidthInc, incW, NULL);
+      XtVaSetValues(widget, XmNwidthInc, incW, NULL);
     if (incH > -1)
-      XtVaSetValues((Widget) frame->m_frameShell, XmNheightInc, incH, NULL);
-      */
+      XtVaSetValues(widget, XmNheightInc, incH, NULL);
 }
 
 void wxWindow::Centre(int direction)
@@ -889,51 +1043,245 @@ void wxWindow::OnEraseBackground(wxEraseEvent& event)
 
 int wxWindow::GetScrollPos(int orient) const
 {
-    // TODO
-    return 0;
+    if (orient == wxHORIZONTAL)
+        return m_scrollPosX;
+    else
+        return m_scrollPosY;
+/*
+	Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar);
+	if (scrollBar)
+	{
+        int pos;
+        XtVaGetValues(scrollBar,
+            XmNvalue, &pos, NULL);
+        return pos;
+    }
+    else
+        return 0;
+*/
 }
 
 // This now returns the whole range, not just the number
 // of positions that we can scroll.
 int wxWindow::GetScrollRange(int orient) const
 {
-    // TODO
-    return 0;
+	Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar);
+	if (scrollBar)
+	{
+        int range;
+        XtVaGetValues(scrollBar,
+            XmNmaximum, &range, NULL);
+        return range;
+    }
+    else
+        return 0;
 }
 
 int wxWindow::GetScrollThumb(int orient) const
 {
-    // TODO
-    return 0;
+	Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar);
+	if (scrollBar)
+	{
+        int thumb;
+        XtVaGetValues(scrollBar,
+            XmNsliderSize, &thumb, NULL);
+        return thumb;
+    }
+    else
+        return 0;
 }
 
-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindow::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
 {
-    // TODO
-    return;
+	Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar);
+	if (scrollBar)
+	{
+		XtVaSetValues (scrollBar,
+				XmNvalue, pos,
+				NULL);
+	}
+        if (orient == wxHORIZONTAL)
+          m_scrollPosX = pos;
+        else
+          m_scrollPosY = pos;
+
 }
 
 // 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
+    Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar );
+    if (!scrollBar)
+        return;
+
+    if (range == 0)
+      range = 1;
+    if (thumbVisible == 0)
+      thumbVisible = 1;
+
+    XtVaSetValues(scrollBar,
+         XmNvalue, pos,
+         XmNminimum, 0,
+         XmNmaximum, range,
+         XmNsliderSize, thumbVisible,
+         NULL);
+
+    if (orient == wxHORIZONTAL)
+        m_scrollPosX = pos;
+    else
+        m_scrollPosY = pos;
 }
 
 // Does a physical scroll
 void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
 {
-    // TODO
-    return;
-}
+//  cerr << "Scrolling. delta = " << dx << ", " << dy << endl;
+  int x, y, w, h;
+  if (rect)
+  {
+    // Use specified rectangle
+    x = rect->x; y = rect->y; w = rect->width; h = rect->height;
+  }
+  else
+  {
+    // Use whole client area
+    x = 0; y = 0;
+    GetClientSize(& w, & h);
+  }
 
-void wxWindow::SetFont(const wxFont& font)
-{
-    m_windowFont = font;
+  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;
 
-    if (!m_windowFont.Ok())
-	    return;
-    // TODO
+  wxClientDC dc(this);
+
+  dc.SetLogicalFunction (wxCOPY);
+
+  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); // ??
+
+  // We'll add rectangles to the list of update rectangles
+  // according to which bits we've exposed.
+  wxList updateRects;
+	
+  if (dx > 0)
+  {
+    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);
+  }
+  else if (dx < 0)
+  {
+    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 (dy > 0)
+  {
+    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;
+
+    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
+
+  wxNode* node = updateRects.First();
+  while (node)
+  {
+    wxRect* rect = (wxRect*) node->Data();
+    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->Next();
+
+  }
 }
 
 void wxWindow::OnChar(wxKeyEvent& event)
@@ -955,7 +1303,8 @@ void wxWindow::OnPaint(wxPaintEvent& event)
 
 bool wxWindow::IsEnabled() const
 {
-    // TODO
+    // TODO. Is this right?
+    // return XtGetSensitive((Widget) GetMainWidget());
     return FALSE;
 }
 
@@ -1042,7 +1391,18 @@ void wxWindow::RemoveChild(wxWindow *child)
 
 void wxWindow::DestroyChildren()
 {
-  if (GetChildren()) {
+  if (GetChildren())
+  {
+    wxNode *node = GetChildren()->First();
+    while (node)
+    {
+      wxNode* next = node->Next();
+      wxWindow* child = (wxWindow*) node->Data();
+      delete child;
+      node = next;
+    }
+    GetChildren()->Clear();
+#if 0
     wxNode *node;
     while ((node = GetChildren()->First()) != (wxNode *)NULL) {
       wxWindow *child;
@@ -1052,6 +1412,7 @@ void wxWindow::DestroyChildren()
 			delete node;
       }
     } /* while */
+#endif
   }
 }
 
@@ -1072,6 +1433,17 @@ void wxWindow::MakeModal(bool modal)
   }
 }
 
+// If nothing defined for this, try the parent.
+// E.g. we may be a button loaded from a resource, with no callback function
+// defined.
+void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
+{
+  if (GetEventHandler()->ProcessEvent(event) )
+    return;
+  if (m_windowParent)
+    m_windowParent->GetEventHandler()->OnCommand(win, event);
+}
+
 void wxWindow::SetConstraints(wxLayoutConstraints *c)
 {
   if (m_constraints)
@@ -1519,7 +1891,7 @@ void wxWindow::OnDefaultAction(wxControl *initiatingItem)
 
 void wxWindow::Clear()
 {
-	wxClientDC dc(this);
+    wxClientDC dc(this);
     wxBrush brush(GetBackgroundColour(), wxSOLID);
     dc.SetBackground(brush);
     dc.Clear();
@@ -1557,6 +1929,27 @@ void wxWindow::SetValidator(const wxValidator& validator)
 		m_windowValidator->SetWindow(this) ;
 }
 
+void wxWindow::SetClientObject( wxClientData *data )
+{
+  if (m_clientObject) delete m_clientObject;
+  m_clientObject = data;
+}
+
+wxClientData *wxWindow::GetClientObject()
+{
+  return m_clientObject;
+}
+
+void wxWindow::SetClientData( void *data )
+{
+  m_clientData = data;
+}
+
+void *wxWindow::GetClientData()
+{
+  return m_clientData;
+}
+
 // Find a window by id or name
 wxWindow *wxWindow::FindWindow(long id)
 {
@@ -1594,40 +1987,23 @@ wxWindow *wxWindow::FindWindow(const wxString& name)
 
 void wxWindow::OnIdle(wxIdleEvent& event)
 {
-/* TODO: you may need to do something like this
- * if your GUI doesn't generate enter/leave events
-
-    // Check if we need to send a LEAVE event
-    if (m_mouseInWindow)
-    {
-        POINT pt;
-        ::GetCursorPos(&pt);
-        if (::WindowFromPoint(pt) != (HWND) GetHWND())
-        {
-            // Generate a LEAVE event
-            m_mouseInWindow = FALSE;
-            MSWOnMouseLeave(pt.x, pt.y, 0);
-        }
-    }
-*/
-
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)
-	UpdateWindowUI();
+    UpdateWindowUI();
 }
 
 // Raise the window to the top of the Z order
 void wxWindow::Raise()
 {
-    Window window = XtWindow((Widget) GetMainWidget());
-    XRaiseWindow(XtDisplay((Widget) GetMainWidget()), window);
+    Window window = XtWindow((Widget) GetTopWidget());
+    XRaiseWindow(XtDisplay((Widget) GetTopWidget()), window);
 }
 
 // Lower the window to the bottom of the Z order
 void wxWindow::Lower()
 {
-    Window window = XtWindow((Widget) GetMainWidget());
-    XLowerWindow(XtDisplay((Widget) GetMainWidget()), window);
+    Window window = XtWindow((Widget) GetTopWidget());
+    XLowerWindow(XtDisplay((Widget) GetTopWidget()), window);
 }
 
 bool wxWindow::AcceptsFocus() const
@@ -1636,9 +2012,9 @@ bool wxWindow::AcceptsFocus() const
 }
 
 // Update region access
-wxRegion wxWindow::GetUpdateRegion() const
+wxRegion& wxWindow::GetUpdateRegion() const
 {
-    return m_updateRegion;
+    return (wxRegion&) m_updateRegion;
 }
 
 bool wxWindow::IsExposed(int x, int y, int w, int h) const
@@ -1693,9 +2069,7 @@ void wxWidgetResizeProc(Widget w, XConfigureEvent *event, String args[], int *nu
 bool wxAddWindowToTable(Widget w, wxWindow *win)
 {
   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];
@@ -1718,11 +2092,6 @@ wxWindow *wxGetWindowFromTable(Widget w)
 
 void wxDeleteWindowFromTable(Widget w)
 {
-#if DEBUG
-//  printf("Deleting widget %ld\n", w);
-#endif
-//  wxWindow *win = (wxWindow *)wxWidgetHashTable->Get ((long) w);
-
   wxWidgetHashTable->Delete((long)w);
 }
   
@@ -1750,82 +2119,53 @@ WXWidget wxWindow::GetClientWidget() const
     if (m_drawingArea != (WXWidget) 0)
         return m_drawingArea;
     else
-        return m_mainWidget;
+        return GetMainWidget();
+}
+
+WXWidget wxWindow::GetTopWidget() const
+{
+    return GetMainWidget();
 }
 
 void wxCanvasRepaintProc (Widget drawingArea, XtPointer clientData,
  XmDrawingAreaCallbackStruct * cbs)
 {
     if (!wxWidgetHashTable->Get ((long) (Widget) drawingArea))
-	return;
+	    return;
 
     XEvent * event = cbs->event;
-    wxWindow * canvas = (wxWindow *) clientData;
-    Display * display = (Display *) canvas->GetXDisplay();
-    //    GC gc = (GC) canvas->GetDC()->gc;
+    wxWindow * win = (wxWindow *) clientData;
+    Display * display = (Display *) win->GetXDisplay();
 
     switch (event->type)
     {
-      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();
+        case Expose:
+        {
+            wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y,
+                                       event->xexpose.width, event->xexpose.height);
+	    /*
+            cout << "Expose proc. wxRect: " << rect->x << ", " << rect->y << ", ";
+            cout << rect->width << ", " << rect->height << "\n\n";
+	    */
 
-	/*
-        if (canvasDC)
-	{
-          XDestroyRegion(canvasDC->onpaint_reg);
-          canvasDC->onpaint_reg = NULL;
-	}
+            win->m_updateRects.Append((wxObject*) rect);
 
-	XGCValues gc_val;
-	gc_val.clip_mask = None;
-	XChangeGC(display, gc, GCClipMask, &gc_val);
-	*/
+            if (event -> xexpose.count == 0)
+            {
+                wxPaintEvent event(win->GetId());
+                event.SetEventObject(win);
+                win->GetEventHandler()->ProcessEvent(event);
 
-	break;
-    }
-    default:
-    {
-	cout << "\n\nNew Event ! is = " << event -> type << "\n";
-	break;
+                win->ClearUpdateRects();
+            }
+            break;
+        }
+        default:
+        {
+	        cout << "\n\nNew Event ! is = " << event -> type << "\n";
+	        break;
+        }
     }
-  }
 }
 
 // Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4)
@@ -2024,6 +2364,8 @@ void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallba
 
         wxevent.SetId(canvas->GetId());
         wxevent.SetEventObject(canvas);
+        wxevent.m_x = local_event.xbutton.x;
+        wxevent.m_y = local_event.xbutton.y;
 	canvas->GetEventHandler()->ProcessEvent (wxevent);
 	/*
 	if (eventType == wxEVT_ENTER_WINDOW ||
@@ -2138,16 +2480,19 @@ void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags)
     XtUnmanageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
   XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
 
+  int xx = x; int yy = y;
+  AdjustForParentClientOrigin(xx, yy, sizeFlags);
+
   if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
       XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
-		     XmNx, x, NULL);
+		     XmNx, xx, NULL);
     }
 
   if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
       XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
-		     XmNy, y, NULL);
+		     XmNy, yy, NULL);
     }
 
   if (w > -1)
@@ -2285,8 +2630,553 @@ void wxWindow::CanvasGetSize (int *w, int *h) const
 
 void wxWindow::CanvasGetPosition (int *x, int *y) const
 {
-  Position xx, yy;
-  XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, &xx, XmNy, &yy, NULL);
-  *x = xx;
-  *y = yy;
+    Position xx, yy;
+    XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, &xx, XmNy, &yy, NULL);
+
+    // We may be faking the client origin.
+    // So a window that's really at (0, 30) may appear
+    // (to wxWin apps) to be at (0, 0).
+    if (GetParent())
+    {
+        wxPoint pt(GetParent()->GetClientAreaOrigin());
+        xx -= pt.x;
+        yy -= pt.y;
+    }
+
+    *x = xx;
+    *y = yy;
+}
+
+// Add to hash table, add event handler
+bool wxWindow::AttachWidget (wxWindow* parent, WXWidget mainWidget,
+	      WXWidget formWidget, int x, int y, int width, int height)
+{
+    wxAddWindowToTable((Widget) mainWidget, this);
+    if (CanAddEventHandler())
+    {
+        XtAddEventHandler((Widget) mainWidget,
+          ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
+        False,
+        wxPanelItemEventHandler,
+        (XtPointer) this);
+    }
+
+    if (!formWidget)
+    {
+        XtTranslations ptr;
+        XtOverrideTranslations ((Widget) mainWidget,
+               ptr = XtParseTranslationTable ("<Configure>: resize()"));
+        XtFree ((char *) ptr);
+    }
+
+    // Some widgets have a parent form widget, e.g. wxRadioBox
+    if (formWidget)
+    {
+      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;
+    SetSize (x, y, width, height);
+
+    return TRUE;
+}
+
+// Remove event handler, remove from hash table
+bool wxWindow::DetachWidget(WXWidget widget)
+{
+    if (CanAddEventHandler())
+    {
+      XtRemoveEventHandler((Widget) widget,
+         ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
+         False,
+         wxPanelItemEventHandler,
+         (XtPointer)this);
+    }
+
+    wxDeleteWindowFromTable((Widget) widget);
+    return TRUE;
+}
+
+void wxPanelItemEventHandler (Widget    wid,
+                              XtPointer client_data,
+                              XEvent*   event,
+                              Boolean *continueToDispatch)
+{
+  // Widget can be a label or the actual widget.
+
+  wxWindow *window = (wxWindow *)wxWidgetHashTable->Get((long)wid);
+  if (window)
+  {
+    wxMouseEvent wxevent(0);
+    if (wxTranslateMouseEvent(wxevent, window, wid, event))
+    {
+      window->GetEventHandler()->ProcessEvent(wxevent);
+    }
+  }
+  // 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;
+}
+
+static void wxScrollBarCallback(Widget scrollbar, XtPointer clientData,
+                        XmScaleCallbackStruct *cbs)
+{
+    Widget scrolledWindow = XtParent (scrollbar);
+    wxWindow *win = (wxWindow *) wxWidgetHashTable->Get ((long) scrolledWindow);
+    int orientation = (int) clientData;
+
+    wxEventType eventType = wxEVT_NULL;
+    switch (cbs->reason)
+    {
+        case XmCR_INCREMENT:
+        {
+            eventType = wxEVT_SCROLL_LINEDOWN;
+            break;
+        }
+        case XmCR_DECREMENT:
+        {
+            eventType = wxEVT_SCROLL_LINEUP;
+            break;
+        }
+        case XmCR_DRAG:
+        {
+            eventType = wxEVT_SCROLL_THUMBTRACK;
+            break;
+        }
+        case XmCR_VALUE_CHANGED:
+        {
+            // TODO: Should this be intercepted too, or will it cause
+            // duplicate events?
+            eventType = wxEVT_SCROLL_THUMBTRACK;
+            break;
+        }
+        case XmCR_PAGE_INCREMENT:
+        {
+            eventType = wxEVT_SCROLL_PAGEDOWN;
+            break;
+        }
+        case XmCR_PAGE_DECREMENT:
+        {
+            eventType = wxEVT_SCROLL_PAGEUP;
+            break;
+        }
+        case XmCR_TO_TOP:
+        {
+            eventType = wxEVT_SCROLL_TOP;
+            break;
+        }
+        case XmCR_TO_BOTTOM:
+        {
+            eventType = wxEVT_SCROLL_BOTTOM;
+            break;
+        }
+        default:
+        {
+            // Should never get here
+            wxFAIL_MSG("Unknown scroll event.");
+            break;
+        }
+    }
+
+    wxScrollEvent event(eventType, win->GetId());
+    event.SetEventObject(win);
+    event.SetPosition(cbs->value);
+    event.SetOrientation( (orientation == XmHORIZONTAL) ? wxHORIZONTAL : wxVERTICAL );
+
+    win->GetEventHandler()->ProcessEvent(event);
+}
+
+bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent)
+{
+  switch (xevent->xany.type)
+  {
+    case EnterNotify:
+    case LeaveNotify:
+    case ButtonPress:
+    case ButtonRelease:
+    case MotionNotify:
+      {
+	wxEventType eventType = wxEVT_NULL;
+
+        if (xevent->xany.type == LeaveNotify)
+	{
+          win->m_button1Pressed = FALSE;
+          win->m_button2Pressed = FALSE;
+          win->m_button3Pressed = FALSE;
+          return FALSE;
+	}
+	else if (xevent->xany.type == MotionNotify)
+	  {
+	    eventType = wxEVT_MOTION;
+	  }
+	else if (xevent->xany.type == ButtonPress)
+	  {
+	    if (xevent->xbutton.button == Button1)
+	      {
+		eventType = wxEVT_LEFT_DOWN;
+		win->m_button1Pressed = TRUE;
+	      }
+	    else if (xevent->xbutton.button == Button2)
+	      {
+		eventType = wxEVT_MIDDLE_DOWN;
+		win->m_button2Pressed = TRUE;
+	      }
+	    else if (xevent->xbutton.button == Button3)
+	      {
+		eventType = wxEVT_RIGHT_DOWN;
+		win->m_button3Pressed = TRUE;
+	      }
+	  }
+	else if (xevent->xany.type == ButtonRelease)
+	  {
+	    if (xevent->xbutton.button == Button1)
+	      {
+		eventType = wxEVT_LEFT_UP;
+		win->m_button1Pressed = FALSE;
+	      }
+	    else if (xevent->xbutton.button == Button2)
+	      {
+		eventType = wxEVT_MIDDLE_UP;
+		win->m_button2Pressed = FALSE;
+	      }
+	    else if (xevent->xbutton.button == Button3)
+	      {
+		eventType = wxEVT_RIGHT_UP;
+		win->m_button3Pressed = FALSE;
+	      }
+            else return FALSE;
+	  }
+          else return FALSE;
+
+	wxevent.m_eventHandle = (char *)xevent;
+        wxevent.SetEventType(eventType);
+
+        Position x1, y1;
+        XtVaGetValues(widget, XmNx, &x1, XmNy, &y1, NULL);
+
+        int x2, y2;
+        win->GetPosition(&x2, &y2);
+
+        // The button x/y must be translated to wxWindows
+        // 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 = xevent->xbutton.x + dx;
+	wxevent.m_y = xevent->xbutton.y + 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;
+	wxevent.m_controlDown = xevent->xbutton.state & ControlMask;
+        return TRUE;
+    }
+  }
+  return FALSE;
+}
+
+bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent)
+{
+  switch (xevent->xany.type)
+  {
+    case KeyPress:
+      {
+        char buf[20];
+        
+	KeySym keySym;
+//	XComposeStatus compose;
+//	(void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, &compose);
+	(void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
+	int id = wxCharCodeXToWX (keySym);
+
+	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;
+        else
+          return FALSE;
+	break;
+      }
+    default:
+      break;
+  }
+  return FALSE;
+}
+
+#define YAllocColor XAllocColor
+XColor g_itemColors[5];
+int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
+{
+  int result;
+  static XmColorProc colorProc;
+
+  result = wxNO_COLORS;
+
+  if (back)
+    {
+      g_itemColors[0].red = (((long) back->Red ()) << 8);
+      g_itemColors[0].green = (((long) back->Green ()) << 8);
+      g_itemColors[0].blue = (((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 = (((long) fore->Red ()) << 8);
+      g_itemColors[wxFORE_INDEX].green = (((long) fore->Green ()) << 8);
+      g_itemColors[wxFORE_INDEX].blue = (((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()
+{
+    if (GetMainWidget())
+        DoChangeBackgroundColour(GetMainWidget(), m_backgroundColour);
 }
+
+void wxWindow::ChangeForegroundColour()
+{
+    if (GetMainWidget())
+        DoChangeForegroundColour(GetMainWidget(), m_foregroundColour);
+}
+
+// Change a widget's foreground and background colours.
+
+void wxWindow::DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
+{
+  // When should we specify the foreground, if it's calculated
+  // by wxComputeColours?
+  // Solution: say we start with the default (computed) foreground colour.
+  // If we call SetForegroundColour explicitly for a control or window,
+  // then the foreground is changed.
+  // Therefore SetBackgroundColour computes the foreground colour, and
+  // SetForegroundColour changes the foreground colour. The ordering is
+  // important.
+
+  XtVaSetValues ((Widget) widget,
+		   XmNforeground, foregroundColour.AllocColour(XtDisplay((Widget) widget)),
+		   NULL);
+}
+
+void wxWindow::DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour)
+{
+  wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
+			    (wxColour*) NULL);
+
+  XtVaSetValues ((Widget) widget,
+		   XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
+		   XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
+		   XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
+		   XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
+		   NULL);
+
+  if (changeArmColour)
+    XtVaSetValues ((Widget) widget,
+    		   XmNarmColor, g_itemColors[wxSELE_INDEX].pixel,
+               NULL);
+}
+
+void wxWindow::SetBackgroundColour(const wxColour& col)
+{
+    m_backgroundColour = col;
+    ChangeBackgroundColour();
+}
+
+void wxWindow::SetForegroundColour(const wxColour& col)
+{
+    m_foregroundColour = col;
+    ChangeForegroundColour();
+}
+
+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_windowFont.Ok())
+    {
+        int width, height, width1, height1;
+        GetSize(& width, & height);
+
+        XtVaSetValues (w,
+		   XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(w)),
+		   NULL);
+
+        GetSize(& width1, & height1);
+        if (keepOriginalSize && (width != width1 || height != height1))
+        {
+            SetSize(-1, -1, width, height);
+        }
+    }
+}
+
+void wxWindow::SetFont(const wxFont& font)
+{
+    m_windowFont = font;
+    ChangeFont();
+}
+
+void wxWindow::ClearUpdateRects()
+{
+    wxNode* node = m_updateRects.First();
+    while (node)
+    {
+        wxRect* rect = (wxRect*) node->Data();
+        delete rect;
+        node = node->Next();
+    }
+    m_updateRects.Clear();
+}
+
+bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
+{
+    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->IsKindOf(CLASSINFO(wxFrame)) && !parent->IsKindOf(CLASSINFO(wxDialog)))
+                parent = parent->GetParent();
+
+            if (!parent)
+                return FALSE;
+
+            if (parent->IsKindOf(CLASSINFO(wxFrame)))
+            {
+                // Try for a menu command
+                wxFrame* frame = (wxFrame*) parent;
+                if (frame->GetMenuBar())
+                {
+                    wxMenuItem* item = frame->GetMenuBar()->FindItemForId(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);
+                    }
+                }
+            }
+
+            // 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 (child->IsKindOf(CLASSINFO(wxButton)))
+            {
+                wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId());
+                commandEvent.SetEventObject(child);
+                return child->GetEventHandler()->ProcessEvent(commandEvent);
+            }
+
+            return FALSE;
+        } // matches event
+    }// for
+
+    // We didn't match the key event against an accelerator.
+    return FALSE;
+}
+