Add missing WXK constants for the control keys

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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index d4da1486be5f35fab6f653ee68d8eeac55af3756..01bac1281338259d34c7263af39444202217af0f 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        windows.cpp
+// Name:        src/motif/window.cpp

 // Purpose:     wxWindow
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxWindow
 // Author:      Julian Smart
 // Modified by:


@@ -17,33 +17,51 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "window.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#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/scrolwin.h"
-
-#include "wx/menuitem.h"
-#include "wx/log.h"
+#include "wx/evtloop.h"
+#include "wx/unix/utilsx11.h"

 
 #if  wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 #endif
 
 
 #if  wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 #endif
 

+// DoSetSizeIntr and DoMoveWindowIntr
+// PROBLEM:
+// under Motif composite controls (such as wxCalendarCtrl or generic wxSpinCtrl
+// did 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>


@@ -51,22 +69,23 @@
 #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 "wx/motif/private.h"

+#include "wx/motif/dcclient.h"

 
 #include <string.h>
 
 
 #include <string.h>
 

-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-static const int SCROLL_MARGIN = 4;
-

 // ----------------------------------------------------------------------------
 // global variables for this module
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // global variables for this module
 // ----------------------------------------------------------------------------
 

-static wxHashTable *gs_wxWidgetHashTable;
+extern wxHashTable *wxWidgetHashTable;
+static wxWindow* g_captureWindow = NULL;
+

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


@@ -77,7 +96,7 @@ static void wxCanvasInputEvent(Widget drawingArea, XtPointer data, XmDrawingArea
 static void wxCanvasMotionEvent(Widget, XButtonEvent * event);
 static void wxCanvasEnterLeave(Widget drawingArea, XtPointer clientData, XCrossingEvent * event);
 static void wxScrollBarCallback(Widget widget, XtPointer clientData,
 static void wxCanvasMotionEvent(Widget, XButtonEvent * event);
 static void wxCanvasEnterLeave(Widget drawingArea, XtPointer clientData, XCrossingEvent * event);
 static void wxScrollBarCallback(Widget widget, XtPointer clientData,

-                                XmScaleCallbackStruct *cbs);
+                                XmScrollBarCallbackStruct *cbs);

 static void wxPanelItemEventHandler(Widget    wid,
                                     XtPointer client_data,
                                     XEvent*   event,
 static void wxPanelItemEventHandler(Widget    wid,
                                     XtPointer client_data,
                                     XEvent*   event,


@@ -113,14 +132,9 @@ static int str16len(const char *s)
 // event tables
 // ----------------------------------------------------------------------------
 
 // event tables
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
-
-    BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
+    BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)

         EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
         EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)

-        EVT_IDLE(wxWindow::OnIdle)

     END_EVENT_TABLE()
     END_EVENT_TABLE()

-#endif // USE_SHARED_LIBRARY

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -140,18 +154,33 @@ void wxWindow::UnmanageAndDestroy(WXWidget widget)
     }
 }
 
     }
 }
 

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

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

-        return FALSE;
+        return false;

 
 

-    if ( map )
-        XtMapWidget(w);
+    //   Rationale: a lot of common operations (including but not
+    // limited to moving, resizing and appending items to a listbox)
+    // unmamange the widget, do their work, then manage it again.
+    // This means that, for example adding an item to a listbox will show it,
+    // or that most controls are shown every time they are moved or resized!
+    XtSetMappedWhenManaged( w, domap );
+
+    // if the widget is not unmanaged, it still intercepts
+    // mouse events, even if it is not mapped (and hence invisible)
+    if ( domap )
+    {
+        XtManageChild(w);
+        // XtMapWidget(w);
+    }

     else
     else

-        XtUnmapWidget(w);
+    {
+        XtUnmanageChild(w);
+        // XtUnmapWidget(w);
+    }

 
 

-    return TRUE;
+    return true;

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


@@ -160,20 +189,13 @@ bool wxWindow::MapOrUnmap(WXWidget widget, bool map)
 
 void wxWindow::Init()
 {
 
 void wxWindow::Init()
 {

-    // generic initializations first
-    InitBase();
-

     // Motif-specific
     // Motif-specific

-    m_needsRefresh = TRUE;
+    m_needsRefresh = true;

     m_mainWidget = (WXWidget) 0;
 
     m_mainWidget = (WXWidget) 0;
 

-    m_button1Pressed =
-    m_button2Pressed =
-    m_button3Pressed = FALSE;
-
-    m_winCaptured = FALSE;
+    m_winCaptured = false;

 
 

-    m_isShown = TRUE;
+    m_isShown = true;

 
     m_hScrollBar =
     m_vScrollBar =
 
     m_hScrollBar =
     m_vScrollBar =


@@ -181,9 +203,6 @@ void wxWindow::Init()
     m_scrolledWindow =
     m_drawingArea = (WXWidget) 0;
 
     m_scrolledWindow =
     m_drawingArea = (WXWidget) 0;
 

-    m_hScroll =
-    m_vScroll = FALSE;
-

     m_scrollPosX =
     m_scrollPosY = 0;
 
     m_scrollPosX =
     m_scrollPosY = 0;
 


@@ -196,7 +215,6 @@ void wxWindow::Init()
 
     m_lastTS = 0;
     m_lastButton = 0;
 
     m_lastTS = 0;
     m_lastButton = 0;

-    m_canAddEventHandler = FALSE;

 }
 
 // real construction (Init() must have been called before!)
 }
 
 // real construction (Init() must have been called before!)


@@ -206,14 +224,17 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
                       long style,
                       const wxString& name)
 {
                       long style,
                       const wxString& name)
 {

-    wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" );
+    // Get default border
+    wxBorder border = GetBorder(style);
+    style &= ~wxBORDER_MASK;
+    style |= border;

 
 

-    CreateBase(parent, id, pos, size, style, name);
+    wxCHECK_MSG( parent, false, "can't create wxWindow without parent" );

 
 

-    parent->AddChild(this);
+    CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);

 
 

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
-    m_foregroundColour = *wxBLACK;
+    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).
 
     //// TODO: we should probably optimize by only creating a
     //// a drawing area if we have one or more scrollbars (wxVSCROLL/wxHSCROLL).


@@ -221,7 +242,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     //// drawing area, since otherwise the translations are different.
 
     // New translations for getting mouse motion feedback
     //// drawing area, since otherwise the translations are different.
 
     // New translations for getting mouse motion feedback

-    static const String translations =
+    static const String translations = wxMOTIF_STR(

 "<Btn1Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
 <Btn2Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
 <Btn3Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
 "<Btn1Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
 <Btn2Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
 <Btn3Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\


@@ -235,24 +256,15 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 <Motion>: wxCanvasMotionEvent() DrawingAreaInput()\n\
 <EnterWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
 <LeaveWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
 <Motion>: wxCanvasMotionEvent() DrawingAreaInput()\n\
 <EnterWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
 <LeaveWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\

-<Key>: DrawingAreaInput()";
+<Key>: DrawingAreaInput()");

 
     XtActionsRec actions[1];
 
     XtActionsRec actions[1];

-    actions[0].string = "wxCanvasMotionEvent";
+    actions[0].string = wxMOTIF_STR("wxCanvasMotionEvent");

     actions[0].proc = (XtActionProc) wxCanvasMotionEvent;
     XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
     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_borderWidget = wxCreateBorderWidget( (WXWidget)parentWidget, style );

 
     m_scrolledWindow = (WXWidget)XtVaCreateManagedWidget
                                  (
 
     m_scrolledWindow = (WXWidget)XtVaCreateManagedWidget
                                  (


@@ -306,12 +318,6 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     XtAddCallback ((Widget) m_drawingArea, XmNexposeCallback, (XtCallbackProc) wxCanvasRepaintProc, (XtPointer) this);
     XtAddCallback ((Widget) m_drawingArea, XmNinputCallback, (XtCallbackProc) wxCanvasInputEvent, (XtPointer) this);
 
     XtAddCallback ((Widget) m_drawingArea, XmNexposeCallback, (XtCallbackProc) wxCanvasRepaintProc, (XtPointer) this);
     XtAddCallback ((Widget) m_drawingArea, XmNinputCallback, (XtCallbackProc) wxCanvasInputEvent, (XtPointer) this);
 

-    // TODO?
-#if 0
-    display = XtDisplay (scrolledWindow);
-    xwindow = XtWindow (drawingArea);
-#endif // 0
-

     XtAddEventHandler(
                       (Widget)m_drawingArea,
                        PointerMotionHintMask | EnterWindowMask |
     XtAddEventHandler(
                       (Widget)m_drawingArea,
                        PointerMotionHintMask | EnterWindowMask |


@@ -321,36 +327,28 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
                        (XtPointer) this
                      );
 
                        (XtPointer) this
                      );
 

-    // Scrolled widget needs to have its colour changed or we get a little blue
-    // square where the scrollbars abutt
-    wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
-    DoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
-    DoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
-

     XmScrolledWindowSetAreas(
                              (Widget)m_scrolledWindow,
                              (Widget) 0, (Widget) 0,
                              (Widget) m_drawingArea);
 
     XmScrolledWindowSetAreas(
                              (Widget)m_scrolledWindow,
                              (Widget) 0, (Widget) 0,
                              (Widget) m_drawingArea);
 

-#if 0
-    if (m_hScrollBar)
-        XtRealizeWidget ((Widget) m_hScrollBar);
-    if (m_vScrollBar)
-        XtRealizeWidget ((Widget) m_vScrollBar);
-#endif // 0
+    PostCreation();

 
     // Without this, the cursor may not be restored properly (e.g. in splitter
     // sample).
     SetCursor(*wxSTANDARD_CURSOR);
 
     // Without this, the cursor may not be restored properly (e.g. in splitter
     // sample).
     SetCursor(*wxSTANDARD_CURSOR);

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

 }
 
 // Destructor
 wxWindow::~wxWindow()
 {
 }
 
 // Destructor
 wxWindow::~wxWindow()
 {

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

     // Motif-specific actions first
     WXWidget wMain = GetMainWidget();
     if ( wMain )
     // Motif-specific actions first
     WXWidget wMain = GetMainWidget();
     if ( wMain )


@@ -359,8 +357,6 @@ wxWindow::~wxWindow()
         DetachWidget(wMain);
     }
 
         DetachWidget(wMain);
     }
 

-    ClearUpdateRects();
-

     // If m_drawingArea, we're a fully-fledged window with drawing area,
     // scrollbars etc. (what wxCanvas used to be)
     if ( m_drawingArea )
     // If m_drawingArea, we're a fully-fledged window with drawing area,
     // scrollbars etc. (what wxCanvas used to be)
     if ( m_drawingArea )


@@ -377,18 +373,31 @@ wxWindow::~wxWindow()
         if (w)
         {
             XtDestroyWidget(w);
         if (w)
         {
             XtDestroyWidget(w);

+            m_drawingArea = (WXWidget) 0;

         }
 
         }
 

-        m_mainWidget = (WXWidget) 0;
-

         // Only if we're _really_ a canvas (not a dialog box/panel)
         if (m_scrolledWindow)
         {
             wxDeleteWindowFromTable((Widget) m_scrolledWindow);
         }
 
         // Only if we're _really_ a canvas (not a dialog box/panel)
         if (m_scrolledWindow)
         {
             wxDeleteWindowFromTable((Widget) m_scrolledWindow);
         }
 

-        UnmanageAndDestroy(m_hScrollBar);
-        UnmanageAndDestroy(m_vScrollBar);
+        if (m_hScrollBar)
+        {
+            wxDeleteWindowFromTable((Widget) m_hScrollBar);
+            XtUnmanageChild((Widget) m_hScrollBar);
+        }
+        if (m_vScrollBar)
+        {
+            wxDeleteWindowFromTable((Widget) m_vScrollBar);
+            XtUnmanageChild((Widget) m_vScrollBar);
+        }
+
+        if (m_hScrollBar)
+            XtDestroyWidget((Widget) m_hScrollBar);
+        if (m_vScrollBar)
+            XtDestroyWidget((Widget) m_vScrollBar);
+

         UnmanageAndDestroy(m_scrolledWindow);
 
         if (m_borderWidget)
         UnmanageAndDestroy(m_scrolledWindow);
 
         if (m_borderWidget)


@@ -397,6 +406,9 @@ wxWindow::~wxWindow()
             m_borderWidget = (WXWidget) 0;
         }
     }
             m_borderWidget = (WXWidget) 0;
         }
     }

+    else // Why wasn't this here before? JACS 8/3/2000
+        DestroyChildren();
+

 
     // Destroy the window
     if (GetMainWidget())
 
     // Destroy the window
     if (GetMainWidget())


@@ -406,6 +418,12 @@ wxWindow::~wxWindow()
         // or dialog is destroyed, but before that you may get some memory
         // leaks and potential layout problems if you delete and then add
         // child windows.
         // 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);
     }
         XtDestroyWidget((Widget) GetMainWidget());
         SetMainWidget((WXWidget) NULL);
     }


@@ -415,120 +433,107 @@ wxWindow::~wxWindow()
 // scrollbar management
 // ----------------------------------------------------------------------------
 
 // scrollbar management
 // ----------------------------------------------------------------------------
 

+WXWidget wxWindow::DoCreateScrollBar(WXWidget parent,
+                                     wxOrientation orientation,
+                                     void (*callback)())
+{
+    int orient = ( orientation & wxHORIZONTAL ) ? XmHORIZONTAL : XmVERTICAL;
+    Widget sb =
+        XtVaCreateManagedWidget( "scrollBarWidget",
+                                 xmScrollBarWidgetClass, (Widget)parent,
+                                 XmNorientation, orient,
+                                 XmNincrement, 1,
+                                 XmNvalue, 0,
+                                 NULL );
+
+    XtPointer o = (XtPointer)orientation;
+    XtCallbackProc cb = (XtCallbackProc)callback;
+
+    XtAddCallback( sb, XmNvalueChangedCallback, cb, o );
+    XtAddCallback( sb, XmNdragCallback, cb, o );
+    XtAddCallback( sb, XmNincrementCallback, cb, o );
+    XtAddCallback( sb, XmNdecrementCallback, cb, o );
+    XtAddCallback( sb, XmNpageIncrementCallback, cb, o );
+    XtAddCallback( sb, XmNpageDecrementCallback, cb, o );
+    XtAddCallback( sb, XmNtoTopCallback, cb, o );
+    XtAddCallback( sb, XmNtoBottomCallback, cb, o );
+
+    return (WXWidget)sb;
+}
+

 // Helper function
 // Helper function

-void wxWindow::CreateScrollbar(int orientation)
+void wxWindow::CreateScrollbar(wxOrientation orientation)

 {
     wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
 
 {
     wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
 

-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
+    XtVaSetValues( (Widget) m_scrolledWindow,
+                   XmNresizePolicy, XmRESIZE_NONE,
+                   NULL );

 
 

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

     // Add scrollbars if required
     if (orientation == wxHORIZONTAL)
     {
     // Add scrollbars if required
     if (orientation == wxHORIZONTAL)
     {

-        Widget hScrollBar = XtVaCreateManagedWidget ("hsb",
-            xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
-            XmNorientation, XmHORIZONTAL,
-            NULL);
-        //      XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-
-        XtVaSetValues (hScrollBar,
-            XmNincrement, 1,
-            XmNvalue, 0,
-            NULL);
-
-        m_hScrollBar = (WXWidget) hScrollBar;
+        m_hScrollBar = DoCreateScrollBar( m_scrolledWindow, wxHORIZONTAL,
+                                          (void (*)())wxScrollBarCallback );

 
 

-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
-        DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
+        wxDoChangeBackgroundColour(m_hScrollBar, backgroundColour, true);

 
 

-        XtRealizeWidget(hScrollBar);
+        XtRealizeWidget( (Widget)m_hScrollBar );

 
         XtVaSetValues((Widget) m_scrolledWindow,
             XmNhorizontalScrollBar, (Widget) m_hScrollBar,
             NULL);
 
 
         XtVaSetValues((Widget) m_scrolledWindow,
             XmNhorizontalScrollBar, (Widget) m_hScrollBar,
             NULL);
 

-        m_hScroll = TRUE;
+        wxAddWindowToTable( (Widget)m_hScrollBar, this );

     }
     }

-
-    if (orientation == wxVERTICAL)
+    else if (orientation == wxVERTICAL)

     {
     {

-        Widget vScrollBar = XtVaCreateManagedWidget ("vsb",
-            xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
-            XmNorientation, XmVERTICAL,
-            NULL);
-        //      XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-
-        XtVaSetValues (vScrollBar,
-            XmNincrement, 1,
-            XmNvalue, 0,
-            NULL);
+        m_vScrollBar = DoCreateScrollBar( m_scrolledWindow, wxVERTICAL,
+                                          (void (*)())wxScrollBarCallback );

 
 

-        m_vScrollBar = (WXWidget) vScrollBar;
-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
-        DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
+        wxDoChangeBackgroundColour(m_vScrollBar, backgroundColour, true);

 
 

-        XtRealizeWidget(vScrollBar);
+        XtRealizeWidget((Widget)m_vScrollBar);

 
         XtVaSetValues((Widget) m_scrolledWindow,
             XmNverticalScrollBar, (Widget) m_vScrollBar,
             NULL);
 
 
         XtVaSetValues((Widget) m_scrolledWindow,
             XmNverticalScrollBar, (Widget) m_vScrollBar,
             NULL);
 

-        m_vScroll = TRUE;
+        wxAddWindowToTable( (Widget)m_vScrollBar, this );

     }
 
     }
 

-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
+    XtVaSetValues( (Widget) m_scrolledWindow,
+                   XmNresizePolicy, XmRESIZE_ANY,
+                   NULL );

 }
 
 }
 

-void wxWindow::DestroyScrollbar(int orientation)
+void wxWindow::DestroyScrollbar(wxOrientation orientation)

 {
     wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
 
 {
     wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
 

-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
-    // Add scrollbars if required
-    if (orientation == wxHORIZONTAL)
-    {
-        if (m_hScrollBar)
-        {
-            XtDestroyWidget((Widget) m_hScrollBar);
-        }
-        m_hScrollBar = (WXWidget) 0;
-        m_hScroll = FALSE;
-
-        XtVaSetValues((Widget) m_scrolledWindow,
-            XmNhorizontalScrollBar, (Widget) 0,
-            NULL);
-
-    }
+    XtVaSetValues((Widget) m_scrolledWindow,
+                  XmNresizePolicy, XmRESIZE_NONE,
+                  NULL);
+    String stringSB = orientation == wxHORIZONTAL ?
+        XmNhorizontalScrollBar : XmNverticalScrollBar;
+    WXWidget* widgetSB = orientation == wxHORIZONTAL ?
+        &m_hScrollBar : &m_vScrollBar;

 
 

-    if (orientation == wxVERTICAL)
+    if( *widgetSB )

     {
     {

-        if (m_vScrollBar)
-        {
-            XtDestroyWidget((Widget) m_vScrollBar);
-        }
-        m_vScrollBar = (WXWidget) 0;
-        m_vScroll = TRUE;
+        wxDeleteWindowFromTable( (Widget)*widgetSB );
+        XtDestroyWidget( (Widget)*widgetSB );
+        *widgetSB = (WXWidget)NULL;
+    }

 
 

-        XtVaSetValues((Widget) m_scrolledWindow,
-            XmNverticalScrollBar, (Widget) 0,
-            NULL);
+    XtVaSetValues( (Widget)m_scrolledWindow,
+                   stringSB, (Widget) 0,
+                   NULL );

 
 

-    }
-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
+    XtVaSetValues((Widget) m_scrolledWindow,
+                  XmNresizePolicy, XmRESIZE_ANY,
+                  NULL);

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


@@ -543,7 +548,7 @@ void wxWindow::SetFocus()
 }
 
 // Get the window with the focus
 }
 
 // Get the window with the focus

-wxWindow *wxWindow::FindFocus()
+wxWindow *wxWindowBase::DoFindFocus()

 {
     // TODO Problems:
     // (1) Can there be multiple focussed widgets in an application?
 {
     // TODO Problems:
     // (1) Can there be multiple focussed widgets in an application?


@@ -551,8 +556,8 @@ wxWindow *wxWindow::FindFocus()
     // currently active.
     // (2) The widget with the focus may not be in the widget table
     // depending on which widgets I put in the table
     // 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::Node *node = wxTopLevelWindows.GetFirst();
+    wxWindow *winFocus = NULL;
+    for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();

           node;
           node = node->GetNext() )
     {
           node;
           node = node->GetNext() )
     {


@@ -571,30 +576,30 @@ wxWindow *wxWindow::FindFocus()
     return winFocus;
 }
 
     return winFocus;
 }
 

-void wxWindow::Enable(bool enable)
+bool wxWindow::Enable(bool enable)

 {
     if ( !wxWindowBase::Enable(enable) )
 {
     if ( !wxWindowBase::Enable(enable) )

-        return FALSE;
+        return false;

 
 

-    Widget wMain = GetMainWidget();
+    Widget wMain = (Widget)GetMainWidget();

     if ( wMain )
     {
         XtSetSensitive(wMain, enable);
         XmUpdateDisplay(wMain);
     }
 
     if ( wMain )
     {
         XtSetSensitive(wMain, enable);
         XmUpdateDisplay(wMain);
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindow::Show(bool show)
 {
     if ( !wxWindowBase::Show(show) )
 }
 
 bool wxWindow::Show(bool show)
 {
     if ( !wxWindowBase::Show(show) )

-        return FALSE;
+        return false;

 
     if (m_borderWidget || m_scrolledWindow)
     {
 
     if (m_borderWidget || m_scrolledWindow)
     {

-        MapOrUnmap(m_drawingArea, show);

         MapOrUnmap(m_borderWidget ? m_borderWidget : m_scrolledWindow, show);
         MapOrUnmap(m_borderWidget ? m_borderWidget : m_scrolledWindow, show);

+        // MapOrUnmap(m_drawingArea, show);

     }
     else
     {
     }
     else
     {


@@ -602,16 +607,7 @@ bool wxWindow::Show(bool show)
             MapOrUnmap(GetMainWidget(), show);
     }
 
             MapOrUnmap(GetMainWidget(), show);
     }
 

-#if 0
-    Window xwin = (Window) GetXWindow();
-    Display *xdisp = (Display*) GetXDisplay();
-    if (show)
-        XMapWindow(xdisp, xwin);
-    else
-        XUnmapWindow(xdisp, xwin);
-#endif
-
-    return TRUE;
+    return true;

 }
 
 // Raise the window to the top of the Z order
 }
 
 // Raise the window to the top of the Z order


@@ -630,38 +626,44 @@ void wxWindow::Lower()
     XLowerWindow(XtDisplay(wTop), window);
 }
 
     XLowerWindow(XtDisplay(wTop), window);
 }
 

-void wxWindow::SetTitle( const wxString& title)
+void wxWindow::SetLabel(const wxString& label)

 {
 {

-    SetWindowText(GetHwnd(), title.c_str());
+    XtVaSetValues((Widget)GetMainWidget(), XmNtitle,
+                  (const char*)label.mb_str(), NULL);

 }
 
 }
 

-wxString wxWindow::GetTitle() const
+wxString wxWindow::GetLabel() const

 {
 {

-    return wxGetWindowText(GetHWND());
+    char *label = NULL;
+    XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &label, NULL);
+
+    return wxString(label);

 }
 
 }
 

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

 {
 {

+    g_captureWindow = this;

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

-    Widget wMain = GetMainWidget();
+    Widget wMain = (Widget)GetMainWidget();

     if ( wMain )
     if ( wMain )

-        XtAddGrab(wMain, TRUE, FALSE);
+        XtAddGrab(wMain, True, False);

 
 

-    m_winCaptured = TRUE;
+    m_winCaptured = true;

 }
 
 }
 

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

 {
 {

+    g_captureWindow = NULL;

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

-    Widget wMain = GetMainWidget();
+    Widget wMain = (Widget)GetMainWidget();

     if ( wMain )
         XtRemoveGrab(wMain);
 
     if ( wMain )
         XtRemoveGrab(wMain);
 

-    m_winCaptured = FALSE;
+    m_winCaptured = false;

 }
 
 bool wxWindow::SetFont(const wxFont& font)
 }
 
 bool wxWindow::SetFont(const wxFont& font)


@@ -669,12 +671,12 @@ bool wxWindow::SetFont(const wxFont& font)
     if ( !wxWindowBase::SetFont(font) )
     {
         // nothing to do
     if ( !wxWindowBase::SetFont(font) )
     {
         // nothing to do

-        return FALSE;
+        return false;

     }
 
     ChangeFont();
 
     }
 
     ChangeFont();
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindow::SetCursor(const wxCursor& cursor)
 }
 
 bool wxWindow::SetCursor(const wxCursor& cursor)


@@ -682,18 +684,25 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
     if ( !wxWindowBase::SetCursor(cursor) )
     {
         // no change
     if ( !wxWindowBase::SetCursor(cursor) )
     {
         // no change

-        return FALSE;
+        return false;

     }
 
     }
 

-    wxASSERT_MSG( m_cursor.Ok(),
-                  _T("cursor must be valid after call to the base version"));
+    //    wxASSERT_MSG( m_cursor.IsOk(),
+    //                  wxT("cursor must be valid after call to the base version"));
+    const wxCursor* cursor2 = NULL;
+    if (m_cursor.IsOk())
+        cursor2 = & m_cursor;
+    else
+        cursor2 = wxSTANDARD_CURSOR;

 
     WXDisplay *dpy = GetXDisplay();
 
     WXDisplay *dpy = GetXDisplay();

-    WXCursor x_cursor = m_cursor.GetXCursor(dpy);
+    WXCursor x_cursor = cursor2->GetXCursor(dpy);

 
     Widget w = (Widget) GetMainWidget();
     Window win = XtWindow(w);
     XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);
 
     Widget w = (Widget) GetMainWidget();
     Window win = XtWindow(w);
     XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);

+
+    return true;

 }
 
 // Coordinates relative to the window
 }
 
 // Coordinates relative to the window


@@ -732,34 +741,38 @@ int wxWindow::GetScrollPos(int orient) const
 // can scroll.
 int wxWindow::GetScrollRange(int orient) const
 {
 // can scroll.
 int wxWindow::GetScrollRange(int orient) const
 {

-    Widget scrollBar = (Widget)GetScrollbar(orient);
-    wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
+    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
+    // CE scintilla windows don't always have these scrollbars
+    // and it tends to pile up a whole bunch of asserts
+    //wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );

 
 

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

     return range;
 }
 
 int wxWindow::GetScrollThumb(int orient) const
 {
     return range;
 }
 
 int wxWindow::GetScrollThumb(int orient) const
 {

-    Widget scrollBar = (Widget)GetScrollbar(orient);
-    wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
+    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
+    //wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );

 
 

-    int thumb;
-    XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL);
+    int thumb = 0;
+    if (scrollBar)
+        XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL);

     return thumb;
 }
 
 void wxWindow::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
 {
     return thumb;
 }
 
 void wxWindow::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
 {

-    Widget scrollBar = (Widget)GetScrollbar(orient);
+    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);

 
     if ( scrollBar )
     {
         XtVaSetValues (scrollBar, XmNvalue, pos, NULL);
     }
 
 
     if ( scrollBar )
     {
         XtVaSetValues (scrollBar, XmNvalue, pos, NULL);
     }
 

-    SetInternalScrollPos(orient, pos);
+    SetInternalScrollPos((wxOrientation)orient, pos);

 }
 
 // New function that will replace some of the above.
 }
 
 // New function that will replace some of the above.


@@ -778,7 +791,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
         thumbVisible = range;
 
     // Save the old state to see if it changed
         thumbVisible = range;
 
     // Save the old state to see if it changed

-    WXWidget oldScrollBar = GetScrollbar(orient);
+    WXWidget oldScrollBar = GetScrollbar((wxOrientation)orient);

 
     if (orient == wxHORIZONTAL)
     {
 
     if (orient == wxHORIZONTAL)
     {


@@ -806,7 +819,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
                 CreateScrollbar(wxVERTICAL);
         }
     }
                 CreateScrollbar(wxVERTICAL);
         }
     }

-    WXWidget newScrollBar =  GetScrollbar(orient);
+    WXWidget newScrollBar =  GetScrollbar((wxOrientation)orient);

 
     if (oldScrollBar != newScrollBar)
     {
 
     if (oldScrollBar != newScrollBar)
     {


@@ -827,14 +840,14 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
         NULL);
     }
 
         NULL);
     }
 

-    SetInternalScrollPos(orient, pos);
+    SetInternalScrollPos((wxOrientation)orient, pos);

 
     int newW, newH;
     GetSize(& newW, & newH);
 
     // Adjusting scrollbars can resize the canvas accidentally
     if (newW != oldW || newH != oldH)
 
     int newW, newH;
     GetSize(& newW, & newH);
 
     // Adjusting scrollbars can resize the canvas accidentally
     if (newW != oldW || newH != oldH)

-        SetSize(-1, -1, oldW, oldH);
+        SetSize(wxDefaultCoord, wxDefaultCoord, oldW, oldH);

 }
 
 // Does a physical scroll
 }
 
 // Does a physical scroll


@@ -861,6 +874,9 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
     int y2 = (dy >= 0) ? y + dy : y;
 
     wxClientDC dc(this);
     int y2 = (dy >= 0) ? y + dy : y;
 
     wxClientDC dc(this);

+    wxClientDCImpl * const
+        dcimpl = static_cast<wxClientDCImpl *>(dc.GetImpl());
+    GC const gc = (GC) dcimpl->GetGC();

 
     dc.SetLogicalFunction (wxCOPY);
 
 
     dc.SetLogicalFunction (wxCOPY);
 


@@ -868,13 +884,24 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
     Window window = XtWindow(widget);
     Display* display = XtDisplay(widget);
 
     Window window = XtWindow(widget);
     Display* display = XtDisplay(widget);
 

-    XCopyArea(display, window, window, (GC) dc.GetGC(),
-              x1, y1, w1, h1, x2, y2);
+    XCopyArea(display, window, window, gc, x1, y1, w1, h1, x2, y2);

 
 

-    dc.SetAutoSetting(TRUE);
+    dcimpl->SetAutoSetting(true);

     wxBrush brush(GetBackgroundColour(), wxSOLID);
     dc.SetBrush(brush); // FIXME: needed?
 
     wxBrush brush(GetBackgroundColour(), wxSOLID);
     dc.SetBrush(brush); // FIXME: needed?
 

+    wxWindowList::compatibility_iterator cnode = m_children.GetFirst();
+    while (cnode)
+    {
+        wxWindow *child = cnode->GetData();
+        int sx = 0;
+        int sy = 0;
+        child->GetSize( &sx, &sy );
+        wxPoint pos( child->GetPosition() );
+        child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );
+        cnode = cnode->GetNext();
+    }
+

     // We'll add rectangles to the list of update rectangles according to which
     // bits we've exposed.
     wxList updateRects;
     // We'll add rectangles to the list of update rectangles according to which
     // bits we've exposed.
     wxList updateRects;


@@ -887,8 +914,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
         rect->width = dx;
         rect->height = h;
 
         rect->width = dx;
         rect->height = h;
 

-        XFillRectangle(display, window,
-            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
+        XFillRectangle(display, window, gc, rect->x, rect->y, rect->width, rect->height);

 
         rect->x = rect->x;
         rect->y = rect->y;
 
         rect->x = rect->x;
         rect->y = rect->y;


@@ -906,9 +932,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
         rect->width = -dx;
         rect->height = h;
 
         rect->width = -dx;
         rect->height = h;
 

-        XFillRectangle(display, window,
-            (GC) dc.GetGC(), rect->x, rect->y, rect->width,
-            rect->height);
+        XFillRectangle(display, window, gc, rect->x, rect->y, rect->width, rect->height);

 
         rect->x = rect->x;
         rect->y = rect->y;
 
         rect->x = rect->x;
         rect->y = rect->y;


@@ -926,8 +950,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
         rect->width = w;
         rect->height = dy;
 
         rect->width = w;
         rect->height = dy;
 

-        XFillRectangle(display, window,
-            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
+        XFillRectangle(display, window, gc, rect->x, rect->y, rect->width, rect->height);

 
         rect->x = rect->x;
         rect->y = rect->y;
 
         rect->x = rect->x;
         rect->y = rect->y;


@@ -945,8 +968,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
         rect->width = w;
         rect->height = -dy;
 
         rect->width = w;
         rect->height = -dy;
 

-        XFillRectangle(display, window,
-            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
+        XFillRectangle(display, window, gc, rect->x, rect->y, rect->width, rect->height);

 
         rect->x = rect->x;
         rect->y = rect->y;
 
         rect->x = rect->x;
         rect->y = rect->y;


@@ -959,10 +981,10 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 
     // Now send expose events
 
 
     // Now send expose events
 

-    wxNode* node = updateRects.First();
+    wxList::compatibility_iterator  node = updateRects.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxRect* rect = (wxRect*) node->Data();
+        wxRect* rect = (wxRect*) node->GetData();

         XExposeEvent event;
 
         event.type = Expose;
         XExposeEvent event;
 
         event.type = Expose;


@@ -979,17 +1001,17 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 
         XSendEvent(display, window, False, ExposureMask, (XEvent *)&event);
 
 
         XSendEvent(display, window, False, ExposureMask, (XEvent *)&event);
 

-        node = node->Next();
+        node = node->GetNext();

 
     }
 
     // Delete the update rects
 
     }
 
     // Delete the update rects

-    node = updateRects.First();
+    node = updateRects.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxRect* rect = (wxRect*) node->Data();
+        wxRect* rect = (wxRect*) node->GetData();

         delete rect;
         delete rect;

-        node = node->Next();
+        node = node->GetNext();

     }
 
     XmUpdateDisplay((Widget) GetMainWidget());
     }
 
     XmUpdateDisplay((Widget) GetMainWidget());


@@ -1027,38 +1049,135 @@ void wxWindow::DoSetToolTip(wxToolTip * WXUNUSED(tooltip))
 
 #endif // wxUSE_TOOLTIPS
 
 
 #endif // wxUSE_TOOLTIPS
 

+// ----------------------------------------------------------------------------
+// popup menus
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS
+
+bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
+{
+    if ( x == wxDefaultCoord && y == wxDefaultCoord )
+    {
+        wxPoint mouse = ScreenToClient(wxGetMousePosition());
+        x = mouse.x; y = mouse.y;
+    }
+
+    Widget widget = (Widget) GetMainWidget();
+
+    /* The menuId field seems to be usused, so we'll use it to
+    indicate whether a menu is popped up or not:
+    0: Not currently created as a popup
+    -1: Created as a popup, but not active
+    1: Active popup.
+    */
+
+    if (menu->GetParent() && (menu->GetId() != -1))
+        return false;
+
+    if (menu->GetMainWidget())
+    {
+        menu->DestroyMenu(true);
+    }
+
+    menu->SetId(1); /* Mark as popped-up */
+    menu->CreateMenu(NULL, widget, menu, 0);
+
+    menu->UpdateUI();
+
+    //  menu->SetParent(parent);
+    //  parent->children->Append(menu);  // Store menu for later deletion
+
+    Widget menuWidget = (Widget) menu->GetMainWidget();
+
+    int rootX = 0;
+    int rootY = 0;
+
+    int deviceX = x;
+    int deviceY = y;
+    /*
+    if (this->IsKindOf(CLASSINFO(wxCanvas)))
+    {
+    wxCanvas *canvas = (wxCanvas *) this;
+    deviceX = canvas->GetDC ()->LogicalToDeviceX (x);
+    deviceY = canvas->GetDC ()->LogicalToDeviceY (y);
+    }
+    */
+
+    Display *display = XtDisplay (widget);
+    Window rootWindow = RootWindowOfScreen (XtScreen((Widget)widget));
+    Window thisWindow = XtWindow (widget);
+    Window childWindow;
+    XTranslateCoordinates (display, thisWindow, rootWindow, (int) deviceX, (int) deviceY,
+        &rootX, &rootY, &childWindow);
+
+    XButtonPressedEvent event;
+    event.type = ButtonPress;
+    event.button = 1;
+
+    event.x = deviceX;
+    event.y = deviceY;
+
+    event.x_root = rootX;
+    event.y_root = rootY;
+
+    XmMenuPosition (menuWidget, &event);
+    XtManageChild (menuWidget);
+
+    // The ID of a pop-up menu is 1 when active, and is set to 0 by the
+    // idle-time destroy routine.
+    // Waiting until this ID changes causes this function to block until
+    // the menu has been dismissed and the widgets cleaned up.
+    // In other words, once this routine returns, it is safe to delete
+    // the menu object.
+    // Ian Brown <ian.brown@printsoft.de>
+
+    wxEventLoop evtLoop;
+
+    while (menu->GetId() == 1)
+    {
+        wxDoEventLoopIteration( evtLoop );
+    }
+
+    return true;
+}
+
+#endif
+

 // ---------------------------------------------------------------------------
 // moving and resizing
 // ---------------------------------------------------------------------------
 
 bool wxWindow::PreResize()
 {
 // ---------------------------------------------------------------------------
 // moving and resizing
 // ---------------------------------------------------------------------------
 
 bool wxWindow::PreResize()
 {

-    return TRUE;
+    return true;

 }
 
 // Get total size
 }
 
 // Get total size

-void wxWindow::GetSize(int *x, int *y) const
+void wxWindow::DoGetSize(int *x, int *y) const

 {
 {

-    if (m_drawingArea)
-    {
-        CanvasGetSize(x, y);
-        return;
-    }
-
-    Widget widget = (Widget) GetTopWidget();
+    Widget widget = (Widget)( !m_drawingArea ? GetTopWidget() :
+                              ( m_borderWidget ? m_borderWidget :
+                                m_scrolledWindow ? m_scrolledWindow :
+                                m_drawingArea ) );

     Dimension xx, yy;
     Dimension xx, yy;

-    XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
-    *x = xx; *y = yy;
+
+    if (widget)
+        XtVaGetValues( widget,
+                       XmNwidth, &xx,
+                       XmNheight, &yy,
+                       NULL );
+    if(x) *x = widget ? xx : -1;
+    if(y) *y = widget ? yy : -1;

 }
 
 }
 

-void wxWindow::GetPosition(int *x, int *y) const
+void wxWindow::DoGetPosition(int *x, int *y) const

 {
 {

-    if (m_drawingArea)
-    {
-        CanvasGetPosition(x, y);
-        return;
-    }
-    Widget widget = (Widget) GetTopWidget();
+    Widget widget = (Widget)
+        ( m_drawingArea ?
+          ( m_borderWidget ? m_borderWidget : m_scrolledWindow ) :
+          GetTopWidget() );
+

     Position xx, yy;
     XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL);
 
     Position xx, yy;
     XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL);
 


@@ -1067,14 +1186,15 @@ void wxWindow::GetPosition(int *x, int *y) const
     if (GetParent())
     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());
     if (GetParent())
     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());

-        xx -= pt.x;
-        yy -= pt.y;
+        xx = (Position)(xx - pt.x);
+        yy = (Position)(yy - pt.y);

     }
 
     }
 

-    *x = xx; *y = yy;
+    if(x) *x = xx;
+    if(y) *y = yy;

 }
 
 }
 

-void wxWindow::ScreenToClient(int *x, int *y) const
+void wxWindow::DoScreenToClient(int *x, int *y) const

 {
     Widget widget = (Widget) GetClientWidget();
     Display *display = XtDisplay((Widget) GetMainWidget());
 {
     Widget widget = (Widget) GetClientWidget();
     Display *display = XtDisplay((Widget) GetMainWidget());


@@ -1082,12 +1202,14 @@ void wxWindow::ScreenToClient(int *x, int *y) const
     Window thisWindow = XtWindow(widget);
 
     Window childWindow;
     Window thisWindow = XtWindow(widget);
 
     Window childWindow;

-    int xx = *x;
-    int yy = *y;
-    XTranslateCoordinates(display, rootWindow, thisWindow, xx, yy, x, y, &childWindow);
+    int xx = x ? *x : 0;
+    int yy = y ? *y : 0;
+    XTranslateCoordinates(display, rootWindow, thisWindow,
+                          xx, yy, x ? x : &xx, y ? y : &yy,
+                          &childWindow);

 }
 
 }
 

-void wxWindow::ClientToScreen(int *x, int *y) const
+void wxWindow::DoClientToScreen(int *x, int *y) const

 {
     Widget widget = (Widget) GetClientWidget();
     Display *display = XtDisplay(widget);
 {
     Widget widget = (Widget) GetClientWidget();
     Display *display = XtDisplay(widget);


@@ -1095,98 +1217,142 @@ void wxWindow::ClientToScreen(int *x, int *y) const
     Window thisWindow = XtWindow(widget);
 
     Window childWindow;
     Window thisWindow = XtWindow(widget);
 
     Window childWindow;

-    int xx = *x;
-    int yy = *y;
-    XTranslateCoordinates(display, thisWindow, rootWindow, xx, yy, x, y, &childWindow);
+    int xx = x ? *x : 0;
+    int yy = y ? *y : 0;
+    XTranslateCoordinates(display, thisWindow, rootWindow,
+                          xx, yy, x ? x : &xx, y ? y : &yy,
+                          &childWindow);

 }
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 }
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.

-void wxWindow::GetClientSize(int *x, int *y) const
+void wxWindow::DoGetClientSize(int *x, int *y) const

 {
     Widget widget = (Widget) GetClientWidget();
     Dimension xx, yy;
     XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
 {
     Widget widget = (Widget) GetClientWidget();
     Dimension xx, yy;
     XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);

-    *x = xx; *y = yy;
+    if(x) *x = xx; if(y) *y = yy;

 }
 
 void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 }
 
 void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {

-    // A bit of optimization to help sort out the flickers.
-    int oldX, oldY, oldW, oldH;
-    GetSize(& oldW, & oldH);
-    GetPosition(& oldX, & oldY);
-
-    bool useOldPos = FALSE;
-    bool useOldSize = FALSE;
-
-    if ((x == -1) && (x == -1) && ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0))
-        useOldPos = TRUE;
-    else if (x == oldX && y == oldY)
-        useOldPos = TRUE;
+    DoSetSizeIntr(x, y, width, height, sizeFlags, false);
+}

 
 

-    if ((width == -1) && (height == -1))
-        useOldSize = TRUE;
-    else if (width == oldW && height == oldH)
-        useOldSize = TRUE;
+void wxWindow::DoSetSizeIntr(int x, int y, int width, int height,
+                             int sizeFlags, bool fromCtor)
+{
+    // A bit of optimization to help sort out the flickers.
+    int oldX = -1, oldY = -1, oldW = -1, oldH = -1;

 
 

-    if (!wxNoOptimize::CanOptimize())
+    if( !fromCtor )

     {
     {

-        useOldSize = FALSE; useOldPos = FALSE;
+        GetSize(& oldW, & oldH);
+        GetPosition(& oldX, & oldY);

     }
 
     }
 

-    if (useOldPos && useOldSize)
-        return;
+    if (x == -1)
+        x = oldX;
+    if (x == -1)
+        x = oldY;

 
 

-    if (m_drawingArea)
+    if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )

     {
     {

-        CanvasSetSize(x, y, width, height, sizeFlags);
-        return;
+        if ( width == -1 )
+            width = oldW;
+        if ( height == -1 )
+            height = oldH;

     }
     }

-    Widget widget = (Widget) GetTopWidget();
-    if (!widget)
-        return;

 
 

-    bool managed = XtIsManaged( widget );
-    if (managed)
-        XtUnmanageChild(widget);
-
-    int xx = x; int yy = y;
-    AdjustForParentClientOrigin(xx, yy, sizeFlags);
-
-    if (!useOldPos)
+    wxSize size(wxDefaultSize);
+    if ( width <= 0 )

     {
     {

-        if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-            XtVaSetValues(widget, XmNx, xx, NULL);
-        if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-            XtVaSetValues(widget, XmNy, yy, NULL);
+        if ( ( sizeFlags & wxSIZE_AUTO_WIDTH ) && !fromCtor )
+        {
+            size = DoGetBestSize();
+            width = size.x;
+        }
+        else
+        {
+            width = oldW;
+        }

     }
     }

-    if (!useOldSize)
+
+    if ( height == -1 )

     {
     {

-        if (width > -1)
-            XtVaSetValues(widget, XmNwidth, width, NULL);
-        if (height > -1)
-            XtVaSetValues(widget, XmNheight, height, NULL);
+        if( ( sizeFlags & wxSIZE_AUTO_HEIGHT ) && !fromCtor )
+        {
+            if( size.x == -1 ) size = DoGetBestSize();
+            height = size.y;
+        }
+        else
+        {
+            height = oldH;
+        }

     }
 
     }
 

-    if (managed)
-        XtManageChild(widget);
+    if ( x != oldX || y != oldY || width != oldW || height != oldH
+         || !wxNoOptimize::CanOptimize() )
+    {
+        if (m_drawingArea)
+        {
+            int flags = 0;
+
+            if (x != oldX)
+                flags |= wxMOVE_X;

 
 

-    // How about this bit. Maybe we don't need to generate size events
-    // all the time -- they'll be generated when the window is sized anyway.
-#if 0
-    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-    sizeEvent.SetEventObject(this);
+            if (y != oldY)
+                flags |= wxMOVE_Y;

 
 

-      GetEventHandler()->ProcessEvent(sizeEvent);
-#endif // 0
+            if (width > 0)
+                flags |= wxMOVE_WIDTH;
+
+            if (height > 0)
+                flags |= wxMOVE_HEIGHT;
+
+            int xx = x; int yy = y;
+            AdjustForParentClientOrigin(xx, yy, sizeFlags);
+            if( !fromCtor )
+                DoMoveWindow( xx, yy, width, height );
+            else
+                DoMoveWindowIntr( xx, yy, width, height, flags );
+
+            return;
+        }
+
+        Widget widget = (Widget) GetTopWidget();
+        if (!widget)
+            return;
+
+        bool managed = XtIsManaged( widget );
+        if (managed)
+            XtUnmanageChild(widget);
+
+        int xx = x;
+        int yy = y;
+        AdjustForParentClientOrigin(xx, yy, sizeFlags);
+
+        DoMoveWindow(xx, yy, width, height);
+
+        if (managed)
+            XtManageChild(widget);
+    }

 }
 
 void wxWindow::DoSetClientSize(int width, int height)
 {
     if (m_drawingArea)
     {
 }
 
 void wxWindow::DoSetClientSize(int width, int height)
 {
     if (m_drawingArea)
     {

-        CanvasSetClientSize(width, height);
+        Widget drawingArea = (Widget) m_drawingArea;
+
+        XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
+
+        if (width > -1)
+            XtVaSetValues(drawingArea, XmNwidth, width, NULL);
+        if (height > -1)
+            XtVaSetValues(drawingArea, XmNheight, height, NULL);
+
+        XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);

         return;
     }
 
         return;
     }
 


@@ -1196,59 +1362,88 @@ void wxWindow::DoSetClientSize(int width, int height)
         XtVaSetValues(widget, XmNwidth, width, NULL);
     if (height > -1)
         XtVaSetValues(widget, XmNheight, height, NULL);
         XtVaSetValues(widget, XmNwidth, width, NULL);
     if (height > -1)
         XtVaSetValues(widget, XmNheight, height, NULL);

-
-    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-    sizeEvent.SetEventObject(this);
-
-    GetEventHandler()->ProcessEvent(sizeEvent);
-}
-
-// For implementation purposes - sometimes decorations make the client area
-// smaller
-wxPoint wxWindow::GetClientAreaOrigin() const
-{
-    return wxPoint(0, 0);

 }
 
 }
 

-// Makes an adjustment to the window position (for example, a frame that has
-// a toolbar that it manages itself).
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+void wxWindow::DoMoveWindowIntr(int xx, int yy, int w, int h,
+                                int flags)

 {
 {

-    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
+    if (m_drawingArea)

     {
     {

-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        x += pt.x; y += pt.y;
-    }
-}
+        Widget drawingArea = (Widget) m_drawingArea;
+        Widget borderOrScrolled = m_borderWidget ?
+            (Widget) m_borderWidget :
+            (Widget) m_scrolledWindow;
+
+        bool managed = XtIsManaged(borderOrScrolled);
+        if (managed)
+            XtUnmanageChild (borderOrScrolled);
+        XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
+
+        if (flags & wxMOVE_X)
+            XtVaSetValues (borderOrScrolled,
+                           XmNx, xx,
+                           NULL);
+        if (flags & wxMOVE_Y)
+            XtVaSetValues (borderOrScrolled,
+                           XmNy, yy,
+                           NULL);
+
+        if (flags & wxMOVE_WIDTH)
+        {
+            if (m_borderWidget)
+            {
+                XtVaSetValues ((Widget) m_borderWidget, XmNwidth, w, NULL);
+                short thick, margin;
+                XtVaGetValues ((Widget) m_borderWidget,
+                               XmNshadowThickness, &thick,
+                               XmNmarginWidth, &margin,
+                               NULL);
+                w -= 2 * (thick + margin);
+            }

 
 

-void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
-{
-    m_minWidth = minW;
-    m_minHeight = minH;
-    m_maxWidth = maxW;
-    m_maxHeight = maxH;
+            if( w < 1 ) w = 1;
+            XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
+        }

 
 

-    wxFrame *frame = wxDynamicCast(this, wxFrame);
-    if ( !frame )
-    {
-        // TODO what about dialogs?
-        return;
+        if (flags & wxMOVE_HEIGHT)
+        {
+            if (m_borderWidget)
+            {
+                XtVaSetValues ((Widget) m_borderWidget, XmNheight, h, NULL);
+                short thick, margin;
+                XtVaGetValues ((Widget) m_borderWidget,
+                               XmNshadowThickness, &thick,
+                               XmNmarginHeight, &margin,
+                               NULL);
+                h -= 2 * (thick + margin);
+            }
+
+            if( h < 1 ) h = 1;
+            XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL);
+        }
+
+        if (managed)
+            XtManageChild (borderOrScrolled);
+        XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);

     }
     }

+    else
+    {
+        if( w < 1 ) w = 1;
+        if( h < 1 ) h = 1;

 
 

-    Widget widget = (Widget) frame->GetShellWidget();
+        XtVaSetValues((Widget)GetTopWidget(),
+                      XmNx, xx,
+                      XmNy, yy,
+                      XmNwidth, w,
+                      XmNheight, h,
+                      NULL);
+    }
+}

 
 

-    if (minW > -1)
-        XtVaSetValues(widget, XmNminWidth, minW, NULL);
-    if (minH > -1)
-        XtVaSetValues(widget, XmNminHeight, minH, NULL);
-    if (maxW > -1)
-        XtVaSetValues(widget, XmNmaxWidth, maxW, NULL);
-    if (maxH > -1)
-        XtVaSetValues(widget, XmNmaxHeight, maxH, NULL);
-    if (incW > -1)
-        XtVaSetValues(widget, XmNwidthInc, incW, NULL);
-    if (incH > -1)
-        XtVaSetValues(widget, XmNheightInc, incH, NULL);
+void wxWindow::DoMoveWindow(int x, int y, int width, int height)
+{
+    DoMoveWindowIntr (x, y, width, height,
+                      wxMOVE_X|wxMOVE_Y|wxMOVE_WIDTH|wxMOVE_HEIGHT);

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


@@ -1257,78 +1452,64 @@ void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, in
 
 int wxWindow::GetCharHeight() const
 {
 
 int wxWindow::GetCharHeight() const
 {

-    wxCHECK_MSG( m_windowFont.Ok(), 0, "valid window font needed" );
-
-    WXFontStructPtr pFontStruct = m_windowFont.GetFontStruct(1.0, GetXDisplay());
+    int height;

 
 

-    int direction, ascent, descent;
-    XCharStruct overall;
-    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
-        &descent, &overall);
+    if (m_font.IsOk())
+        wxGetTextExtent (GetXDisplay(), m_font, 1.0,
+                         "x", NULL, &height, NULL, NULL);
+    else
+        wxGetTextExtent (this, "x", NULL, &height, NULL, NULL);

 
 

-    //  return (overall.ascent + overall.descent);
-    return (ascent + descent);
+    return height;

 }
 
 int wxWindow::GetCharWidth() const
 {
 }
 
 int wxWindow::GetCharWidth() const
 {

-    wxCHECK_MSG( m_windowFont.Ok(), 0, "valid window font needed" );
-
-    WXFontStructPtr pFontStruct = m_windowFont.GetFontStruct(1.0, GetXDisplay());
+    int width;

 
 

-    int direction, ascent, descent;
-    XCharStruct overall;
-    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
-        &descent, &overall);
+    if (m_font.IsOk())
+        wxGetTextExtent (GetXDisplay(), m_font, 1.0,
+                         "x", &width, NULL, NULL, NULL);
+    else
+        wxGetTextExtent (this, "x", &width, NULL, NULL, NULL);

 
 

-    return overall.width;
+    return width;

 }
 
 }
 

-void wxWindow::GetTextExtent(const wxString& string,
-                             int *x, int *y,
-                             int *descent, int *externalLeading,
-                             const wxFont *theFont) const
+void wxWindow::DoGetTextExtent(const wxString& string,
+                               int *x, int *y,
+                               int *descent,
+                               int *externalLeading,
+                               const wxFont *theFont) const

 {
 {

-    wxFont *fontToUse = (wxFont *)theFont;
-    if (!fontToUse)
-        fontToUse = (wxFont *) & m_windowFont;
-
-    wxCHECK_RET( fontToUse.Ok(), "valid window font needed" );
+    const wxFont *fontToUse = theFont ? theFont : &m_font;

 
 

-    WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay());
-
-    int direction, ascent, descent2;
-    XCharStruct overall;
-    int slen;
-
-#if 0
-    if (use16)
-        XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction,
-        &ascent, &descent2, &overall);
-#endif
-
-    XTextExtents((XFontStruct*) pFontStruct, string, slen,
-                 &direction, &ascent, &descent2, &overall);
-
-    if ( x )
-        *x = (overall.width);
-    if ( y )
-        *y = (ascent + descent2);
-    if (descent)
-        *descent = descent2;

     if (externalLeading)
         *externalLeading = 0;
     if (externalLeading)
         *externalLeading = 0;

+    if (fontToUse->IsOk())
+        wxGetTextExtent (GetXDisplay(), *fontToUse, 1.0,
+                         string, x, y, NULL, descent);
+    else
+        wxGetTextExtent (this, string, x, y, NULL, descent);

 }
 
 // ----------------------------------------------------------------------------
 // painting
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // 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)
 {
 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {

-    m_needsRefresh = TRUE;
-    Display *display = XtDisplay((Widget) GetMainWidget());
-    Window thisWindow = XtWindow((Widget) GetMainWidget());
+    Widget widget = (Widget) GetMainWidget();
+    if (!widget)
+        return;
+    m_needsRefresh = true;
+    Display *display = XtDisplay(widget);
+    Window thisWindow = XtWindow(widget);

 
     XExposeEvent dummyEvent;
     int width, height;
 
     XExposeEvent dummyEvent;
     int width, height;


@@ -1359,35 +1540,18 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
         wxClientDC dc(this);
         wxBrush backgroundBrush(GetBackgroundColour(), wxSOLID);
         dc.SetBackground(backgroundBrush);
         wxClientDC dc(this);
         wxBrush backgroundBrush(GetBackgroundColour(), wxSOLID);
         dc.SetBackground(backgroundBrush);

+
+        wxClientDCImpl * const
+            dcimpl = static_cast<wxClientDCImpl *>(dc.GetImpl());

         if (rect)
         if (rect)

-            dc.Clear(*rect);
+            dcimpl->Clear(*rect);

         else
         else

-            dc.Clear();
+            dcimpl->Clear();

     }
 
     XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
 }
 
     }
 
     XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
 }
 

-void wxWindow::Clear()
-{
-    wxClientDC dc(this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
-}
-
-void wxWindow::ClearUpdateRects()
-{
-    wxNode* node = m_updateRects.First();
-    while (node)
-    {
-        wxRect* rect = (wxRect*) node->Data();
-        delete rect;
-        node = node->Next();
-    }
-    m_updateRects.Clear();
-}
-

 void wxWindow::DoPaint()
 {
     //TODO : make a temporary gc so we can do the XCopyArea below
 void wxWindow::DoPaint()
 {
     //TODO : make a temporary gc so we can do the XCopyArea below


@@ -1395,7 +1559,10 @@ void wxWindow::DoPaint()
     {
       wxPaintDC dc(this);
 
     {
       wxPaintDC dc(this);
 

-      GC tempGC = (GC) dc.GetBackingGC();
+      wxPaintDCImpl * const
+          dcimpl = static_cast<wxPaintDCImpl *>(dc.GetImpl());
+
+      GC tempGC = (GC) dcimpl->GetBackingGC();

 
       Widget widget = (Widget) GetMainWidget();
 
 
       Widget widget = (Widget) GetMainWidget();
 


@@ -1406,7 +1573,7 @@ void wxWindow::DoPaint()
       // otherwise we don't know how many pixels have been scrolled. We might
       // solve this in the future by defining virtual wxWindow functions to get
       // the scroll position in pixels. Or, each kind of scrolled window has to
       // otherwise we don't know how many pixels have been scrolled. We might
       // solve this in the future by defining virtual wxWindow functions to get
       // the scroll position in pixels. Or, each kind of scrolled window has to

-      // implement backing stores itself, using generic wxWindows code.
+      // implement backing stores itself, using generic wxWidgets code.

       wxScrolledWindow* scrolledWindow = wxDynamicCast(this, wxScrolledWindow);
       if ( scrolledWindow )
       {
       wxScrolledWindow* scrolledWindow = wxDynamicCast(this, wxScrolledWindow);
       if ( scrolledWindow )
       {


@@ -1448,16 +1615,17 @@ void wxWindow::DoPaint()
     }
     else
     {
     }
     else
     {

+        wxWindowDC dc(this);

         // Set an erase event first
         // Set an erase event first

-        wxEraseEvent eraseEvent(GetId());
+        wxEraseEvent eraseEvent(GetId(), &dc);

         eraseEvent.SetEventObject(this);
         eraseEvent.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(eraseEvent);
+        HandleWindowEvent(eraseEvent);

 
         wxPaintEvent event(GetId());
         event.SetEventObject(this);
 
         wxPaintEvent event(GetId());
         event.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);

 
 

-        m_needsRefresh = FALSE;
+        m_needsRefresh = false;

     }
 }
 
     }
 }
 


@@ -1468,7 +1636,7 @@ void wxWindow::DoPaint()
 // Responds to colour changes: passes event on to children.
 void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // Responds to colour changes: passes event on to children.
 void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

-    wxWindowList::Node *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
         // Only propagate to non-top-level windows
     while ( node )
     {
         // Only propagate to non-top-level windows


@@ -1476,29 +1644,23 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
         if ( win->GetParent() )
         {
             wxSysColourChangedEvent event2;
         if ( win->GetParent() )
         {
             wxSysColourChangedEvent event2;

-            event.m_eventObject = win;
-            win->GetEventHandler()->ProcessEvent(event2);
+            event.SetEventObject(win);
+            win->HandleWindowEvent(event2);

         }
 
         node = node->GetNext();
     }
 }
 
         }
 
         node = node->GetNext();
     }
 }
 

-void wxWindow::OnIdle(wxIdleEvent& event)
-{
-    // This calls the UI-update mechanism (querying windows for
-    // menu/toolbar/control state information)
-    UpdateWindowUI();
-}
-

 // ----------------------------------------------------------------------------
 // accelerators
 // ----------------------------------------------------------------------------
 
 bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
 {
 // ----------------------------------------------------------------------------
 // accelerators
 // ----------------------------------------------------------------------------
 
 bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
 {

-    if (!m_acceleratorTable.Ok())
-        return FALSE;
+#if wxUSE_ACCEL
+    if (!m_acceleratorTable.IsOk())
+        return false;

 
     int count = m_acceleratorTable.GetCount();
     wxAcceleratorEntry* entries = m_acceleratorTable.GetEntries();
 
     int count = m_acceleratorTable.GetCount();
     wxAcceleratorEntry* entries = m_acceleratorTable.GetEntries();


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

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

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


@@ -1518,25 +1680,27 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
                 parent = parent->GetParent();
 
             if (!parent)
                 parent = parent->GetParent();
 
             if (!parent)

-                return FALSE;
+                return false;

 
             wxFrame* frame = wxDynamicCast(parent, wxFrame);
             if ( frame )
             {
 
             wxFrame* frame = wxDynamicCast(parent, wxFrame);
             if ( frame )
             {

+#if wxUSE_MENUS

                 // Try for a menu command
                 if (frame->GetMenuBar())
                 {
                 // Try for a menu command
                 if (frame->GetMenuBar())
                 {

-                    wxMenuItem* item = frame->GetMenuBar()->FindItemForId(entry->GetCommand());
+                    wxMenuItem* item = frame->GetMenuBar()->FindItem(entry->GetCommand());

                     if (item)
                     {
                         wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
                         commandEvent.SetEventObject(frame);
 
                     if (item)
                     {
                         wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
                         commandEvent.SetEventObject(frame);
 

-                        // If ProcessEvent returns TRUE (it was handled), then
+                        // If ProcessEvent returns true (it was handled), then

                         // the calling code will skip the event handling.
                         // the calling code will skip the event handling.

-                        return frame->GetEventHandler()->ProcessEvent(commandEvent);
+                        return frame->HandleWindowEvent(commandEvent);

                     }
                 }
                     }
                 }

+#endif

             }
 
             // Find a child matching the command id
             }
 
             // Find a child matching the command id


@@ -1544,7 +1708,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
 
             // No such child
             if (!child)
 
             // No such child
             if (!child)

-                return FALSE;
+                return false;

 
             // Now we process those kinds of windows that we can.
             // For now, only buttons.
 
             // Now we process those kinds of windows that we can.
             // For now, only buttons.


@@ -1552,15 +1716,16 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
             {
                 wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId());
                 commandEvent.SetEventObject(child);
             {
                 wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId());
                 commandEvent.SetEventObject(child);

-                return child->GetEventHandler()->ProcessEvent(commandEvent);
+                return child->HandleWindowEvent(commandEvent);

             }
 
             }
 

-            return FALSE;
+            return false;

         } // matches event
     }// for
         } // matches event
     }// for

+#endif

 
     // We didn't match the key event against an accelerator.
 
     // We didn't match the key event against an accelerator.

-    return FALSE;
+    return false;

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -1568,32 +1733,37 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// function which maintain the global hash table mapping Widgets to wxWindows
+// function which maintain the global hash table mapping Widgets to wxWidgets

 // ----------------------------------------------------------------------------
 
 bool wxAddWindowToTable(Widget w, wxWindow *win)
 {
 // ----------------------------------------------------------------------------
 
 bool wxAddWindowToTable(Widget w, wxWindow *win)
 {

-    wxWindow *oldItem = NULL;
-    if ((oldItem = (wxWindow *)gs_wxWidgetHashTable->Get ((long) w)))
+    const long key = (long)w;
+    if ( wxWidgetHashTable->Get(key))

     {
         wxLogDebug("Widget table clash: new widget is %ld, %s",
     {
         wxLogDebug("Widget table clash: new widget is %ld, %s",

-                   (long)w, win->GetClassInfo()->GetClassName());
-        return FALSE;
+                   key, win->GetClassInfo()->GetClassName());
+        return false;

     }
 
     }
 

-    gs_wxWidgetHashTable->Put((long) w, win);
+    wxWidgetHashTable->Put(key, win);
+
+    wxLogTrace("widget", "Widget 0x%p <-> window %p (%s)",
+               w, win, win->GetClassInfo()->GetClassName());

 
 

-    return TRUE;
+    return true;

 }
 
 wxWindow *wxGetWindowFromTable(Widget w)
 {
 }
 
 wxWindow *wxGetWindowFromTable(Widget w)
 {

-    return (wxWindow *)gs_wxWidgetHashTable->Get((long) w);
+    return (wxWindow *)wxWidgetHashTable->Get((long) w);

 }
 
 void wxDeleteWindowFromTable(Widget w)
 {
 }
 
 void wxDeleteWindowFromTable(Widget w)
 {

-    gs_wxWidgetHashTable->Delete((long)w);
+    wxLogTrace("widget", "Widget 0x%p", (WXWidget)w);
+
+    wxWidgetHashTable->Delete((long)w);

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


@@ -1601,18 +1771,16 @@ void wxDeleteWindowFromTable(Widget w)
 // ----------------------------------------------------------------------------
 
 // Add to hash table, add event handler
 // ----------------------------------------------------------------------------
 
 // Add to hash table, add event handler

-bool wxWindow::AttachWidget (wxWindow* parent, WXWidget mainWidget,
+bool wxWindow::AttachWidget (wxWindow* WXUNUSED(parent), WXWidget mainWidget,

                              WXWidget formWidget, int x, int y, int width, int height)
 {
     wxAddWindowToTable((Widget) mainWidget, this);
                              WXWidget formWidget, int x, int y, int width, int height)
 {
     wxAddWindowToTable((Widget) mainWidget, this);

-    if (CanAddEventHandler())
-    {
-        XtAddEventHandler((Widget) mainWidget,
-            ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
-            False,
-            wxPanelItemEventHandler,
-            (XtPointer) this);
-    }
+    XtAddEventHandler( (Widget) mainWidget,
+                       ButtonPressMask | ButtonReleaseMask
+                     | PointerMotionMask,
+                       False,
+                       wxPanelItemEventHandler,
+                       (XtPointer) this);

 
     if (!formWidget)
     {
 
     if (!formWidget)
     {


@@ -1626,7 +1794,7 @@ bool wxWindow::AttachWidget (wxWindow* parent, WXWidget mainWidget,
     if (formWidget)
     {
         if (!wxAddWindowToTable((Widget) formWidget, this))
     if (formWidget)
     {
         if (!wxAddWindowToTable((Widget) formWidget, this))

-            return FALSE;
+            return false;

 
         XtTranslations ptr;
         XtOverrideTranslations ((Widget) formWidget,
 
         XtTranslations ptr;
         XtOverrideTranslations ((Widget) formWidget,


@@ -1638,35 +1806,42 @@ bool wxWindow::AttachWidget (wxWindow* parent, WXWidget mainWidget,
         x = 0;
     if (y == -1)
         y = 0;
         x = 0;
     if (y == -1)
         y = 0;

-    SetSize (x, y, width, height);
+    DoSetSize (x, y, width, height, wxSIZE_USE_EXISTING);

 
 

-    return TRUE;
+    return true;

 }
 
 // Remove event handler, remove from hash table
 bool wxWindow::DetachWidget(WXWidget widget)
 {
 }
 
 // Remove event handler, remove from hash table
 bool wxWindow::DetachWidget(WXWidget widget)
 {

-    if (CanAddEventHandler())
-    {
-        XtRemoveEventHandler((Widget) widget,
-            ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
-            False,
-            wxPanelItemEventHandler,
-            (XtPointer)this);
-    }
+    XtRemoveEventHandler( (Widget) widget,
+                          ButtonPressMask | ButtonReleaseMask
+                        | PointerMotionMask,
+                          False,
+                          wxPanelItemEventHandler,
+                          (XtPointer)this);

 
     wxDeleteWindowFromTable((Widget) widget);
 
     wxDeleteWindowFromTable((Widget) widget);

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // Motif-specific accessors
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // 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
 {
 // Get the underlying X window
 WXWindow wxWindow::GetXWindow() const
 {

-    Widget wMain = GetMainWidget();
+    Widget wMain = (Widget)GetMainWidget();

     if ( wMain )
         return (WXWindow) XtWindow(wMain);
     else
     if ( wMain )
         return (WXWindow) XtWindow(wMain);
     else


@@ -1676,11 +1851,11 @@ WXWindow wxWindow::GetXWindow() const
 // Get the underlying X display
 WXDisplay *wxWindow::GetXDisplay() const
 {
 // Get the underlying X display
 WXDisplay *wxWindow::GetXDisplay() const
 {

-    Widget wMain = GetMainWidget();
+    Widget wMain = (Widget)GetMainWidget();

     if ( wMain )
         return (WXDisplay*) XtDisplay(wMain);
     else
     if ( wMain )
         return (WXDisplay*) XtDisplay(wMain);
     else

-        return (WXDisplay*) NULL;
+        return NULL;

 }
 
 WXWidget wxWindow::GetMainWidget() const
 }
 
 WXWidget wxWindow::GetMainWidget() const


@@ -1715,7 +1890,8 @@ WXWidget wxWindow::GetLabelWidget() const
 
 // All widgets should have this as their resize proc.
 // OnSize sent to wxWindow via client data.
 
 // All widgets should have this as their resize proc.
 // OnSize sent to wxWindow via client data.

-void wxWidgetResizeProc(Widget w, XConfigureEvent *event, String args[], int *num_args)
+void wxWidgetResizeProc(Widget w, XConfigureEvent *WXUNUSED(event),
+                        String WXUNUSED(args)[], int *WXUNUSED(num_args))

 {
     wxWindow *win = wxGetWindowFromTable(w);
     if (!win)
 {
     wxWindow *win = wxGetWindowFromTable(w);
     if (!win)


@@ -1723,11 +1899,10 @@ void wxWidgetResizeProc(Widget w, XConfigureEvent *event, String args[], int *nu
 
     if (win->PreResize())
     {
 
     if (win->PreResize())
     {

-        int width, height;
-        win->GetSize(&width, &height);
-        wxSizeEvent sizeEvent(wxSize(width, height), win->GetId());
+        wxSize newSize(win->GetSize());
+        wxSizeEvent sizeEvent(newSize, win->GetId());

         sizeEvent.SetEventObject(win);
         sizeEvent.SetEventObject(win);

-        win->GetEventHandler()->ProcessEvent(sizeEvent);
+        win->HandleWindowEvent(sizeEvent);

     }
 }
 
     }
 }
 


@@ -1740,27 +1915,17 @@ static void wxCanvasRepaintProc(Widget drawingArea,
 
     XEvent * event = cbs->event;
     wxWindow * win = (wxWindow *) clientData;
 
     XEvent * event = cbs->event;
     wxWindow * win = (wxWindow *) clientData;

-    Display * display = (Display *) win->GetXDisplay();

 
     switch (event->type)
     {
     case Expose:
         {
 
     switch (event->type)
     {
     case Expose:
         {

-            wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y,
-                event->xexpose.width, event->xexpose.height);
-
-            win->m_updateRects.Append((wxObject*) rect);
+            win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
+                               event->xexpose.width, event->xexpose.height);

 
             if (event -> xexpose.count == 0)
             {
 
             if (event -> xexpose.count == 0)
             {

-#if 0
-                wxPaintEvent event(win->GetId());
-                event.SetEventObject(win);
-                win->GetEventHandler()->ProcessEvent(event);
-#endif // 0
-

                 win->DoPaint();
                 win->DoPaint();

-                win->ClearUpdateRects();

             }
             break;
         }
             }
             break;
         }


@@ -1769,7 +1934,7 @@ static void wxCanvasRepaintProc(Widget drawingArea,
 
 // Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4)
 static void wxCanvasEnterLeave(Widget drawingArea,
 
 // Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4)
 static void wxCanvasEnterLeave(Widget drawingArea,

-                               XtPointer clientData,
+                               XtPointer WXUNUSED(clientData),

                                XCrossingEvent * event)
 {
     XmDrawingAreaCallbackStruct cbs;
                                XCrossingEvent * event)
 {
     XmDrawingAreaCallbackStruct cbs;


@@ -1784,7 +1949,8 @@ static void wxCanvasEnterLeave(Widget drawingArea,
 }
 
 // Fix to make it work under Motif 1.0 (!)
 }
 
 // Fix to make it work under Motif 1.0 (!)

-static void wxCanvasMotionEvent (Widget drawingArea, XButtonEvent * event)
+static void wxCanvasMotionEvent (Widget WXUNUSED(drawingArea),
+                                 XButtonEvent *WXUNUSED(event))

 {
 #if XmVersion <= 1000
     XmDrawingAreaCallbackStruct cbs;
 {
 #if XmVersion <= 1000
     XmDrawingAreaCallbackStruct cbs;


@@ -1799,11 +1965,11 @@ static void wxCanvasMotionEvent (Widget drawingArea, XButtonEvent * event)
 }
 
 static void wxCanvasInputEvent(Widget drawingArea,
 }
 
 static void wxCanvasInputEvent(Widget drawingArea,

-                               XtPointer data,
+                               XtPointer WXUNUSED(data),

                                XmDrawingAreaCallbackStruct * cbs)
 {
     wxWindow *canvas = wxGetWindowFromTable(drawingArea);
                                XmDrawingAreaCallbackStruct * cbs)
 {
     wxWindow *canvas = wxGetWindowFromTable(drawingArea);

-    XEvent local_event;
+    XEvent* xevent = cbs->event;

 
     if (canvas==NULL)
         return;
 
     if (canvas==NULL)
         return;


@@ -1811,9 +1977,7 @@ static void wxCanvasInputEvent(Widget drawingArea,
     if (cbs->reason != XmCR_INPUT)
         return;
 
     if (cbs->reason != XmCR_INPUT)
         return;
 

-    local_event = *(cbs->event);    // We must keep a copy!
-
-    switch (local_event.xany.type)
+    switch (xevent->xany.type)

     {
     case EnterNotify:
     case LeaveNotify:
     {
     case EnterNotify:
     case LeaveNotify:


@@ -1821,195 +1985,27 @@ static void wxCanvasInputEvent(Widget drawingArea,
     case ButtonRelease:
     case MotionNotify:
         {
     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)
+            wxMouseEvent wxevent(0);
+            if (wxTranslateMouseEvent(wxevent, canvas, drawingArea, xevent))

             {
             {

-                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;
-                    }
-                }
+                canvas->HandleWindowEvent(wxevent);

             }
             }

-
-            wxevent.SetId(canvas->GetId());
-            wxevent.SetEventObject(canvas);
-            wxevent.m_x = local_event.xbutton.x;
-            wxevent.m_y = local_event.xbutton.y;
-            canvas->GetEventHandler()->ProcessEvent (wxevent);
-#if 0
-            if (eventType == wxEVT_ENTER_WINDOW ||
-                    eventType == wxEVT_LEAVE_WINDOW ||
-                    eventType == wxEVT_MOTION
-               )
-                return;
-#endif // 0

             break;
             break;

-      }
+        }

     case KeyPress:
         {
     case KeyPress:
         {

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

             {
                 // Implement wxFrame::OnCharHook by checking ancestor.
             {
                 // Implement wxFrame::OnCharHook by checking ancestor.

-                wxWindow *parent = canvas->GetParent();
-                while (parent && !parent->IsKindOf(CLASSINFO(wxFrame)))
+                wxWindow *parent = canvas;
+                while (parent && !parent->IsTopLevel())

                     parent = parent->GetParent();
 
                 if (parent)
                 {
                     event.SetEventType(wxEVT_CHAR_HOOK);
                     parent = parent->GetParent();
 
                 if (parent)
                 {
                     event.SetEventType(wxEVT_CHAR_HOOK);

-                    if (parent->GetEventHandler()->ProcessEvent(event))
+                    if (parent->HandleWindowEvent(event))

                         return;
                 }
 
                         return;
                 }
 


@@ -2018,57 +2014,40 @@ static void wxCanvasInputEvent(Widget drawingArea,
                 event.SetEventType(wxEVT_KEY_DOWN);
 
                 // Only process OnChar if OnKeyDown didn't swallow it
                 event.SetEventType(wxEVT_KEY_DOWN);
 
                 // Only process OnChar if OnKeyDown didn't swallow it

-                if (!canvas->GetEventHandler()->ProcessEvent (event))
+                if (!canvas->HandleWindowEvent (event))

                 {
                 {

-                  event.SetEventType(wxEVT_CHAR);
-                  canvas->GetEventHandler()->ProcessEvent (event);
-        }
+                    event.SetEventType(wxEVT_CHAR);
+                    canvas->HandleWindowEvent (event);
+                }

             }
             break;
         }
     case KeyRelease:
         {
             }
             break;
         }
     case KeyRelease:
         {

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

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

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

             {
             {

-                canvas->GetEventHandler()->ProcessEvent (event);
+                canvas->HandleWindowEvent (event);

             }
             break;
         }
     case FocusIn:
         {
             }
             break;
         }
     case FocusIn:
         {

-            if (local_event.xfocus.detail != NotifyPointer)
+            if (xevent->xfocus.detail != NotifyPointer)

             {
                 wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId());
                 event.SetEventObject(canvas);
             {
                 wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId());
                 event.SetEventObject(canvas);

-                canvas->GetEventHandler()->ProcessEvent(event);
+                canvas->HandleWindowEvent(event);

             }
             break;
         }
     case FocusOut:
         {
             }
             break;
         }
     case FocusOut:
         {

-            if (local_event.xfocus.detail != NotifyPointer)
+            if (xevent->xfocus.detail != NotifyPointer)

             {
                 wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId());
                 event.SetEventObject(canvas);
             {
                 wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId());
                 event.SetEventObject(canvas);

-                canvas->GetEventHandler()->ProcessEvent(event);
+                canvas->HandleWindowEvent(event);

             }
             break;
         }
             }
             break;
         }


@@ -2078,26 +2057,26 @@ static void wxCanvasInputEvent(Widget drawingArea,
 }
 
 static void wxPanelItemEventHandler(Widget    wid,
 }
 
 static void wxPanelItemEventHandler(Widget    wid,

-                                    XtPointer client_data,
+                                    XtPointer WXUNUSED(client_data),

                                     XEvent*   event,
                                     Boolean  *continueToDispatch)
 {
     // Widget can be a label or the actual widget.
 
                                     XEvent*   event,
                                     Boolean  *continueToDispatch)
 {
     // Widget can be a label or the actual widget.
 

-    wxWindow *window = wxGetWindowFromTable(drawingArea);
+    wxWindow *window = wxGetWindowFromTable(wid);

     if (window)
     {
         wxMouseEvent wxevent(0);
         if (wxTranslateMouseEvent(wxevent, window, wid, event))
         {
     if (window)
     {
         wxMouseEvent wxevent(0);
         if (wxTranslateMouseEvent(wxevent, window, wid, event))
         {

-            window->GetEventHandler()->ProcessEvent(wxevent);
+            window->HandleWindowEvent(wxevent);

         }
     }
 
     // TODO: probably the key to allowing default behaviour to happen. Say we
         }
     }
 
     // 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
+    // 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
     // e.g. wxWindow::OnMouseEvent we can call Default() which sets this flag to

-    // TRUE, indicating that default processing can happen. Thus, behaviour can
+    // 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.
     // 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.


@@ -2106,55 +2085,54 @@ static void wxPanelItemEventHandler(Widget    wid,
 
 static void wxScrollBarCallback(Widget scrollbar,
                                 XtPointer clientData,
 
 static void wxScrollBarCallback(Widget scrollbar,
                                 XtPointer clientData,

-                                XmScaleCallbackStruct *cbs)
+                                XmScrollBarCallbackStruct *cbs)

 {
 {

-    Widget scrolledWindow = XtParent (scrollbar);

     wxWindow *win = wxGetWindowFromTable(scrollbar);
     wxWindow *win = wxGetWindowFromTable(scrollbar);

-    int orientation = (int) clientData;
+    wxCHECK_RET( win, wxT("invalid widget in scrollbar callback") );
+
+    wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);

 
     wxEventType eventType = wxEVT_NULL;
     switch (cbs->reason)
     {
     case XmCR_INCREMENT:
         {
 
     wxEventType eventType = wxEVT_NULL;
     switch (cbs->reason)
     {
     case XmCR_INCREMENT:
         {

-            eventType = wxEVT_SCROLL_LINEDOWN;
+            eventType = wxEVT_SCROLLWIN_LINEDOWN;

             break;
         }
     case XmCR_DECREMENT:
         {
             break;
         }
     case XmCR_DECREMENT:
         {

-            eventType = wxEVT_SCROLL_LINEUP;
+            eventType = wxEVT_SCROLLWIN_LINEUP;

             break;
         }
     case XmCR_DRAG:
         {
             break;
         }
     case XmCR_DRAG:
         {

-            eventType = wxEVT_SCROLL_THUMBTRACK;
+            eventType = wxEVT_SCROLLWIN_THUMBTRACK;

             break;
         }
     case XmCR_VALUE_CHANGED:
         {
             break;
         }
     case XmCR_VALUE_CHANGED:
         {

-            // TODO: Should this be intercepted too, or will it cause
-            // duplicate events?
-            eventType = wxEVT_SCROLL_THUMBTRACK;
+            eventType = wxEVT_SCROLLWIN_THUMBRELEASE;

             break;
         }
     case XmCR_PAGE_INCREMENT:
         {
             break;
         }
     case XmCR_PAGE_INCREMENT:
         {

-            eventType = wxEVT_SCROLL_PAGEDOWN;
+            eventType = wxEVT_SCROLLWIN_PAGEDOWN;

             break;
         }
     case XmCR_PAGE_DECREMENT:
         {
             break;
         }
     case XmCR_PAGE_DECREMENT:
         {

-            eventType = wxEVT_SCROLL_PAGEUP;
+            eventType = wxEVT_SCROLLWIN_PAGEUP;

             break;
         }
     case XmCR_TO_TOP:
         {
             break;
         }
     case XmCR_TO_TOP:
         {

-            eventType = wxEVT_SCROLL_TOP;
+            eventType = wxEVT_SCROLLWIN_TOP;

             break;
         }
     case XmCR_TO_BOTTOM:
         {
             break;
         }
     case XmCR_TO_BOTTOM:
         {

-            eventType = wxEVT_SCROLL_BOTTOM;
+            eventType = wxEVT_SCROLLWIN_BOTTOM;

             break;
         }
     default:
             break;
         }
     default:


@@ -2165,309 +2143,128 @@ static void wxScrollBarCallback(Widget scrollbar,
         }
     }
 
         }
     }
 

-    wxScrollEvent event(eventType, win->GetId());
-    event.SetEventObject(win);
-    event.SetPosition(cbs->value);
-    event.SetOrientation( (orientation == XmHORIZONTAL) ? wxHORIZONTAL : wxVERTICAL );
-
-    win->GetEventHandler()->ProcessEvent(event);
+    wxScrollWinEvent event(eventType,
+                           cbs->value,
+                           orientation);
+    event.SetEventObject( win );
+    win->HandleWindowEvent(event);

 }
 
 // For repainting arbitrary windows
 void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
 {
 }
 
 // For repainting arbitrary windows
 void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
 {

-    Window window;
-    Display *display;
-

     wxWindow* win = wxGetWindowFromTable(w);
     if (!win)
         return;
 
     wxWindow* win = wxGetWindowFromTable(w);
     if (!win)
         return;
 

-    switch(event -> type)
+    switch ( event->type )

     {
     {

-    case Expose :
+        case Expose:

         {
         {

-            window = (Window) win -> GetXWindow();
-            display = (Display *) win -> GetXDisplay();
-
-            wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y,
-                event->xexpose.width, event->xexpose.height);
-            win->m_updateRects.Append((wxObject*) rect);
+            win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
+                               event->xexpose.width, event->xexpose.height);

 
 

-            if (event -> xexpose.count == 0)
+            if ( event->xexpose.count == 0 )

             {
                 win->DoPaint();
             {
                 win->DoPaint();

-
-                win->ClearUpdateRects();
-            }
-            break;
-        }
-    }
-}
-
-// ----------------------------------------------------------------------------
-// CanvaseXXXSize() functions
-// ----------------------------------------------------------------------------
-
-// SetSize, but as per old wxCanvas (with drawing widget etc.)
-void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags)
-{
-    // A bit of optimization to help sort out the flickers.
-    int oldX, oldY, oldW, oldH;
-    GetSize(& oldW, & oldH);
-    GetPosition(& oldX, & oldY);
-
-    bool useOldPos = FALSE;
-    bool useOldSize = FALSE;
-
-    if ((x == -1) && (x == -1) && ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0))
-        useOldPos = TRUE;
-    else if (x == oldX && y == oldY)
-        useOldPos = TRUE;
-
-    if ((w == -1) && (h == -1))
-        useOldSize = TRUE;
-    else if (w == oldW && h == oldH)
-        useOldSize = TRUE;
-
-    if (!wxNoOptimize::CanOptimize())
-    {
-        useOldSize = FALSE; useOldPos = FALSE;
-    }
-
-    if (useOldPos && useOldSize)
-        return;
-
-    Widget drawingArea = (Widget) m_drawingArea;
-    bool managed = XtIsManaged(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-
-    if (managed)
-        XtUnmanageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-    XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
-
-    int xx = x; int yy = y;
-    AdjustForParentClientOrigin(xx, yy, sizeFlags);
-
-    if (!useOldPos)
-    {
-        if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        {
-            XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
-                XmNx, xx, NULL);
-        }
-
-        if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        {
-            XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
-                XmNy, yy, NULL);
-        }
-    }
-
-    if (!useOldSize)
-    {
-
-        if (w > -1)
-        {
-            if (m_borderWidget)
-            {
-                XtVaSetValues ((Widget) m_borderWidget, XmNwidth, w, NULL);
-                short thick, margin;
-                XtVaGetValues ((Widget) m_borderWidget,
-                    XmNshadowThickness, &thick,
-                    XmNmarginWidth, &margin,
-                    NULL);
-                w -= 2 * (thick + margin);
-            }
-
-            XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
-
-            Dimension spacing;
-            Widget sbar;
-            XtVaGetValues ((Widget) m_scrolledWindow,
-                XmNspacing, &spacing,
-                XmNverticalScrollBar, &sbar,
-                NULL);
-            Dimension wsbar;
-            if (sbar)
-                XtVaGetValues (sbar, XmNwidth, &wsbar, NULL);
-            else
-                wsbar = 0;
-
-            w -= (spacing + wsbar);
-
-            //      XtVaSetValues ((Widget) m_drawingArea, XmNwidth, w, NULL);
-        }
-        if (h > -1)
-        {
-            if (m_borderWidget)
-            {
-                XtVaSetValues ((Widget) m_borderWidget, XmNheight, h, NULL);
-                short thick, margin;
-                XtVaGetValues ((Widget) m_borderWidget,
-                    XmNshadowThickness, &thick,
-                    XmNmarginHeight, &margin,
-                    NULL);
-                h -= 2 * (thick + margin);

             }
 
             }
 

-            XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL);
-
-            Dimension spacing;
-            Widget sbar;
-            XtVaGetValues ((Widget) m_scrolledWindow,
-                XmNspacing, &spacing,
-                XmNhorizontalScrollBar, &sbar,
-                NULL);
-            Dimension wsbar;
-            if (sbar)
-                XtVaGetValues (sbar, XmNheight, &wsbar, NULL);
-            else
-                wsbar = 0;
-
-            h -= (spacing + wsbar);
-
-            //      XtVaSetValues ((Widget) m_drawingArea, XmNheight, h, NULL);
-
+            break;

         }
     }
         }
     }

-
-    if (managed)
-        XtManageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-    XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
-
-#if 0
-    int ww, hh;
-    GetClientSize (&ww, &hh);
-    wxSizeEvent sizeEvent(wxSize(ww, hh), GetId());
-    sizeEvent.SetEventObject(this);
-
-      GetEventHandler()->ProcessEvent(sizeEvent);
-#endif // 0
-}
-
-void wxWindow::CanvasSetClientSize (int w, int h)
-{
-    Widget drawingArea = (Widget) m_drawingArea;
-
-    XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
-
-    if (w > -1)
-        XtVaSetValues ((Widget) m_drawingArea, XmNwidth, w, NULL);
-    if (h > -1)
-        XtVaSetValues ((Widget) m_drawingArea, XmNheight, h, NULL);
-
-#if 0
-    // TODO: is this necessary?
-    allowRepainting = FALSE;
-
-    XSync (XtDisplay (drawingArea), FALSE);
-    XEvent event;
-    while (XtAppPending (wxTheApp->appContext))
-    {
-        XFlush (XtDisplay (drawingArea));
-        XtAppNextEvent (wxTheApp->appContext, &event);
-        XtDispatchEvent (&event);
-    }
-#endif // 0
-
-    XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
-
-#if 0
-       allowRepainting = TRUE;
-       DoRefresh ();
-
-       wxSizeEvent sizeEvent(wxSize(w, h), GetId());
-       sizeEvent.SetEventObject(this);
-
-       GetEventHandler()->ProcessEvent(sizeEvent);
-#endif // 0
-}
-
-void wxWindow::CanvasGetClientSize (int *w, int *h) const
-{
-    // Must return the same thing that was set via SetClientSize
-    Dimension xx, yy;
-    XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL);
-    *w = xx;
-    *h = yy;
-}
-
-void wxWindow::CanvasGetSize (int *w, int *h) const
-{
-    Dimension xx, yy;
-    if ((Widget) m_borderWidget)
-        XtVaGetValues ((Widget) m_borderWidget, XmNwidth, &xx, XmNheight, &yy, NULL);
-    else if ((Widget) m_scrolledWindow)
-        XtVaGetValues ((Widget) m_scrolledWindow, XmNwidth, &xx, XmNheight, &yy, NULL);
-    else
-        XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL);
-
-    *w = xx;
-    *h = yy;
-}
-
-void wxWindow::CanvasGetPosition (int *x, int *y) const
-{
-    Position xx, yy;
-    XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, &xx, XmNy, &yy, NULL);
-
-    // We may be faking the client origin.
-    // So a window that's really at (0, 30) may appear
-    // (to wxWin apps) to be at (0, 0).
-    if (GetParent())
-    {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        xx -= pt.x;
-        yy -= pt.y;
-    }
-
-    *x = xx;
-    *y = yy;

 }
 
 // ----------------------------------------------------------------------------
 // TranslateXXXEvent() functions
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // TranslateXXXEvent() functions
 // ----------------------------------------------------------------------------
 

-bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent)
+bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
+                           Widget widget, const XEvent *xevent)

 {
     switch (xevent->xany.type)
     {
 {
     switch (xevent->xany.type)
     {

-    case EnterNotify:
-    case LeaveNotify:
-    case ButtonPress:
-    case ButtonRelease:
-    case MotionNotify:
+        case EnterNotify:
+        case LeaveNotify:
+#if 0
+            fprintf(stderr, "Widget 0x%p <-> window %p (%s), %s\n",
+                    (WXWidget)widget, win, win->GetClassInfo()->GetClassName(),
+                    (xevent->xany.type == EnterNotify ? "ENTER" : "LEAVE"));
+#endif
+        case ButtonPress:
+        case ButtonRelease:
+        case MotionNotify:

         {
         {

+            int eventx = xevent->xbutton.x, eventy = xevent->xbutton.y;
+

             wxEventType eventType = wxEVT_NULL;
 
             if (xevent->xany.type == LeaveNotify)
             {
             wxEventType eventType = wxEVT_NULL;
 
             if (xevent->xany.type == LeaveNotify)
             {

-                win->m_button1Pressed = FALSE;
-                win->m_button2Pressed = FALSE;
-                win->m_button3Pressed = FALSE;
-                return FALSE;
+                eventType = wxEVT_LEAVE_WINDOW;
+            }
+            if (xevent->xany.type == EnterNotify)
+            {
+                eventType = wxEVT_ENTER_WINDOW;

             }
             else if (xevent->xany.type == MotionNotify)
             {
                 eventType = wxEVT_MOTION;
             }
             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)
             {
             }
             else if (xevent->xany.type == ButtonPress)
             {

+                wxevent.SetTimestamp(xevent->xbutton.time);
+                int button = 0;

                 if (xevent->xbutton.button == Button1)
                 {
                     eventType = wxEVT_LEFT_DOWN;
                 if (xevent->xbutton.button == Button1)
                 {
                     eventType = wxEVT_LEFT_DOWN;

-                    win->m_button1Pressed = TRUE;
+                    button = 1;

                 }
                 else if (xevent->xbutton.button == Button2)
                 {
                     eventType = wxEVT_MIDDLE_DOWN;
                 }
                 else if (xevent->xbutton.button == Button2)
                 {
                     eventType = wxEVT_MIDDLE_DOWN;

-                    win->m_button2Pressed = TRUE;
+                    button = 2;

                 }
                 else if (xevent->xbutton.button == Button3)
                 {
                     eventType = wxEVT_RIGHT_DOWN;
                 }
                 else if (xevent->xbutton.button == Button3)
                 {
                     eventType = wxEVT_RIGHT_DOWN;

-                    win->m_button3Pressed = TRUE;
+                    button = 3;
+                }
+
+                // check for a double click
+                //
+                long dclickTime = XtGetMultiClickTime(xevent->xany.display);
+                long ts = wxevent.GetTimestamp();
+
+                int buttonLast = win->GetLastClickedButton();
+                long lastTS = win->GetLastClickTime();
+                if ( buttonLast && buttonLast == button &&
+                     (ts - lastTS) < dclickTime )
+                {
+                    // I have a dclick
+                    win->SetLastClick(0, ts);
+                    if ( eventType == wxEVT_LEFT_DOWN )
+                        eventType = wxEVT_LEFT_DCLICK;
+                    else if ( eventType == wxEVT_MIDDLE_DOWN )
+                        eventType = wxEVT_MIDDLE_DCLICK;
+                    else if ( eventType == wxEVT_RIGHT_DOWN )
+                        eventType = wxEVT_RIGHT_DCLICK;
+                }
+                else
+                {
+                    // not fast enough or different button
+                    win->SetLastClick(button, ts);

                 }
             }
             else if (xevent->xany.type == ButtonRelease)
                 }
             }
             else if (xevent->xany.type == ButtonRelease)


@@ -2475,23 +2272,23 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
                 if (xevent->xbutton.button == Button1)
                 {
                     eventType = wxEVT_LEFT_UP;
                 if (xevent->xbutton.button == Button1)
                 {
                     eventType = wxEVT_LEFT_UP;

-                    win->m_button1Pressed = FALSE;

                 }
                 else if (xevent->xbutton.button == Button2)
                 {
                     eventType = wxEVT_MIDDLE_UP;
                 }
                 else if (xevent->xbutton.button == Button2)
                 {
                     eventType = wxEVT_MIDDLE_UP;

-                    win->m_button2Pressed = FALSE;

                 }
                 else if (xevent->xbutton.button == Button3)
                 {
                     eventType = wxEVT_RIGHT_UP;
                 }
                 else if (xevent->xbutton.button == Button3)
                 {
                     eventType = wxEVT_RIGHT_UP;

-                    win->m_button3Pressed = FALSE;

                 }
                 }

-                else return FALSE;
+                else
+                    return false;
+            }
+            else
+            {
+                return false;

             }
             }

-            else return FALSE;

 
 

-            wxevent.m_eventHandle = (char *)xevent;

             wxevent.SetEventType(eventType);
 
             Position x1, y1;
             wxevent.SetEventType(eventType);
 
             Position x1, y1;


@@ -2500,7 +2297,7 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
             int x2, y2;
             win->GetPosition(&x2, &y2);
 
             int x2, y2;
             win->GetPosition(&x2, &y2);
 

-            // The button x/y must be translated to wxWindows
+            // The button x/y must be translated to wxWidgets

             // window space - the widget might be a label or button,
             // within a form.
             int dx = 0;
             // window space - the widget might be a label or button,
             // within a form.
             int dx = 0;


@@ -2511,8 +2308,8 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
                 dy = y1;
             }
 
                 dy = y1;
             }
 

-            wxevent.m_x = xevent->xbutton.x + dx;
-            wxevent.m_y = xevent->xbutton.y + dy;
+            wxevent.m_x = eventx + dx;
+            wxevent.m_y = eventy + dy;

 
             wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
                 || (event_left_is_down (xevent)
 
             wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
                 || (event_left_is_down (xevent)


@@ -2524,38 +2321,46 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
                 || (event_right_is_down (xevent)
                 && (eventType != wxEVT_RIGHT_UP)));
 
                 || (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;
+            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;
+    return false;

 }
 
 }
 

-bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent)
+bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
+                         Widget WXUNUSED(widget), const XEvent *xevent)

 {
     switch (xevent->xany.type)
     {
     case KeyPress:
 {
     switch (xevent->xany.type)
     {
     case KeyPress:

+    case KeyRelease:

         {
             char buf[20];
 
             KeySym keySym;
         {
             char buf[20];
 
             KeySym keySym;

-#if 0
-            XComposeStatus compose;
-            (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, &compose);
-#endif // 0
-            (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
+            (void) XLookupString((XKeyEvent *)xevent, buf, 20, &keySym, NULL);

             int id = wxCharCodeXToWX (keySym);
             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)
 
             if (xevent->xkey.state & ShiftMask)

-                wxevent.m_shiftDown = TRUE;
+                wxevent.m_shiftDown = true;

             if (xevent->xkey.state & ControlMask)
             if (xevent->xkey.state & ControlMask)

-                wxevent.m_controlDown = TRUE;
+                wxevent.m_controlDown = true;

             if (xevent->xkey.state & Mod3Mask)
             if (xevent->xkey.state & Mod3Mask)

-                wxevent.m_altDown = TRUE;
+                wxevent.m_altDown = true;

             if (xevent->xkey.state & Mod1Mask)
             if (xevent->xkey.state & Mod1Mask)

-                wxevent.m_metaDown = TRUE;
+                wxevent.m_metaDown = true;

             wxevent.SetEventObject(win);
             wxevent.m_keyCode = id;
             wxevent.SetTimestamp(xevent->xkey.time);
             wxevent.SetEventObject(win);
             wxevent.m_keyCode = id;
             wxevent.SetTimestamp(xevent->xkey.time);


@@ -2564,15 +2369,14 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEve
             wxevent.m_y = xevent->xbutton.y;
 
             if (id > -1)
             wxevent.m_y = xevent->xbutton.y;
 
             if (id > -1)

-                return TRUE;
-            else
-                return FALSE;
-            break;
+                return true;
+
+            return false;

         }
     default:
         break;
     }
         }
     default:
         break;
     }

-    return FALSE;
+    return false;

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


@@ -2581,7 +2385,7 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEve
 
 #define YAllocColor XAllocColor
 XColor g_itemColors[5];
 
 #define YAllocColor XAllocColor
 XColor g_itemColors[5];

-int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
+int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore)

 {
     int result;
     static XmColorProc colorProc;
 {
     int result;
     static XmColorProc colorProc;


@@ -2590,9 +2394,9 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
 
     if (back)
     {
 
     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].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)
         {
         g_itemColors[0].flags = DoRed | DoGreen | DoBlue;
         if (colorProc == (XmColorProc) NULL)
         {


@@ -2610,9 +2414,9 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
     }
     if (fore)
     {
     }
     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].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;
         g_itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue;
         if (result == wxNO_COLORS)
             result = wxFORE_COLORS;


@@ -2635,8 +2439,7 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
             result = wxNO_COLORS;
     }
 
             result = wxNO_COLORS;
     }
 

-    return (result);
-
+    return result;

 }
 
 // Changes the foreground and background colours to be derived from the current
 }
 
 // Changes the foreground and background colours to be derived from the current


@@ -2646,83 +2449,38 @@ void wxWindow::ChangeBackgroundColour()
 {
     WXWidget mainWidget = GetMainWidget();
     if ( mainWidget )
 {
     WXWidget mainWidget = GetMainWidget();
     if ( mainWidget )

-        DoChangeBackgroundColour(mainWidget, m_backgroundColour);
-
-    // This not necessary
-#if 0
-
-    if (m_scrolledWindow && (GetMainWidget() != m_scrolledWindow))
-    {
-        DoChangeBackgroundColour(m_scrolledWindow, m_backgroundColour);
-        // Have to set the scrollbar colours back since
-        // the scrolled window seemed to change them
-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
-
-        if (m_hScrollBar)
-            DoChangeBackgroundColour(m_hScrollBar, backgroundColour);
-        if (m_vScrollBar)
-            DoChangeBackgroundColour(m_vScrollBar, backgroundColour);
-    }
-#endif
+        wxDoChangeBackgroundColour(mainWidget, m_backgroundColour);
+    if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
+        wxDoChangeForegroundColour(m_scrolledWindow, m_backgroundColour);

 }
 
 void wxWindow::ChangeForegroundColour()
 {
     WXWidget mainWidget = GetMainWidget();
     if ( mainWidget )
 }
 
 void wxWindow::ChangeForegroundColour()
 {
     WXWidget mainWidget = GetMainWidget();
     if ( mainWidget )

-        DoChangeForegroundColour(mainWidget, m_foregroundColour);
+        wxDoChangeForegroundColour(mainWidget, m_foregroundColour);

     if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
     if ( m_scrolledWindow && mainWidget != m_scrolledWindow )

-        DoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);
+        wxDoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);

 }
 
 }
 

-// Change a widget's foreground and background colours.
-void wxWindow::DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
+bool wxWindow::SetBackgroundColour(const wxColour& col)

 {
 {

-    // 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.
+    if ( !wxWindowBase::SetBackgroundColour(col) )
+        return false;

 
 

-    Widget w = (Widget)widget;
-    XtVaSetValues(
-                  w,
-                  XmNforeground, foregroundColour.AllocColour(XtDisplay(w)),
-                  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);
+    ChangeBackgroundColour();

 
 

-    if (changeArmColour)
-        XtVaSetValues ((Widget) widget,
-        XmNarmColor, g_itemColors[wxSELE_INDEX].pixel,
-        NULL);
+    return true;

 }
 
 }
 

-void wxWindow::SetBackgroundColour(const wxColour& col)
+bool wxWindow::SetForegroundColour(const wxColour& col)

 {
 {

-    m_backgroundColour = col;
-    ChangeBackgroundColour();
-}
+    if ( !wxWindowBase::SetForegroundColour(col) )
+        return false;

 
 

-void wxWindow::SetForegroundColour(const wxColour& col)
-{
-    m_foregroundColour = col;

     ChangeForegroundColour();
     ChangeForegroundColour();

+
+    return true;

 }
 
 void wxWindow::ChangeFont(bool keepOriginalSize)
 }
 
 void wxWindow::ChangeFont(bool keepOriginalSize)


@@ -2731,26 +2489,35 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
     // to its original size! We therefore have to set the size
     // back again. TODO: a better way in Motif?
     Widget w = (Widget) GetLabelWidget(); // Usually the main widget
     // to its original size! We therefore have to set the size
     // back again. TODO: a better way in Motif?
     Widget w = (Widget) GetLabelWidget(); // Usually the main widget

-    if (w && m_windowFont.Ok())
+    if (w && m_font.IsOk())

     {
         int width, height, width1, height1;
         GetSize(& width, & height);
 
     {
         int width, height, width1, height1;
         GetSize(& width, & height);
 

-        // lesstif 0.87 hangs here
-#ifndef LESSTIF_VERSION
-        XtVaSetValues (w,
-            XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(w)),
-            NULL);
-#endif
+        wxDoChangeFont( w, m_font );

 
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {
 
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {

-            SetSize(-1, -1, width, height);
+            SetSize(wxDefaultCoord, wxDefaultCoord, width, height);

         }
     }
 }
 
         }
     }
 }
 

+// Post-creation
+void wxWindow::PostCreation()
+{
+    ChangeFont();
+    ChangeForegroundColour();
+    ChangeBackgroundColour();
+}
+
+// Pre-creation
+void wxWindow::PreCreation()
+{
+    InheritAttributes();
+}
+

 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------


@@ -2758,27 +2525,173 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
 wxWindow *wxGetActiveWindow()
 {
     // TODO
 wxWindow *wxGetActiveWindow()
 {
     // TODO

+    wxFAIL_MSG("Not implemented");

     return NULL;
 }
 
     return NULL;
 }
 

-// ----------------------------------------------------------------------------
-// wxNoOptimize: switch off size optimization
-// ----------------------------------------------------------------------------
+/* static */
+wxWindow *wxWindowBase::GetCapture()
+{
+    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;

 
 

-int wxNoOptimize::m_count = 0;
+    XQueryPointer (display,
+                   rootWindow,
+                   &rootReturn,
+                   &childReturn,
+                   &rootX, &rootY, &winX, &winY, &maskReturn);
+}

 
 

-wxNoOptimize::wxNoOptimize()
+// Get the current mouse position.
+wxPoint wxGetMousePosition()

 {
 {

-    m_count ++;
+    int x, y;
+    unsigned mask;
+
+    wxGetMouseState(x, y, mask);
+    return wxPoint(x, y);

 }
 
 }
 

-wxNoOptimize::~wxNoOptimize()
+wxMouseState wxGetMouseState()

 {
 {

-    m_count --;
+    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;

 }
 
 }
 

-bool wxNoOptimize::CanOptimize()
+
+#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)

 {
 {

-    return (m_count == 0);
+    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;