Doc mods, sash window bug

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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 3f2ba314ed696989087ca321be2589f4d879bb5b..139f5cced43c91fa398dbb0551dcdc7c6e6b2165 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -31,7 +31,7 @@
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 

-#if  USE_DRAG_AND_DROP
+#if  wxUSE_DRAG_AND_DROP

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


@@ -52,6 +52,12 @@ void wxCanvasRepaintProc (Widget, XtPointer, XmDrawingAreaCallbackStruct * cbs);
 void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs);
 void wxCanvasMotionEvent (Widget, XButtonEvent * event);
 void wxCanvasEnterLeave (Widget drawingArea, XtPointer clientData, XCrossingEvent * event);
 void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs);
 void wxCanvasMotionEvent (Widget, XButtonEvent * event);
 void wxCanvasEnterLeave (Widget drawingArea, XtPointer clientData, XCrossingEvent * event);

+static void wxScrollBarCallback(Widget widget, XtPointer clientData,
+                                XmScaleCallbackStruct *cbs);
+void wxPanelItemEventHandler (Widget    wid,
+                              XtPointer client_data,
+                              XEvent*   event,
+                              Boolean *continueToDispatch);

 
 #define event_left_is_down(x) ((x)->xbutton.state & Button1Mask)
 #define event_middle_is_down(x) ((x)->xbutton.state & Button2Mask)
 
 #define event_left_is_down(x) ((x)->xbutton.state & Button1Mask)
 #define event_middle_is_down(x) ((x)->xbutton.state & Button2Mask)


@@ -63,11 +69,13 @@ extern wxList wxPendingDelete;
 IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)

-  EVT_CHAR(wxWindow::OnChar)
-  EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-  EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-  EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-  EVT_IDLE(wxWindow::OnIdle)
+EVT_CHAR(wxWindow::OnChar)
+EVT_KEY_DOWN(wxWindow::OnKeyDown)
+EVT_KEY_UP(wxWindow::OnKeyUp)
+EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
+EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
+EVT_INIT_DIALOG(wxWindow::OnInitDialog)
+EVT_IDLE(wxWindow::OnIdle)

 END_EVENT_TABLE()
 
 #endif
 END_EVENT_TABLE()
 
 #endif


@@ -95,15 +103,16 @@ wxWindow::wxWindow()
     m_caretWidth = 0; m_caretHeight = 0;
     m_caretEnabled = FALSE;
     m_caretShown = FALSE;
     m_caretWidth = 0; m_caretHeight = 0;
     m_caretEnabled = FALSE;
     m_caretShown = FALSE;

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
+    // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
+    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;

     m_foregroundColour = *wxBLACK;
     m_foregroundColour = *wxBLACK;

-    m_defaultForegroundColour = *wxBLACK ;
-    m_defaultBackgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
-
-#if  USE_DRAG_AND_DROP
+    
+#if  wxUSE_DRAG_AND_DROP

     m_pDropTarget = NULL;
 #endif
     m_pDropTarget = NULL;
 #endif

-
+    m_clientObject = (wxClientData*) NULL;
+    m_clientData = NULL;
+    

     /// Motif-specific
     m_mainWidget = (WXWidget) 0;
     m_button1Pressed = FALSE;
     /// Motif-specific
     m_mainWidget = (WXWidget) 0;
     m_button1Pressed = FALSE;


@@ -118,8 +127,6 @@ wxWindow::wxWindow()
     m_drawingArea = (WXWidget) 0;
     m_hScroll = FALSE;
     m_vScroll = FALSE;
     m_drawingArea = (WXWidget) 0;
     m_hScroll = FALSE;
     m_vScroll = FALSE;

-    m_hScrollingEnabled = FALSE;
-    m_vScrollingEnabled = FALSE;

     m_backingPixmap = (WXPixmap) 0;
     m_pixmapWidth = 0;
     m_pixmapHeight = 0;
     m_backingPixmap = (WXPixmap) 0;
     m_pixmapWidth = 0;
     m_pixmapHeight = 0;


@@ -127,65 +134,70 @@ wxWindow::wxWindow()
     m_pixmapOffsetY = 0;
     m_lastTS = 0;
     m_lastButton = 0;
     m_pixmapOffsetY = 0;
     m_lastTS = 0;
     m_lastButton = 0;

+    m_canAddEventHandler = FALSE;
+    m_scrollPosX = 0;
+    m_scrollPosY = 0;

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

-  //// Motif-specific
-
-  // If m_drawingArea, we're a fully-fledged window with drawing area, scrollbars etc. (what wxCanvas used to be)
-  if (m_drawingArea)
-  {
-    // Destroy children before destroying self
-    DestroyChildren();
-
-    if (m_backingPixmap)
-      XFreePixmap (XtDisplay ((Widget) GetMainWidget()), (Pixmap) m_backingPixmap);
-
-    Widget w = (Widget) m_drawingArea;
-    wxDeleteWindowFromTable(w);
-
-    if (w)
-      XtDestroyWidget(w);
-    m_mainWidget = (WXWidget) 0;
-
-    // Only if we're _really_ a canvas (not a dialog box/panel)
-    if (m_scrolledWindow)
-    {
-      wxDeleteWindowFromTable((Widget) m_scrolledWindow);
-    }
-
-    if (m_hScrollBar)
-    {
-      XtUnmanageChild ((Widget) m_hScrollBar);
-      XtDestroyWidget ((Widget) m_hScrollBar);
-    }
-    if (m_vScrollBar)
-    {
-      XtUnmanageChild ((Widget) m_vScrollBar);
-      XtDestroyWidget ((Widget) m_vScrollBar);
-    }
-    if (m_scrolledWindow)
-    {
-      XtUnmanageChild ((Widget) m_scrolledWindow);
-      XtDestroyWidget ((Widget) m_scrolledWindow);
-    }
-
-    if (m_borderWidget)
+    //// Motif-specific
+    
+    if (GetMainWidget())
+        DetachWidget(GetMainWidget()); // Removes event handlers
+    
+    // If m_drawingArea, we're a fully-fledged window with drawing area, scrollbars etc. (what wxCanvas used to be)
+    if (m_drawingArea)

     {
     {

-      XtDestroyWidget ((Widget) m_borderWidget);
-      m_borderWidget = (WXWidget) 0;
+        // Destroy children before destroying self
+        DestroyChildren();
+        
+        if (m_backingPixmap)
+            XFreePixmap (XtDisplay ((Widget) GetMainWidget()), (Pixmap) m_backingPixmap);
+        
+        Widget w = (Widget) m_drawingArea;
+        wxDeleteWindowFromTable(w);
+        
+        if (w)
+            XtDestroyWidget(w);
+        m_mainWidget = (WXWidget) 0;
+        
+        // Only if we're _really_ a canvas (not a dialog box/panel)
+        if (m_scrolledWindow)
+        {
+            wxDeleteWindowFromTable((Widget) m_scrolledWindow);
+        }
+        
+        if (m_hScrollBar)
+        {
+            XtUnmanageChild ((Widget) m_hScrollBar);
+            XtDestroyWidget ((Widget) m_hScrollBar);
+        }
+        if (m_vScrollBar)
+        {
+            XtUnmanageChild ((Widget) m_vScrollBar);
+            XtDestroyWidget ((Widget) m_vScrollBar);
+        }
+        if (m_scrolledWindow)
+        {
+            XtUnmanageChild ((Widget) m_scrolledWindow);
+            XtDestroyWidget ((Widget) m_scrolledWindow);
+        }
+        
+        if (m_borderWidget)
+        {
+            XtDestroyWidget ((Widget) m_borderWidget);
+            m_borderWidget = (WXWidget) 0;
+        }

     }
     }

-  }
-
-
-  //// Generic stuff
-
-       // Have to delete constraints/sizer FIRST otherwise
-       // sizers may try to look at deleted windows as they
-       // delete themselves.
-#if USE_CONSTRAINTS
+    
+    //// Generic stuff
+    
+    // Have to delete constraints/sizer FIRST otherwise
+    // sizers may try to look at deleted windows as they
+    // delete themselves.
+#if wxUSE_CONSTRAINTS

     DeleteRelatedConstraints();
     if (m_constraints)
     {
     DeleteRelatedConstraints();
     if (m_constraints)
     {


@@ -204,30 +216,32 @@ wxWindow::~wxWindow()
     if (m_sizerParent)
         m_sizerParent->RemoveChild((wxWindow *)this);
 #endif
     if (m_sizerParent)
         m_sizerParent->RemoveChild((wxWindow *)this);
 #endif

-
+    

     if (m_windowParent)
         m_windowParent->RemoveChild(this);
     if (m_windowParent)
         m_windowParent->RemoveChild(this);

-
+    

     DestroyChildren();
     DestroyChildren();

-
+    

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

-      wxDeleteWindowFromTable((Widget) GetMainWidget());
-      XtDestroyWidget((Widget) GetMainWidget());
-      SetMainWidget((WXWidget) NULL);
+        wxDeleteWindowFromTable((Widget) GetMainWidget());
+        XtDestroyWidget((Widget) GetMainWidget());
+        SetMainWidget((WXWidget) NULL);

     }
     }

-
+    

     delete m_children;
     m_children = NULL;
     delete m_children;
     m_children = NULL;

-
+    

     // Just in case the window has been Closed, but
     // we're then deleting immediately: don't leave
     // dangling pointers.
     wxPendingDelete.DeleteObject(this);
     // Just in case the window has been Closed, but
     // we're then deleting immediately: don't leave
     // dangling pointers.
     wxPendingDelete.DeleteObject(this);

-
-    if ( m_windowValidator )
-           delete m_windowValidator;
+    
+    if ( m_windowValidator ) delete m_windowValidator;
+    if (m_clientObject) delete m_clientObject;
+    
+    ClearUpdateRects();

 }
 
 // Destroy the window (delayed, if a managed window)
 }
 
 // Destroy the window (delayed, if a managed window)


@@ -239,10 +253,10 @@ bool wxWindow::Destroy()
 
 // Constructor
 bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 
 // Constructor
 bool wxWindow::Create(wxWindow *parent, wxWindowID id,

-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxString& name)

 {
     // Generic
     m_windowId = 0;
 {
     // Generic
     m_windowId = 0;


@@ -257,7 +271,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     m_sizerParent = NULL;
     m_autoLayout = FALSE;
     m_windowValidator = NULL;
     m_sizerParent = NULL;
     m_autoLayout = FALSE;
     m_windowValidator = NULL;

-#if USE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP

     m_pDropTarget = NULL;
 #endif
     m_caretWidth = 0; m_caretHeight = 0;
     m_pDropTarget = NULL;
 #endif
     m_caretWidth = 0; m_caretHeight = 0;


@@ -269,8 +283,11 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     m_maxSizeY = -1;
     m_defaultItem = NULL;
     m_windowParent = NULL;
     m_maxSizeY = -1;
     m_defaultItem = NULL;
     m_windowParent = NULL;

-
+    m_clientObject = (wxClientData*) NULL;
+    m_clientData = NULL;
+    

     // Motif-specific
     // Motif-specific

+    m_canAddEventHandler = FALSE;

     m_mainWidget = (WXWidget) 0;
     m_button1Pressed = FALSE;
     m_button2Pressed = FALSE;
     m_mainWidget = (WXWidget) 0;
     m_button1Pressed = FALSE;
     m_button2Pressed = FALSE;


@@ -284,207 +301,346 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     m_drawingArea = (WXWidget) 0;
     m_hScroll = FALSE;
     m_vScroll = FALSE;
     m_drawingArea = (WXWidget) 0;
     m_hScroll = FALSE;
     m_vScroll = FALSE;

-    m_hScrollingEnabled = FALSE;
-    m_vScrollingEnabled = FALSE;

     m_backingPixmap = (WXPixmap) 0;
     m_pixmapWidth = 0;
     m_pixmapHeight = 0;
     m_pixmapOffsetX = 0;
     m_pixmapOffsetY = 0;
     m_backingPixmap = (WXPixmap) 0;
     m_pixmapWidth = 0;
     m_pixmapHeight = 0;
     m_pixmapOffsetX = 0;
     m_pixmapOffsetY = 0;

-
+    m_scrollPosX = 0;
+    m_scrollPosY = 0;
+    

     if (!parent)
         return FALSE;
     if (!parent)
         return FALSE;

-
+    

     if (parent) parent->AddChild(this);
     if (parent) parent->AddChild(this);

-
+    

     m_returnCode = 0;
     m_returnCode = 0;

-
+    

     SetName(name);
     SetName(name);

-
+    

     if ( id == -1 )
     if ( id == -1 )

-       m_windowId = (int)NewControlId();
+        m_windowId = (int)NewControlId();

     else
     else

-       m_windowId = id;
-
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
+        m_windowId = id;
+    
+    // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
+    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;

     m_foregroundColour = *wxBLACK;
     m_foregroundColour = *wxBLACK;

-    m_defaultForegroundColour = *wxBLACK ;
-    m_defaultBackgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
-
+    

     m_windowStyle = style;
     m_windowStyle = style;

-
+    

     if ( id == -1 )
     if ( id == -1 )

-       m_windowId = (int)NewControlId();
+        m_windowId = (int)NewControlId();

     else
     else

-       m_windowId = id;
-
+        m_windowId = id;
+    

     //// TODO: we should probably optimize by only creating a
     //// a drawing area if we have one or more scrollbars (wxVSCROLL/wxHSCROLL).
     //// But for now, let's simplify things by always creating the
     //// drawing area, since otherwise the translations are different.
     //// TODO: we should probably optimize by only creating a
     //// a drawing area if we have one or more scrollbars (wxVSCROLL/wxHSCROLL).
     //// But for now, let's simplify things by always creating the
     //// drawing area, since otherwise the translations are different.

-
-  // New translations for getting mouse motion feedback
-  String translations =
-  "<Btn1Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
-     <Btn2Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
-     <Btn3Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
-     <BtnMotion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
-     <Btn1Down>: DrawingAreaInput() ManagerGadgetArm()\n\
-     <Btn2Down>: DrawingAreaInput() ManagerGadgetArm()\n\
-     <Btn3Down>: DrawingAreaInput() ManagerGadgetArm()\n\
-     <Btn1Up>: DrawingAreaInput() ManagerGadgetActivate()\n\
-     <Btn2Up>: DrawingAreaInput() ManagerGadgetActivate()\n\
-     <Btn3Up>: DrawingAreaInput() ManagerGadgetActivate()\n\
-     <Motion>: wxCanvasMotionEvent() DrawingAreaInput()\n\
-     <EnterWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
-     <LeaveWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
-     <Key>: DrawingAreaInput()";
-
-  XtActionsRec actions[1];
-  actions[0].string = "wxCanvasMotionEvent";
-  actions[0].proc = (XtActionProc) wxCanvasMotionEvent;
-  XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
-
-  Widget parentWidget = (Widget) parent->GetClientWidget(); 
-  if (style & wxBORDER)
-    m_borderWidget = (WXWidget) XtVaCreateManagedWidget ("canvasBorder",
-                                     xmFrameWidgetClass, parentWidget,
-                                           XmNshadowType, XmSHADOW_IN,
-                                           NULL);
-
-  m_scrolledWindow = (WXWidget) XtVaCreateManagedWidget ("scrolledWindow",
-                                           xmScrolledWindowWidgetClass, m_borderWidget ? (Widget) m_borderWidget : parentWidget,
-                                  XmNspacing, 0,
-                                 XmNscrollingPolicy, XmAPPLICATION_DEFINED,
-                                           NULL);
-
-  XtTranslations ptr;
-  m_drawingArea = (WXWidget) XtVaCreateWidget ((char*) (const char*) name,
-                                  xmDrawingAreaWidgetClass, (Widget) m_scrolledWindow,
-                                        XmNunitType, XmPIXELS,
-//                                      XmNresizePolicy, XmRESIZE_ANY,
-                                        XmNresizePolicy, XmRESIZE_NONE,
-                                         XmNmarginHeight, 0,
-                                         XmNmarginWidth, 0,
-             XmNtranslations, ptr = XtParseTranslationTable (translations),
-                                        NULL);
-  /*
-  if (GetWindowStyleFlag() & wxOVERRIDE_KEY_TRANSLATIONS)
-  {
-    XtFree ((char *) ptr);
-    ptr = XtParseTranslationTable ("<Key>: DrawingAreaInput()");
-    XtOverrideTranslations ((Widget) m_drawingArea, ptr);
+    
+    // New translations for getting mouse motion feedback
+    String translations =
+    "<Btn1Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
+<Btn2Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
+<Btn3Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
+<BtnMotion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
+<Btn1Down>: DrawingAreaInput() ManagerGadgetArm()\n\
+<Btn2Down>: DrawingAreaInput() ManagerGadgetArm()\n\
+<Btn3Down>: DrawingAreaInput() ManagerGadgetArm()\n\
+<Btn1Up>: DrawingAreaInput() ManagerGadgetActivate()\n\
+<Btn2Up>: DrawingAreaInput() ManagerGadgetActivate()\n\
+<Btn3Up>: DrawingAreaInput() ManagerGadgetActivate()\n\
+<Motion>: wxCanvasMotionEvent() DrawingAreaInput()\n\
+<EnterWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
+<LeaveWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
+<Key>: DrawingAreaInput()";
+    
+    XtActionsRec actions[1];
+    actions[0].string = "wxCanvasMotionEvent";
+    actions[0].proc = (XtActionProc) wxCanvasMotionEvent;
+    XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
+    
+    Widget parentWidget = (Widget) parent->GetClientWidget(); 
+    if (style & wxBORDER)
+        m_borderWidget = (WXWidget) XtVaCreateManagedWidget ("canvasBorder",
+        xmFrameWidgetClass, parentWidget,
+        XmNshadowType, XmSHADOW_IN,
+        NULL);
+    
+    m_scrolledWindow = (WXWidget) XtVaCreateManagedWidget ("scrolledWindow",
+        xmScrolledWindowWidgetClass, m_borderWidget ? (Widget) m_borderWidget : parentWidget,
+        XmNresizePolicy, XmRESIZE_NONE,
+        XmNspacing, 0,
+        XmNscrollingPolicy, XmAPPLICATION_DEFINED,
+        //                                  XmNscrollBarDisplayPolicy, XmAS_NEEDED,
+        NULL);
+    
+    XtTranslations ptr;
+    m_drawingArea = (WXWidget) XtVaCreateWidget ((char*) (const char*) name,
+        xmDrawingAreaWidgetClass, (Widget) m_scrolledWindow,
+        XmNunitType, XmPIXELS,
+        //                                      XmNresizePolicy, XmRESIZE_ANY,
+        XmNresizePolicy, XmRESIZE_NONE,
+        XmNmarginHeight, 0,
+        XmNmarginWidth, 0,
+        XmNtranslations, ptr = XtParseTranslationTable (translations),
+        NULL);
+        /*
+        if (GetWindowStyleFlag() & wxOVERRIDE_KEY_TRANSLATIONS)
+        {
+        XtFree ((char *) ptr);
+        ptr = XtParseTranslationTable ("<Key>: DrawingAreaInput()");
+        XtOverrideTranslations ((Widget) m_drawingArea, ptr);
+        XtFree ((char *) ptr);
+        }
+    */
+    
+    wxAddWindowToTable((Widget) m_drawingArea, this);
+    wxAddWindowToTable((Widget) m_scrolledWindow, this);
+    
+    /*
+    * This order is very important in Motif 1.2.1
+    *
+    */
+    
+    XtRealizeWidget ((Widget) m_scrolledWindow);
+    XtRealizeWidget ((Widget) m_drawingArea);
+    XtManageChild ((Widget) m_drawingArea);
+    
+    XtOverrideTranslations ((Widget) m_drawingArea,
+        ptr = XtParseTranslationTable ("<Configure>: resize()"));

     XtFree ((char *) ptr);
     XtFree ((char *) ptr);

-  }
-  */
-
-  wxAddWindowToTable((Widget) m_drawingArea, this);
-  wxAddWindowToTable((Widget) m_scrolledWindow, this);
-
-  /*
-   * This order is very important in Motif 1.2.1
-   *
-   */
-
-  XtRealizeWidget ((Widget) m_scrolledWindow);
-  XtRealizeWidget ((Widget) m_drawingArea);
-  XtManageChild ((Widget) m_drawingArea);
-
-  XtOverrideTranslations ((Widget) m_drawingArea,
-                  ptr = XtParseTranslationTable ("<Configure>: resize()"));
-  XtFree ((char *) ptr);
-
-  XtAddCallback ((Widget) m_drawingArea, XmNexposeCallback, (XtCallbackProc) wxCanvasRepaintProc, (XtPointer) this);
-  XtAddCallback ((Widget) m_drawingArea, XmNinputCallback, (XtCallbackProc) wxCanvasInputEvent, (XtPointer) this);
-
-  /* TODO?
-  display = XtDisplay (scrolledWindow);
-  xwindow = XtWindow (drawingArea);
-  */
-
-  XtAddEventHandler ((Widget) m_drawingArea, PointerMotionHintMask | EnterWindowMask | LeaveWindowMask | FocusChangeMask,
-    False, (XtEventHandler) wxCanvasEnterLeave, (XtPointer) this);
-
+    
+    XtAddCallback ((Widget) m_drawingArea, XmNexposeCallback, (XtCallbackProc) wxCanvasRepaintProc, (XtPointer) this);
+    XtAddCallback ((Widget) m_drawingArea, XmNinputCallback, (XtCallbackProc) wxCanvasInputEvent, (XtPointer) this);
+    
+    /* TODO?
+    display = XtDisplay (scrolledWindow);
+    xwindow = XtWindow (drawingArea);
+    */
+    
+    XtAddEventHandler ((Widget) m_drawingArea, PointerMotionHintMask | EnterWindowMask | LeaveWindowMask | FocusChangeMask,
+        False, (XtEventHandler) wxCanvasEnterLeave, (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);
+    
+    /*
+    if (m_hScrollBar)
+    XtRealizeWidget ((Widget) m_hScrollBar);
+    if (m_vScrollBar)
+    XtRealizeWidget ((Widget) m_vScrollBar);
+    */
+    
+    // Without this, the cursor may not be restored properly
+    // (e.g. in splitter sample).
+    SetCursor(*wxSTANDARD_CURSOR);
+    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    SetSize(pos.x, pos.y, size.x, size.y);
+    

     return TRUE;
 }
 
     return TRUE;
 }
 

+// Helper function
+void wxWindow::CreateScrollbar(int orientation)
+{
+    if (!m_drawingArea)
+        return;
+    
+    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
+    
+    // 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;
+        
+        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
+        
+        XtRealizeWidget(hScrollBar);
+        
+        XtVaSetValues((Widget) m_scrolledWindow,
+            XmNhorizontalScrollBar, (Widget) m_hScrollBar,
+            NULL);
+        
+        m_hScroll = TRUE;
+    }
+    
+    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 = (WXWidget) vScrollBar;
+        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
+        
+        XtRealizeWidget(vScrollBar);
+        
+        XtVaSetValues((Widget) m_scrolledWindow,
+            XmNverticalScrollBar, (Widget) m_vScrollBar,
+            NULL);
+        
+        m_vScroll = TRUE;
+    }
+    
+    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
+}
+void wxWindow::DestroyScrollbar(int orientation)
+{
+    if (!m_drawingArea)
+        return;
+    
+    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);
+        
+    }
+    
+    if (orientation == wxVERTICAL)
+    {
+        if (m_vScrollBar)
+        {
+            XtDestroyWidget((Widget) m_vScrollBar);
+        }
+        m_vScrollBar = (WXWidget) 0;
+        m_vScroll = TRUE;
+        
+        XtVaSetValues((Widget) m_scrolledWindow,
+            XmNverticalScrollBar, (Widget) 0,
+            NULL);
+        
+    }
+    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
+}
+

 void wxWindow::SetFocus()
 {
 void wxWindow::SetFocus()
 {

-  XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT);
-  XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT);
+    XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT);
+    XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT);

 }
 
 void wxWindow::Enable(bool enable)
 {
 }
 
 void wxWindow::Enable(bool enable)
 {

-  if (GetMainWidget())
-  {
-    XtSetSensitive((Widget) GetMainWidget(), enable);
-    XmUpdateDisplay((Widget) GetMainWidget());
-  }
+    if (GetMainWidget())
+    {
+        XtSetSensitive((Widget) GetMainWidget(), enable);
+        XmUpdateDisplay((Widget) GetMainWidget());
+    }

 }
 
 void wxWindow::CaptureMouse()
 {
 }
 
 void wxWindow::CaptureMouse()
 {

-  if (m_winCaptured)
-    return;
+    if (m_winCaptured)
+        return;

     
     

-  if (GetMainWidget())
-    XtAddGrab((Widget) GetMainWidget(), TRUE, FALSE);
-
-  m_winCaptured = TRUE;
+    if (GetMainWidget())
+        XtAddGrab((Widget) GetMainWidget(), TRUE, FALSE);
+    
+    m_winCaptured = TRUE;

 }
 
 void wxWindow::ReleaseMouse()
 {
 }
 
 void wxWindow::ReleaseMouse()
 {

-  if (!m_winCaptured)
-    return;
+    if (!m_winCaptured)
+        return;

     
     

-  if (GetMainWidget())
-    XtRemoveGrab((Widget) GetMainWidget());
-  m_winCaptured = FALSE;
+    if (GetMainWidget())
+        XtRemoveGrab((Widget) GetMainWidget());
+    m_winCaptured = FALSE;

 }
 
 // Push/pop event handler (i.e. allow a chain of event handlers
 // be searched)
 void wxWindow::PushEventHandler(wxEvtHandler *handler)
 {
 }
 
 // Push/pop event handler (i.e. allow a chain of event handlers
 // be searched)
 void wxWindow::PushEventHandler(wxEvtHandler *handler)
 {

-       handler->SetNextHandler(GetEventHandler());
-       SetEventHandler(handler);
+    handler->SetNextHandler(GetEventHandler());
+    SetEventHandler(handler);

 }
 
 wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
 {
 }
 
 wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
 {

-       if ( GetEventHandler() )
-       {
-               wxEvtHandler *handlerA = GetEventHandler();
-               wxEvtHandler *handlerB = handlerA->GetNextHandler();
-               handlerA->SetNextHandler(NULL);
-               SetEventHandler(handlerB);
-               if ( deleteHandler )
-               {
-                       delete handlerA;
-                       return NULL;
-               }
-               else
-                       return handlerA;
-       }
-       else
-               return NULL;
-}
-
-#if    USE_DRAG_AND_DROP
+    if ( GetEventHandler() )
+    {
+        wxEvtHandler *handlerA = GetEventHandler();
+        wxEvtHandler *handlerB = handlerA->GetNextHandler();
+        handlerA->SetNextHandler(NULL);
+        SetEventHandler(handlerB);
+        if ( deleteHandler )
+        {
+            delete handlerA;
+            return NULL;
+        }
+        else
+            return handlerA;
+    }
+    else
+        return NULL;
+}
+
+#if    wxUSE_DRAG_AND_DROP

 
 void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 {
 
 void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 {

-  if ( m_pDropTarget != 0 ) {
-    delete m_pDropTarget;
-  }
-
-  m_pDropTarget = pDropTarget;
-  if ( m_pDropTarget != 0 )
-  {
-    // TODO
-  }
+    if ( m_pDropTarget != 0 ) {
+        delete m_pDropTarget;
+    }
+    
+    m_pDropTarget = pDropTarget;
+    if ( m_pDropTarget != 0 )
+    {
+        // TODO
+    }

 }
 
 #endif
 }
 
 #endif


@@ -498,126 +654,183 @@ void wxWindow::DragAcceptFiles(bool accept)
 // Get total size
 void wxWindow::GetSize(int *x, int *y) const
 {
 // Get total size
 void wxWindow::GetSize(int *x, int *y) const
 {

-  if (m_drawingArea)
-  {
-    CanvasGetSize(x, y);
-    return;
-  }
-
-  Widget widget = (Widget) GetMainWidget();
-  Dimension xx, yy;
-  XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
-  *x = xx; *y = yy;
+    if (m_drawingArea)
+    {
+        CanvasGetSize(x, y);
+        return;
+    }
+    
+    Widget widget = (Widget) GetTopWidget();
+    Dimension xx, yy;
+    XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
+    *x = xx; *y = yy;

 }
 
 void wxWindow::GetPosition(int *x, int *y) const
 {
 }
 
 void wxWindow::GetPosition(int *x, int *y) const
 {

-  if (m_drawingArea)
-  {
-    CanvasGetPosition(x, y);
-    return;
-  }
-  Widget widget = (Widget) GetMainWidget();
-  Position xx, yy;
-  XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL);
-  *x = xx; *y = yy;
+    if (m_drawingArea)
+    {
+        CanvasGetPosition(x, y);
+        return;
+    }
+    Widget widget = (Widget) GetTopWidget();
+    Position xx, yy;
+    XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL);
+    
+    // We may be faking the client origin.
+    // So a window that's really at (0, 30) may appear
+    // (to wxWin apps) to be at (0, 0).
+    if (GetParent())
+    {
+        wxPoint pt(GetParent()->GetClientAreaOrigin());
+        xx -= pt.x;
+        yy -= pt.y;
+    }
+    
+    *x = xx; *y = yy;

 }
 
 void wxWindow::ScreenToClient(int *x, int *y) const
 {
 }
 
 void wxWindow::ScreenToClient(int *x, int *y) const
 {

-    // TODO
+    Widget widget = (Widget) GetClientWidget();
+    Display *display = XtDisplay((Widget) GetMainWidget());
+    Window rootWindow = RootWindowOfScreen(XtScreen(widget));
+    Window thisWindow = XtWindow(widget);
+    
+    Window childWindow;
+    int xx = *x;
+    int yy = *y;
+    XTranslateCoordinates(display, rootWindow, thisWindow, xx, yy, x, y, &childWindow);

 }
 
 void wxWindow::ClientToScreen(int *x, int *y) const
 {
 }
 
 void wxWindow::ClientToScreen(int *x, int *y) const
 {

-  Widget widget = (Widget) GetMainWidget();
-  Display *display = XtDisplay(widget);
-  Window rootWindow = RootWindowOfScreen(XtScreen(widget));
-  Window thisWindow;
-  if (this->IsKindOf(CLASSINFO(wxFrame)))
-  {
-    wxFrame *fr = (wxFrame *)this;
-    // TODO
-    //    thisWindow = XtWindow(fr->m_clientArea);
-  }
-  else
-    thisWindow = XtWindow((Widget)widget);
-
-  Window childWindow;
-  int xx = *x;
-  int yy = *y;
-  XTranslateCoordinates(display, thisWindow, rootWindow, xx, yy, x, y, &childWindow);
+    Widget widget = (Widget) GetClientWidget();
+    Display *display = XtDisplay(widget);
+    Window rootWindow = RootWindowOfScreen(XtScreen(widget));
+    Window thisWindow = XtWindow(widget);
+    
+    Window childWindow;
+    int xx = *x;
+    int yy = *y;
+    XTranslateCoordinates(display, thisWindow, rootWindow, xx, yy, x, y, &childWindow);

 }
 
 void wxWindow::SetCursor(const wxCursor& cursor)
 {
 }
 
 void wxWindow::SetCursor(const wxCursor& cursor)
 {

-  m_windowCursor = cursor;
-  if (m_windowCursor.Ok())
-  {
-    /* TODO when wxCursor implemented
-    WXDisplay *dpy = GetXDisplay();
-    Cursor x_cursor = cursor.GetXCursor(dpy);
-
-    Widget w = (Widget) GetMainWidget();
-    Window win = XtWindow(w);
-    XDefineCursor((Display*) dpy, win, x_cursor);
-    */
-  }
+    m_windowCursor = cursor;
+    if (m_windowCursor.Ok())
+    {
+        WXDisplay *dpy = GetXDisplay();
+        WXCursor x_cursor = ((wxCursor&)cursor).GetXCursor(dpy);
+        
+        Widget w = (Widget) GetMainWidget();
+        Window win = XtWindow(w);
+        XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);
+    }

 }
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 void wxWindow::GetClientSize(int *x, int *y) const
 {
 }
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 void wxWindow::GetClientSize(int *x, int *y) const
 {

-  Widget widget = (Widget) GetMainWidget();
-  Dimension xx, yy;
-  XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
-  *x = xx; *y = yy;
+    Widget widget = (Widget) GetClientWidget();
+    Dimension xx, yy;
+    XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
+    *x = xx; *y = yy;

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

-  if (m_drawingArea)
-  {
-    CanvasSetSize(x, y, width, height, sizeFlags);
-    return;
-  }
-  Widget widget = (Widget) GetMainWidget();
-
-  if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    XtVaSetValues(widget, XmNx, x, NULL);
-  if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    XtVaSetValues(widget, XmNy, y, NULL);
-  if (width > -1)
-    XtVaSetValues(widget, XmNwidth, width, NULL);
-  if (height > -1)
-    XtVaSetValues(widget, XmNheight, height, NULL);
-
-  wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-  sizeEvent.SetEventObject(this);
-  
-  GetEventHandler()->ProcessEvent(sizeEvent);
+    // A bit of optimization to help sort out the flickers.
+    int oldX, oldY, oldW, oldH;
+    GetSize(& oldW, & oldH);
+    GetPosition(& oldX, & oldY);
+    
+    bool useOldPos = FALSE;
+    bool useOldSize = FALSE;
+    
+    if ((x == -1) && (x == -1) && ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0))
+        useOldPos = TRUE;
+    else if (x == oldX && y == oldY)
+        useOldPos = TRUE;
+    
+    if ((width == -1) && (height == -1))
+        useOldSize = TRUE;
+    else if (width == oldW && height == oldH)
+        useOldSize = TRUE;
+    
+    if (!wxNoOptimize::CanOptimize())
+    {
+        useOldSize = FALSE; useOldPos = FALSE;
+    }
+    
+    if (useOldPos && useOldSize)
+        return;
+    
+    if (m_drawingArea)
+    {
+        CanvasSetSize(x, y, width, height, sizeFlags);
+        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);
+    
+    if (!useOldPos)
+    {
+        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 (!useOldSize)
+    {
+        if (width > -1)
+            XtVaSetValues(widget, XmNwidth, width, NULL);
+        if (height > -1)
+            XtVaSetValues(widget, XmNheight, height, NULL);
+    }
+    
+    if (managed)
+        XtManageChild(widget);
+    
+    // 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.
+    /*
+    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
+    sizeEvent.SetEventObject(this);
+    
+      GetEventHandler()->ProcessEvent(sizeEvent);
+    */

 }
 
 void wxWindow::SetClientSize(int width, int height)
 {
 }
 
 void wxWindow::SetClientSize(int width, int height)
 {

-  if (m_drawingArea)
-  {
-    CanvasSetClientSize(width, height);
-    return;
-  }
-
-  Widget widget = (Widget) GetMainWidget();
-
-  if (width > -1)
-    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);
+    if (m_drawingArea)
+    {
+        CanvasSetClientSize(width, height);
+        return;
+    }
+    
+    Widget widget = (Widget) GetTopWidget();
+    
+    if (width > -1)
+        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
 }
 
 // For implementation purposes - sometimes decorations make the client area


@@ -642,38 +855,49 @@ bool wxWindow::Show(bool show)
 {
     if (show)
     {
 {
     if (show)
     {

-       if (m_borderWidget || m_scrolledWindow)
-       {
-           XtMapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-       }
-       else
-       {
-           XtMapWidget((Widget) GetMainWidget());
-       }
+        if (m_borderWidget || m_scrolledWindow)
+        {
+            if (m_drawingArea)
+                XtMapWidget((Widget) m_drawingArea);
+            XtMapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
+        }
+        else
+        {
+            WXWidget topWidget = GetTopWidget();
+            if (GetTopWidget())
+                XtMapWidget((Widget) GetTopWidget());
+            else if (GetMainWidget())
+                XtMapWidget((Widget) GetMainWidget());
+        }

     }
     else
     {
     }
     else
     {

-       if (m_borderWidget || m_scrolledWindow)
-       {
-           XtUnmapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-       }
-       else
-       {
-           XtUnmapWidget((Widget) GetMainWidget());
-       }
+        if (m_borderWidget || m_scrolledWindow)
+        {
+            if (m_drawingArea)
+                XtUnmapWidget((Widget) m_drawingArea);
+            XtUnmapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
+        }
+        else
+        {
+            if (GetTopWidget())
+                XtUnmapWidget((Widget) GetTopWidget());
+            else if (GetMainWidget())
+                XtUnmapWidget((Widget) GetMainWidget());
+        }

     }
     }

-
-  /*
+    
+    /*

     Window xwin = (Window) GetXWindow();
     Display *xdisp = (Display*) GetXDisplay();
     if (show)
     Window xwin = (Window) GetXWindow();
     Display *xdisp = (Display*) GetXDisplay();
     if (show)

-        XMapWindow(xdisp, xwin);
+    XMapWindow(xdisp, xwin);

     else
     else

-        XUnmapWindow(xdisp, xwin);
-   */
-
+    XUnmapWindow(xdisp, xwin);
+    */
+    

     m_isShown = show;
     m_isShown = show;

-
+    

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -684,68 +908,126 @@ bool wxWindow::IsShown() const
 
 int wxWindow::GetCharHeight() const
 {
 
 int wxWindow::GetCharHeight() const
 {

-    // TODO
-    return 0;
+    if (!m_windowFont.Ok())
+        return 0;
+    
+    WXFontStructPtr pFontStruct = m_windowFont.GetFontStruct(1.0, GetXDisplay());
+    
+    int direction, ascent, descent;
+    XCharStruct overall;
+    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
+        &descent, &overall);
+    //  return (overall.ascent + overall.descent);
+    return (ascent + descent);

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

-    // TODO
-    return 0;
+    if (!m_windowFont.Ok())
+        return 0;
+    
+    WXFontStructPtr pFontStruct = m_windowFont.GetFontStruct(1.0, GetXDisplay());
+    
+    int direction, ascent, descent;
+    XCharStruct overall;
+    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
+        &descent, &overall);
+    return overall.width;

 }
 
 }
 

-void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
-                           int *descent, int *externalLeading, const wxFont *theFont, bool) const
+/* Helper function for 16-bit fonts */
+static int str16len(const char *s)

 {
 {

-  wxFont *fontToUse = (wxFont *)theFont;
-  if (!fontToUse)
-    fontToUse = (wxFont *) & m_windowFont;
+    int count = 0;
+    
+    while (s[0] && s[1]) {
+        count++;
+        s += 2;
+    }
+    
+    return count;
+}

 
 

-    // TODO
+void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
+                             int *descent, int *externalLeading, const wxFont *theFont, bool use16) const
+{
+    wxFont *fontToUse = (wxFont *)theFont;
+    if (!fontToUse)
+        fontToUse = (wxFont *) & m_windowFont;
+    
+    if (!fontToUse->Ok())
+        return;
+    
+    WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay());
+    
+    int direction, ascent, descent2;
+    XCharStruct overall;
+    int slen;
+    
+    if (use16) slen = str16len(string); else slen = strlen(string);
+    
+    if (use16)
+        XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction,
+        &ascent, &descent2, &overall);
+    else
+        XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) string, slen, &direction,
+        &ascent, &descent2, &overall);
+    
+    *x = (overall.width);
+    *y = (ascent + descent2);
+    if (descent)
+        *descent = descent2;
+    if (externalLeading)
+        *externalLeading = 0;

 }
 
 }
 

-void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
+void wxWindow::Refresh(bool eraseBack, const wxRect *rect)

 {
     Display *display = XtDisplay((Widget) GetMainWidget());
     Window thisWindow = XtWindow((Widget) GetMainWidget());
 {
     Display *display = XtDisplay((Widget) GetMainWidget());
     Window thisWindow = XtWindow((Widget) GetMainWidget());

-
+    

     XExposeEvent dummyEvent;
     int width, height;
     GetSize(&width, &height);
     XExposeEvent dummyEvent;
     int width, height;
     GetSize(&width, &height);

-
+    

     dummyEvent.type = Expose;
     dummyEvent.display = display;
     dummyEvent.send_event = True;
     dummyEvent.window = thisWindow;
     if (rect)
     {
     dummyEvent.type = Expose;
     dummyEvent.display = display;
     dummyEvent.send_event = True;
     dummyEvent.window = thisWindow;
     if (rect)
     {

-      dummyEvent.x = rect->x;
-      dummyEvent.y = rect->y;
-      dummyEvent.width = rect->width;
-      dummyEvent.height = rect->height;
+        dummyEvent.x = rect->x;
+        dummyEvent.y = rect->y;
+        dummyEvent.width = rect->width;
+        dummyEvent.height = rect->height;

     }
     else
     {
     }
     else
     {

-      dummyEvent.x = 0;
-      dummyEvent.y = 0;
-      dummyEvent.width = width;
-      dummyEvent.height = height;
+        dummyEvent.x = 0;
+        dummyEvent.y = 0;
+        dummyEvent.width = width;
+        dummyEvent.height = height;

     }
     dummyEvent.count = 0;
     }
     dummyEvent.count = 0;

-
+    

     if (eraseBack)
     {
         wxClientDC dc(this);
     if (eraseBack)
     {
         wxClientDC dc(this);

-        dc.Clear();
+        wxBrush backgroundBrush(GetBackgroundColour(), wxSOLID);
+        dc.SetBackground(backgroundBrush);
+        if (rect)
+            dc.Clear(*rect);
+        else
+            dc.Clear();

     }
     }

-
+    

     XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
 }
 
 // Responds to colour changes: passes event on to children.
 void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
 }
 
 // Responds to colour changes: passes event on to children.
 void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

-    wxNode *node = GetChildren()->First();
+    wxNode *node = GetChildren().First();

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


@@ -756,7 +1038,7 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
             event.m_eventObject = win;
             win->GetEventHandler()->ProcessEvent(event2);
         }
             event.m_eventObject = win;
             win->GetEventHandler()->ProcessEvent(event2);
         }

-
+        

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


@@ -771,23 +1053,23 @@ long wxWindow::Default()
 
 void wxWindow::InitDialog()
 {
 
 void wxWindow::InitDialog()
 {

-  wxInitDialogEvent event(GetId());
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
+    wxInitDialogEvent event(GetId());
+    event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent(event);

 }
 
 // Default init dialog behaviour is to transfer data to window
 void wxWindow::OnInitDialog(wxInitDialogEvent& event)
 {
 }
 
 // Default init dialog behaviour is to transfer data to window
 void wxWindow::OnInitDialog(wxInitDialogEvent& event)
 {

-  TransferDataToWindow();
+    TransferDataToWindow();

 }
 
 // Caret manipulation
 void wxWindow::CreateCaret(int w, int h)
 {
 }
 
 // Caret manipulation
 void wxWindow::CreateCaret(int w, int h)
 {

-  m_caretWidth = w;
-  m_caretHeight = h;
-  m_caretEnabled = TRUE;
+    m_caretWidth = w;
+    m_caretHeight = h;
+    m_caretEnabled = TRUE;

 }
 
 void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
 }
 
 void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))


@@ -828,57 +1110,56 @@ void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, in
     m_minSizeY = minH;
     m_maxSizeX = maxW;
     m_maxSizeY = maxH;
     m_minSizeY = minH;
     m_maxSizeX = maxW;
     m_maxSizeY = maxH;

-
+    

     if (!this->IsKindOf(CLASSINFO(wxFrame)))
     if (!this->IsKindOf(CLASSINFO(wxFrame)))

-      return;
-
+        return;
+    

     wxFrame *frame = (wxFrame *)this;
     wxFrame *frame = (wxFrame *)this;

-
-    /* Uncomment when wxFrame implemented
+    Widget widget = (Widget) frame->GetShellWidget();
+    

     if (minW > -1)
     if (minW > -1)

-      XtVaSetValues((Widget) frame->m_frameShell, XmNminWidth, minW, NULL);
+        XtVaSetValues(widget, XmNminWidth, minW, NULL);

     if (minH > -1)
     if (minH > -1)

-      XtVaSetValues((Widget) frame->m_frameShell, XmNminHeight, minH, NULL);
+        XtVaSetValues(widget, XmNminHeight, minH, NULL);

     if (maxW > -1)
     if (maxW > -1)

-      XtVaSetValues((Widget) frame->m_frameShell, XmNmaxWidth, maxW, NULL);
+        XtVaSetValues(widget, XmNmaxWidth, maxW, NULL);

     if (maxH > -1)
     if (maxH > -1)

-      XtVaSetValues((Widget) frame->m_frameShell, XmNmaxHeight, maxH, NULL);
+        XtVaSetValues(widget, XmNmaxHeight, maxH, NULL);

     if (incW > -1)
     if (incW > -1)

-      XtVaSetValues((Widget) frame->m_frameShell, XmNwidthInc, incW, NULL);
+        XtVaSetValues(widget, XmNwidthInc, incW, NULL);

     if (incH > -1)
     if (incH > -1)

-      XtVaSetValues((Widget) frame->m_frameShell, XmNheightInc, incH, NULL);
-      */
+        XtVaSetValues(widget, XmNheightInc, incH, NULL);

 }
 
 void wxWindow::Centre(int direction)
 {
 }
 
 void wxWindow::Centre(int direction)
 {

-  int x, y, width, height, panel_width, panel_height, new_x, new_y;
-
-  wxWindow *father = (wxWindow *)GetParent();
-  if (!father)
-    return;
-
-  father->GetClientSize(&panel_width, &panel_height);
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
-
-  new_x = -1;
-  new_y = -1;
-
-  if (direction & wxHORIZONTAL)
-    new_x = (int)((panel_width - width)/2);
-
-  if (direction & wxVERTICAL)
-    new_y = (int)((panel_height - height)/2);
-
-  SetSize(new_x, new_y, -1, -1);
-
+    int x, y, width, height, panel_width, panel_height, new_x, new_y;
+    
+    wxWindow *father = (wxWindow *)GetParent();
+    if (!father)
+        return;
+    
+    father->GetClientSize(&panel_width, &panel_height);
+    GetSize(&width, &height);
+    GetPosition(&x, &y);
+    
+    new_x = -1;
+    new_y = -1;
+    
+    if (direction & wxHORIZONTAL)
+        new_x = (int)((panel_width - width)/2);
+    
+    if (direction & wxVERTICAL)
+        new_y = (int)((panel_height - height)/2);
+    
+    SetSize(new_x, new_y, -1, -1);
+    

 }
 
 // Coordinates relative to the window
 void wxWindow::WarpPointer (int x, int y)
 {
 }
 
 // Coordinates relative to the window
 void wxWindow::WarpPointer (int x, int y)
 {

-  XWarpPointer (XtDisplay((Widget) GetClientWidget()), None, XtWindow((Widget) GetClientWidget()), 0, 0, 0, 0, x, y);
+    XWarpPointer (XtDisplay((Widget) GetClientWidget()), None, XtWindow((Widget) GetClientWidget()), 0, 0, 0, 0, x, y);

 }
 
 void wxWindow::OnEraseBackground(wxEraseEvent& event)
 }
 
 void wxWindow::OnEraseBackground(wxEraseEvent& event)


@@ -889,73 +1170,341 @@ void wxWindow::OnEraseBackground(wxEraseEvent& event)
 
 int wxWindow::GetScrollPos(int orient) const
 {
 
 int wxWindow::GetScrollPos(int orient) const
 {

-    // TODO
-    return 0;
+    if (orient == wxHORIZONTAL)
+        return m_scrollPosX;
+    else
+        return m_scrollPosY;
+        /*
+        Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar);
+        if (scrollBar)
+        {
+        int pos;
+        XtVaGetValues(scrollBar,
+        XmNvalue, &pos, NULL);
+        return pos;
+        }
+        else
+        return 0;
+    */

 }
 
 // This now returns the whole range, not just the number
 // of positions that we can scroll.
 int wxWindow::GetScrollRange(int orient) const
 {
 }
 
 // This now returns the whole range, not just the number
 // of positions that we can scroll.
 int wxWindow::GetScrollRange(int orient) const
 {

-    // TODO
-    return 0;
+    Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar);
+    if (scrollBar)
+    {
+        int range;
+        XtVaGetValues(scrollBar,
+            XmNmaximum, &range, NULL);
+        return range;
+    }
+    else
+        return 0;

 }
 
 int wxWindow::GetScrollThumb(int orient) const
 {
 }
 
 int wxWindow::GetScrollThumb(int orient) const
 {

-    // TODO
-    return 0;
+    Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar);
+    if (scrollBar)
+    {
+        int thumb;
+        XtVaGetValues(scrollBar,
+            XmNsliderSize, &thumb, NULL);
+        return thumb;
+    }
+    else
+        return 0;

 }
 
 }
 

-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindow::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))

 {
 {

-    // TODO
-    return;
+    Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar);
+    if (scrollBar)
+    {
+        XtVaSetValues (scrollBar,
+            XmNvalue, pos,
+            NULL);
+    }
+    if (orient == wxHORIZONTAL)
+        m_scrollPosX = pos;
+    else
+        m_scrollPosY = pos;
+    

 }
 
 // New function that will replace some of the above.
 void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 }
 
 // New function that will replace some of the above.
 void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,

-    int range, bool refresh)
+                            int range, bool WXUNUSED(refresh))

 {
 {

-    // TODO
+    int oldW, oldH;
+    GetSize(& oldW, & oldH);
+    
+    if (range == 0)
+        range = 1;
+    if (thumbVisible == 0)
+        thumbVisible = 1;
+    
+    if (thumbVisible > range)
+        thumbVisible = range;
+    
+    // Save the old state to see if it changed
+    WXWidget oldScrollBar =  ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar );
+    
+    if (orient == wxHORIZONTAL)
+    {
+        if (thumbVisible == range)
+        {
+            if (m_hScrollBar)
+                DestroyScrollbar(wxHORIZONTAL);
+        }
+        else
+        {
+            if (!m_hScrollBar)
+                CreateScrollbar(wxHORIZONTAL);
+        }
+    }
+    if (orient == wxVERTICAL)
+    {
+        if (thumbVisible == range)
+        {
+            if (m_vScrollBar)
+                DestroyScrollbar(wxVERTICAL);
+        }
+        else
+        {
+            if (!m_vScrollBar)
+                CreateScrollbar(wxVERTICAL);
+        }
+    }
+    WXWidget newScrollBar =  ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar );
+    
+    if (oldScrollBar != newScrollBar)
+    {
+        // This is important! Without it, scrollbars misbehave
+        // badly.
+        XtUnrealizeWidget((Widget) m_scrolledWindow);
+        XmScrolledWindowSetAreas ((Widget) m_scrolledWindow, (Widget) m_hScrollBar, (Widget) m_vScrollBar, (Widget) m_drawingArea);
+        XtRealizeWidget((Widget) m_scrolledWindow);
+        XtManageChild((Widget) m_scrolledWindow);
+    }
+    
+    if (newScrollBar)
+        XtVaSetValues((Widget) newScrollBar,
+        XmNvalue, pos,
+        XmNminimum, 0,
+        XmNmaximum, range,
+        XmNsliderSize, thumbVisible,
+        NULL);
+    
+    if (orient == wxHORIZONTAL)
+        m_scrollPosX = pos;
+    else
+        m_scrollPosY = pos;
+    
+    int newW, newH;
+    GetSize(& newW, & newH);
+    
+    // Adjusting scrollbars can resize the canvas accidentally
+    if (newW != oldW || newH != oldH)
+        SetSize(-1, -1, oldW, oldH);

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

-void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
+void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)

 {
 {

-    // TODO
-    return;
+    //  cerr << "Scrolling. delta = " << dx << ", " << dy << endl;
+    int x, y, w, h;
+    if (rect)
+    {
+        // Use specified rectangle
+        x = rect->x; y = rect->y; w = rect->width; h = rect->height;
+    }
+    else
+    {
+        // Use whole client area
+        x = 0; y = 0;
+        GetClientSize(& w, & h);
+    }
+    
+    int x1 = (dx >= 0) ? x : x - dx ;
+    int y1 = (dy >= 0) ? y : y - dy;
+    int w1 = w - abs(dx);
+    int h1 = h - abs(dy);
+    int x2 = (dx >= 0) ? x + dx : x;
+    int y2 = (dy >= 0) ? y + dy : y;
+    
+    wxClientDC dc(this);
+    
+    dc.SetLogicalFunction (wxCOPY);
+    
+    Widget widget = (Widget) GetMainWidget();
+    Window window = XtWindow(widget);
+    Display* display = XtDisplay(widget);
+    
+    XCopyArea(display, window,
+        window, (GC) dc.GetGC(),
+        x1, y1,
+        w1, h1,
+        x2, y2);
+    
+    dc.SetAutoSetting(TRUE);
+    wxBrush brush(GetBackgroundColour(), wxSOLID);
+    dc.SetBrush(brush); // ??
+    
+    // We'll add rectangles to the list of update rectangles
+    // according to which bits we've exposed.
+    wxList updateRects;
+    
+    if (dx > 0)
+    {
+        wxRect *rect = new wxRect;
+        rect->x = x;
+        rect->y = y;
+        rect->width = dx;
+        rect->height = h;
+        
+        XFillRectangle(display, window,
+            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
+        
+        rect->x = rect->x;
+        rect->y = rect->y;
+        rect->width = rect->width;
+        rect->height = rect->height;
+        
+        updateRects.Append((wxObject*) rect);
+    }
+    else if (dx < 0)
+    {
+        wxRect *rect = new wxRect;
+        
+        rect->x = x + w + dx;
+        rect->y = y;
+        rect->width = -dx;
+        rect->height = h;
+        
+        XFillRectangle(display, window,
+            (GC) dc.GetGC(), rect->x, rect->y, rect->width,
+            rect->height);
+        
+        rect->x = rect->x;
+        rect->y = rect->y;
+        rect->width = rect->width;
+        rect->height = rect->height;
+        
+        updateRects.Append((wxObject*) rect);
+    }
+    if (dy > 0)
+    {
+        wxRect *rect = new wxRect;
+        
+        rect->x = x;
+        rect->y = y;
+        rect->width = w;
+        rect->height = dy;
+        
+        XFillRectangle(display, window,
+            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
+        
+        rect->x = rect->x;
+        rect->y = rect->y;
+        rect->width = rect->width;
+        rect->height = rect->height;
+        
+        updateRects.Append((wxObject*) rect);
+    }
+    else if (dy < 0)
+    {
+        wxRect *rect = new wxRect;
+        
+        rect->x = x;
+        rect->y = y + h + dy;
+        rect->width = w;
+        rect->height = -dy;
+        
+        XFillRectangle(display, window,
+            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
+        
+        rect->x = rect->x;
+        rect->y = rect->y;
+        rect->width = rect->width;
+        rect->height = rect->height;
+        
+        updateRects.Append((wxObject*) rect);
+    }
+    dc.SetBrush(wxNullBrush);
+    
+    // Now send expose events
+    
+    wxNode* node = updateRects.First();
+    while (node)
+    {
+        wxRect* rect = (wxRect*) node->Data();
+        XExposeEvent event;
+        
+        event.type = Expose;
+        event.display = display;
+        event.send_event = True;
+        event.window = window;
+        
+        event.x = rect->x;
+        event.y = rect->y;
+        event.width = rect->width;
+        event.height = rect->height;
+        
+        event.count = 0;
+        
+        XSendEvent(display, window, False, ExposureMask, (XEvent *)&event);
+        
+        node = node->Next();
+        
+    }
+    
+    // Delete the update rects
+    node = updateRects.First();
+    while (node)
+    {
+        wxRect* rect = (wxRect*) node->Data();
+        delete rect;
+        node = node->Next();
+    }
+    

 }
 
 }
 

-void wxWindow::SetFont(const wxFont& font)
+void wxWindow::OnChar(wxKeyEvent& event)

 {
 {

-    m_windowFont = font;
+/* ??
+if ( event.KeyCode() == WXK_TAB ) {
+// propagate the TABs to the parent - it's up to it to decide what
+// to do with it
+if ( GetParent() ) {
+if ( GetParent()->ProcessEvent(event) )
+return;
+}
+}
+    */
+}

 
 

-    if (!m_windowFont.Ok())
-           return;
-    // TODO
+void wxWindow::OnKeyDown(wxKeyEvent& event)
+{
+    Default();

 }
 
 }
 

-void wxWindow::OnChar(wxKeyEvent& event)
+void wxWindow::OnKeyUp(wxKeyEvent& event)

 {
 {

-    if ( event.KeyCode() == WXK_TAB ) {
-        // propagate the TABs to the parent - it's up to it to decide what
-        // to do with it
-        if ( GetParent() ) {
-            if ( GetParent()->ProcessEvent(event) )
-                return;
-        }
-    }
+    Default();

 }
 
 void wxWindow::OnPaint(wxPaintEvent& event)
 {
 }
 
 void wxWindow::OnPaint(wxPaintEvent& event)
 {

-       Default();
+    Default();

 }
 
 bool wxWindow::IsEnabled() const
 {
 }
 
 bool wxWindow::IsEnabled() const
 {

-    // TODO
+    // TODO. Is this right?
+    // return XtGetSensitive((Widget) GetMainWidget());

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -970,54 +1519,54 @@ bool wxWindow::IsEnabled() const
 // it's an application error (pops up a dialog)
 bool wxWindow::TransferDataToWindow()
 {
 // it's an application error (pops up a dialog)
 bool wxWindow::TransferDataToWindow()
 {

-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() &&
-                    !child->GetValidator()->TransferToWindow() )
-               {
-                       wxMessageBox("Application Error", "Could not transfer data to window", wxOK|wxICON_EXCLAMATION);
-                       return FALSE;
-               }
-
-               node = node->Next();
-       }
-       return TRUE;
+    wxNode *node = GetChildren().First();
+    while ( node )
+    {
+        wxWindow *child = (wxWindow *)node->Data();
+        if ( child->GetValidator() &&
+            !child->GetValidator()->TransferToWindow() )
+        {
+            wxLogError("Could not transfer data to window.");
+            return FALSE;
+        }
+        
+        node = node->Next();
+    }
+    return TRUE;

 }
 
 // Transfer values from controls. If returns FALSE,
 // validation failed: don't quit
 bool wxWindow::TransferDataFromWindow()
 {
 }
 
 // Transfer values from controls. If returns FALSE,
 // validation failed: don't quit
 bool wxWindow::TransferDataFromWindow()
 {

-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() && !child->GetValidator()->TransferFromWindow() )
-               {
-                       return FALSE;
-               }
-
-               node = node->Next();
-       }
-       return TRUE;
+    wxNode *node = GetChildren().First();
+    while ( node )
+    {
+        wxWindow *child = (wxWindow *)node->Data();
+        if ( child->GetValidator() && !child->GetValidator()->TransferFromWindow() )
+        {
+            return FALSE;
+        }
+        
+        node = node->Next();
+    }
+    return TRUE;

 }
 
 bool wxWindow::Validate()
 {
 }
 
 bool wxWindow::Validate()
 {

-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this) )
-               {
-                       return FALSE;
-               }
-
-               node = node->Next();
-       }
-       return TRUE;
+    wxNode *node = GetChildren().First();
+    while ( node )
+    {
+        wxWindow *child = (wxWindow *)node->Data();
+        if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this) )
+        {
+            return FALSE;
+        }
+        
+        node = node->Next();
+    }
+    return TRUE;

 }
 
 // Get the window with the focus
 }
 
 // Get the window with the focus


@@ -1029,193 +1578,219 @@ wxWindow *wxWindow::FindFocus()
 
 void wxWindow::AddChild(wxWindow *child)
 {
 
 void wxWindow::AddChild(wxWindow *child)
 {

-    GetChildren()->Append(child);
+    GetChildren().Append(child);

     child->m_windowParent = this;
 }
 
 void wxWindow::RemoveChild(wxWindow *child)
 {
     child->m_windowParent = this;
 }
 
 void wxWindow::RemoveChild(wxWindow *child)
 {

-    if (GetChildren())
-        GetChildren()->DeleteObject(child);
+    GetChildren().DeleteObject(child);

     child->m_windowParent = NULL;
 }
 
     child->m_windowParent = NULL;
 }
 

+// Reparents this window to have the new parent.
+bool wxWindow::Reparent(wxWindow* WXUNUSED(parent))
+{
+    // For now, we indicate that this isn't implemented.
+    return FALSE;
+}
+

 void wxWindow::DestroyChildren()
 {
 void wxWindow::DestroyChildren()
 {

-  if (GetChildren()) {
-    wxNode *node;
-    while ((node = GetChildren()->First()) != (wxNode *)NULL) {
-      wxWindow *child;
-      if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) {
+    wxNode *node = GetChildren().First();
+    while (node)
+    {
+        wxNode* next = node->Next();
+        wxWindow* child = (wxWindow*) node->Data();

         delete child;
         delete child;

-               if ( GetChildren()->Member(child) )
-                       delete node;
-      }
+        node = next;
+    }
+    GetChildren().Clear();
+#if 0
+    wxNode *node;
+    while ((node = GetChildren().First()) != (wxNode *)NULL) {
+        wxWindow *child;
+        if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) {
+            delete child;
+            if ( GetChildren().Member(child) )
+                delete node;
+        }

     } /* while */
     } /* while */

-  }
+#endif

 }
 
 void wxWindow::MakeModal(bool modal)
 {
 }
 
 void wxWindow::MakeModal(bool modal)
 {

-  // Disable all other windows
-  if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
-  {
-    wxNode *node = wxTopLevelWindows.First();
-    while (node)
+    // Disable all other windows
+    if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))

     {
     {

-      wxWindow *win = (wxWindow *)node->Data();
-      if (win != this)
-        win->Enable(!modal);
-
-      node = node->Next();
+        wxNode *node = wxTopLevelWindows.First();
+        while (node)
+        {
+            wxWindow *win = (wxWindow *)node->Data();
+            if (win != this)
+                win->Enable(!modal);
+            
+            node = node->Next();
+        }

     }
     }

-  }
+}
+
+// If nothing defined for this, try the parent.
+// E.g. we may be a button loaded from a resource, with no callback function
+// defined.
+void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
+{
+    if (GetEventHandler()->ProcessEvent(event) )
+        return;
+    if (m_windowParent)
+        m_windowParent->GetEventHandler()->OnCommand(win, event);

 }
 
 void wxWindow::SetConstraints(wxLayoutConstraints *c)
 {
 }
 
 void wxWindow::SetConstraints(wxLayoutConstraints *c)
 {

-  if (m_constraints)
-  {
-    UnsetConstraints(m_constraints);
-    delete m_constraints;
-  }
-  m_constraints = c;
-  if (m_constraints)
-  {
-    // Make sure other windows know they're part of a 'meaningful relationship'
-    if (m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this))
-      m_constraints->left.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this))
-      m_constraints->top.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this))
-      m_constraints->right.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this))
-      m_constraints->bottom.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this))
-      m_constraints->width.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this))
-      m_constraints->height.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this))
-      m_constraints->centreX.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this))
-      m_constraints->centreY.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-  }
+    if (m_constraints)
+    {
+        UnsetConstraints(m_constraints);
+        delete m_constraints;
+    }
+    m_constraints = c;
+    if (m_constraints)
+    {
+        // Make sure other windows know they're part of a 'meaningful relationship'
+        if (m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this))
+            m_constraints->left.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
+        if (m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this))
+            m_constraints->top.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
+        if (m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this))
+            m_constraints->right.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
+        if (m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this))
+            m_constraints->bottom.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
+        if (m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this))
+            m_constraints->width.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
+        if (m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this))
+            m_constraints->height.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
+        if (m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this))
+            m_constraints->centreX.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
+        if (m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this))
+            m_constraints->centreY.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
+    }

 }
 
 // This removes any dangling pointers to this window
 // in other windows' constraintsInvolvedIn lists.
 void wxWindow::UnsetConstraints(wxLayoutConstraints *c)
 {
 }
 
 // This removes any dangling pointers to this window
 // in other windows' constraintsInvolvedIn lists.
 void wxWindow::UnsetConstraints(wxLayoutConstraints *c)
 {

-  if (c)
-  {
-    if (c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this))
-      c->left.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this))
-      c->top.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this))
-      c->right.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this))
-      c->bottom.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this))
-      c->width.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this))
-      c->height.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this))
-      c->centreX.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this))
-      c->centreY.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-  }
+    if (c)
+    {
+        if (c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this))
+            c->left.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
+        if (c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this))
+            c->top.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
+        if (c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this))
+            c->right.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
+        if (c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this))
+            c->bottom.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
+        if (c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this))
+            c->width.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
+        if (c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this))
+            c->height.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
+        if (c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this))
+            c->centreX.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
+        if (c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this))
+            c->centreY.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
+    }

 }
 
 // Back-pointer to other windows we're involved with, so if we delete
 // this window, we must delete any constraints we're involved with.
 void wxWindow::AddConstraintReference(wxWindow *otherWin)
 {
 }
 
 // Back-pointer to other windows we're involved with, so if we delete
 // this window, we must delete any constraints we're involved with.
 void wxWindow::AddConstraintReference(wxWindow *otherWin)
 {

-  if (!m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn = new wxList;
-  if (!m_constraintsInvolvedIn->Member(otherWin))
-    m_constraintsInvolvedIn->Append(otherWin);
+    if (!m_constraintsInvolvedIn)
+        m_constraintsInvolvedIn = new wxList;
+    if (!m_constraintsInvolvedIn->Member(otherWin))
+        m_constraintsInvolvedIn->Append(otherWin);

 }
 
 // REMOVE back-pointer to other windows we're involved with.
 void wxWindow::RemoveConstraintReference(wxWindow *otherWin)
 {
 }
 
 // REMOVE back-pointer to other windows we're involved with.
 void wxWindow::RemoveConstraintReference(wxWindow *otherWin)
 {

-  if (m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn->DeleteObject(otherWin);
+    if (m_constraintsInvolvedIn)
+        m_constraintsInvolvedIn->DeleteObject(otherWin);

 }
 
 // Reset any constraints that mention this window
 void wxWindow::DeleteRelatedConstraints()
 {
 }
 
 // Reset any constraints that mention this window
 void wxWindow::DeleteRelatedConstraints()
 {

-  if (m_constraintsInvolvedIn)
-  {
-    wxNode *node = m_constraintsInvolvedIn->First();
-    while (node)
+    if (m_constraintsInvolvedIn)

     {
     {

-      wxWindow *win = (wxWindow *)node->Data();
-      wxNode *next = node->Next();
-      wxLayoutConstraints *constr = win->GetConstraints();
-
-      // Reset any constraints involving this window
-      if (constr)
-      {
-        constr->left.ResetIfWin((wxWindow *)this);
-        constr->top.ResetIfWin((wxWindow *)this);
-        constr->right.ResetIfWin((wxWindow *)this);
-        constr->bottom.ResetIfWin((wxWindow *)this);
-        constr->width.ResetIfWin((wxWindow *)this);
-        constr->height.ResetIfWin((wxWindow *)this);
-        constr->centreX.ResetIfWin((wxWindow *)this);
-        constr->centreY.ResetIfWin((wxWindow *)this);
-      }
-      delete node;
-      node = next;
+        wxNode *node = m_constraintsInvolvedIn->First();
+        while (node)
+        {
+            wxWindow *win = (wxWindow *)node->Data();
+            wxNode *next = node->Next();
+            wxLayoutConstraints *constr = win->GetConstraints();
+            
+            // Reset any constraints involving this window
+            if (constr)
+            {
+                constr->left.ResetIfWin((wxWindow *)this);
+                constr->top.ResetIfWin((wxWindow *)this);
+                constr->right.ResetIfWin((wxWindow *)this);
+                constr->bottom.ResetIfWin((wxWindow *)this);
+                constr->width.ResetIfWin((wxWindow *)this);
+                constr->height.ResetIfWin((wxWindow *)this);
+                constr->centreX.ResetIfWin((wxWindow *)this);
+                constr->centreY.ResetIfWin((wxWindow *)this);
+            }
+            delete node;
+            node = next;
+        }
+        delete m_constraintsInvolvedIn;
+        m_constraintsInvolvedIn = NULL;

     }
     }

-    delete m_constraintsInvolvedIn;
-    m_constraintsInvolvedIn = NULL;
-  }

 }
 
 void wxWindow::SetSizer(wxSizer *sizer)
 {
 }
 
 void wxWindow::SetSizer(wxSizer *sizer)
 {

-  m_windowSizer = sizer;
-  if (sizer)
-    sizer->SetSizerParent((wxWindow *)this);
+    m_windowSizer = sizer;
+    if (sizer)
+        sizer->SetSizerParent((wxWindow *)this);

 }
 
 /*
 }
 
 /*

- * New version
- */
+* New version
+*/

 
 bool wxWindow::Layout()
 {
 
 bool wxWindow::Layout()
 {

-  if (GetConstraints())
-  {
-    int w, h;
-    GetClientSize(&w, &h);
-    GetConstraints()->width.SetValue(w);
-    GetConstraints()->height.SetValue(h);
-  }
-  
-  // If top level (one sizer), evaluate the sizer's constraints.
-  if (GetSizer())
-  {
-    int noChanges;
-    GetSizer()->ResetConstraints();   // Mark all constraints as unevaluated
-    GetSizer()->LayoutPhase1(&noChanges);
-    GetSizer()->LayoutPhase2(&noChanges);
-    GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes
+    if (GetConstraints())
+    {
+        int w, h;
+        GetClientSize(&w, &h);
+        GetConstraints()->width.SetValue(w);
+        GetConstraints()->height.SetValue(h);
+    }
+    
+    // If top level (one sizer), evaluate the sizer's constraints.
+    if (GetSizer())
+    {
+        int noChanges;
+        GetSizer()->ResetConstraints();   // Mark all constraints as unevaluated
+        GetSizer()->LayoutPhase1(&noChanges);
+        GetSizer()->LayoutPhase2(&noChanges);
+        GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes
+        return TRUE;
+    }
+    else
+    {
+        // Otherwise, evaluate child constraints
+        ResetConstraints();   // Mark all constraints as unevaluated
+        DoPhase(1);           // Just one phase need if no sizers involved
+        DoPhase(2);
+        SetConstraintSizes(); // Recursively set the real window sizes
+    }

     return TRUE;
     return TRUE;

-  }
-  else
-  {
-    // Otherwise, evaluate child constraints
-    ResetConstraints();   // Mark all constraints as unevaluated
-    DoPhase(1);           // Just one phase need if no sizers involved
-    DoPhase(2);
-    SetConstraintSizes(); // Recursively set the real window sizes
-  }
-  return TRUE;

 }
 
 
 }
 
 


@@ -1225,291 +1800,289 @@ bool wxWindow::Layout()
 // and order the evaluation differently.
 bool wxWindow::LayoutPhase1(int *noChanges)
 {
 // and order the evaluation differently.
 bool wxWindow::LayoutPhase1(int *noChanges)
 {

-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    return constr->SatisfyConstraints((wxWindow *)this, noChanges);
-  }
-  else
-    return TRUE;
+    wxLayoutConstraints *constr = GetConstraints();
+    if (constr)
+    {
+        return constr->SatisfyConstraints((wxWindow *)this, noChanges);
+    }
+    else
+        return TRUE;

 }
 
 bool wxWindow::LayoutPhase2(int *noChanges)
 {
 }
 
 bool wxWindow::LayoutPhase2(int *noChanges)
 {

-  *noChanges = 0;
-  
-  // Layout children
-  DoPhase(1);
-  DoPhase(2);
-  return TRUE;
+    *noChanges = 0;
+    
+    // Layout children
+    DoPhase(1);
+    DoPhase(2);
+    return TRUE;

 }
 
 // Do a phase of evaluating child constraints
 bool wxWindow::DoPhase(int phase)
 {
 }
 
 // Do a phase of evaluating child constraints
 bool wxWindow::DoPhase(int phase)
 {

-  int noIterations = 0;
-  int maxIterations = 500;
-  int noChanges = 1;
-  int noFailures = 0;
-  wxList succeeded;
-  while ((noChanges > 0) && (noIterations < maxIterations))
-  {
-    noChanges = 0;
-    noFailures = 0;
-    wxNode *node = GetChildren()->First();
-    while (node)
+    int noIterations = 0;
+    int maxIterations = 500;
+    int noChanges = 1;
+    int noFailures = 0;
+    wxList succeeded;
+    while ((noChanges > 0) && (noIterations < maxIterations))

     {
     {

-      wxWindow *child = (wxWindow *)node->Data();
-      if (!child->IsKindOf(CLASSINFO(wxFrame)) && !child->IsKindOf(CLASSINFO(wxDialog)))
-      {
-        wxLayoutConstraints *constr = child->GetConstraints();
-        if (constr)
+        noChanges = 0;
+        noFailures = 0;
+        wxNode *node = GetChildren().First();
+        while (node)

         {
         {

-          if (succeeded.Member(child))
-          {
-          }
-          else
-          {
-            int tempNoChanges = 0;
-            bool success = ( (phase == 1) ? child->LayoutPhase1(&tempNoChanges) : child->LayoutPhase2(&tempNoChanges) ) ;
-            noChanges += tempNoChanges;
-            if (success)
+            wxWindow *child = (wxWindow *)node->Data();
+            if (!child->IsKindOf(CLASSINFO(wxFrame)) && !child->IsKindOf(CLASSINFO(wxDialog)))

             {
             {

-              succeeded.Append(child);
+                wxLayoutConstraints *constr = child->GetConstraints();
+                if (constr)
+                {
+                    if (succeeded.Member(child))
+                    {
+                    }
+                    else
+                    {
+                        int tempNoChanges = 0;
+                        bool success = ( (phase == 1) ? child->LayoutPhase1(&tempNoChanges) : child->LayoutPhase2(&tempNoChanges) ) ;
+                        noChanges += tempNoChanges;
+                        if (success)
+                        {
+                            succeeded.Append(child);
+                        }
+                    }
+                }

             }
             }

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

         }
         }

-      }
-      node = node->Next();
+        noIterations ++;

     }
     }

-    noIterations ++;
-  }
-  return TRUE;
+    return TRUE;

 }
 
 void wxWindow::ResetConstraints()
 {
 }
 
 void wxWindow::ResetConstraints()
 {

-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    constr->left.SetDone(FALSE);
-    constr->top.SetDone(FALSE);
-    constr->right.SetDone(FALSE);
-    constr->bottom.SetDone(FALSE);
-    constr->width.SetDone(FALSE);
-    constr->height.SetDone(FALSE);
-    constr->centreX.SetDone(FALSE);
-    constr->centreY.SetDone(FALSE);
-  }
-  wxNode *node = GetChildren()->First();
-  while (node)
-  {
-    wxWindow *win = (wxWindow *)node->Data();
-    if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
-      win->ResetConstraints();
-    node = node->Next();
-  }
+    wxLayoutConstraints *constr = GetConstraints();
+    if (constr)
+    {
+        constr->left.SetDone(FALSE);
+        constr->top.SetDone(FALSE);
+        constr->right.SetDone(FALSE);
+        constr->bottom.SetDone(FALSE);
+        constr->width.SetDone(FALSE);
+        constr->height.SetDone(FALSE);
+        constr->centreX.SetDone(FALSE);
+        constr->centreY.SetDone(FALSE);
+    }
+    wxNode *node = GetChildren().First();
+    while (node)
+    {
+        wxWindow *win = (wxWindow *)node->Data();
+        if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
+            win->ResetConstraints();
+        node = node->Next();
+    }

 }
 
 // Need to distinguish between setting the 'fake' size for
 // windows and sizers, and setting the real values.
 void wxWindow::SetConstraintSizes(bool recurse)
 {
 }
 
 // Need to distinguish between setting the 'fake' size for
 // windows and sizers, and setting the real values.
 void wxWindow::SetConstraintSizes(bool recurse)
 {

-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr && constr->left.GetDone() && constr->right.GetDone() &&
-                constr->width.GetDone() && constr->height.GetDone())
-  {
-    int x = constr->left.GetValue();
-    int y = constr->top.GetValue();
-    int w = constr->width.GetValue();
-    int h = constr->height.GetValue();
-
-    // If we don't want to resize this window, just move it...
-    if ((constr->width.GetRelationship() != wxAsIs) ||
-        (constr->height.GetRelationship() != wxAsIs))
+    wxLayoutConstraints *constr = GetConstraints();
+    if (constr && constr->left.GetDone() && constr->right.GetDone() &&
+        constr->width.GetDone() && constr->height.GetDone())

     {
     {

-      // Calls Layout() recursively. AAAGH. How can we stop that.
-      // Simply take Layout() out of non-top level OnSizes.
-      SizerSetSize(x, y, w, h);
+        int x = constr->left.GetValue();
+        int y = constr->top.GetValue();
+        int w = constr->width.GetValue();
+        int h = constr->height.GetValue();
+        
+        // If we don't want to resize this window, just move it...
+        if ((constr->width.GetRelationship() != wxAsIs) ||
+            (constr->height.GetRelationship() != wxAsIs))
+        {
+            // Calls Layout() recursively. AAAGH. How can we stop that.
+            // Simply take Layout() out of non-top level OnSizes.
+            SizerSetSize(x, y, w, h);
+        }
+        else
+        {
+            SizerMove(x, y);
+        }

     }
     }

-    else
+    else if (constr)

     {
     {

-      SizerMove(x, y);
+        char *windowClass = this->GetClassInfo()->GetClassName();
+        
+        wxString winName;
+        if (GetName() == "")
+            winName = "unnamed";
+        else
+            winName = GetName();
+        wxDebugMsg("Constraint(s) not satisfied for window of type %s, name %s:\n", (const char *)windowClass, (const char *)winName);
+        if (!constr->left.GetDone())
+            wxDebugMsg("  unsatisfied 'left' constraint.\n");
+        if (!constr->right.GetDone())
+            wxDebugMsg("  unsatisfied 'right' constraint.\n");
+        if (!constr->width.GetDone())
+            wxDebugMsg("  unsatisfied 'width' constraint.\n");
+        if (!constr->height.GetDone())
+            wxDebugMsg("  unsatisfied 'height' constraint.\n");
+        wxDebugMsg("Please check constraints: try adding AsIs() constraints.\n");

     }
     }

-  }
-  else if (constr)
-  {
-    char *windowClass = this->GetClassInfo()->GetClassName();
-
-    wxString winName;
-       if (GetName() == "")
-               winName = "unnamed";
-       else
-               winName = GetName();
-    wxDebugMsg("Constraint(s) not satisfied for window of type %s, name %s:\n", (const char *)windowClass, (const char *)winName);
-    if (!constr->left.GetDone())
-      wxDebugMsg("  unsatisfied 'left' constraint.\n");
-    if (!constr->right.GetDone())
-      wxDebugMsg("  unsatisfied 'right' constraint.\n");
-    if (!constr->width.GetDone())
-      wxDebugMsg("  unsatisfied 'width' constraint.\n");
-    if (!constr->height.GetDone())
-      wxDebugMsg("  unsatisfied 'height' constraint.\n");
-    wxDebugMsg("Please check constraints: try adding AsIs() constraints.\n");
-  }
-
-  if (recurse)
-  {
-    wxNode *node = GetChildren()->First();
-    while (node)
+    
+    if (recurse)

     {
     {

-      wxWindow *win = (wxWindow *)node->Data();
-      if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
-        win->SetConstraintSizes();
-      node = node->Next();
+        wxNode *node = GetChildren().First();
+        while (node)
+        {
+            wxWindow *win = (wxWindow *)node->Data();
+            if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
+                win->SetConstraintSizes();
+            node = node->Next();
+        }

     }
     }

-  }

 }
 
 // This assumes that all sizers are 'on' the same
 // window, i.e. the parent of this window.
 void wxWindow::TransformSizerToActual(int *x, int *y) const
 {
 }
 
 // This assumes that all sizers are 'on' the same
 // window, i.e. the parent of this window.
 void wxWindow::TransformSizerToActual(int *x, int *y) const
 {

-  if (!m_sizerParent || m_sizerParent->IsKindOf(CLASSINFO(wxDialog)) ||
-                        m_sizerParent->IsKindOf(CLASSINFO(wxFrame)) )
-    return;
+    if (!m_sizerParent || m_sizerParent->IsKindOf(CLASSINFO(wxDialog)) ||
+        m_sizerParent->IsKindOf(CLASSINFO(wxFrame)) )
+        return;

     
     

-  int xp, yp;
-  m_sizerParent->GetPosition(&xp, &yp);
-  m_sizerParent->TransformSizerToActual(&xp, &yp);
-  *x += xp;
-  *y += yp;
+    int xp, yp;
+    m_sizerParent->GetPosition(&xp, &yp);
+    m_sizerParent->TransformSizerToActual(&xp, &yp);
+    *x += xp;
+    *y += yp;

 }
 
 void wxWindow::SizerSetSize(int x, int y, int w, int h)
 {
 }
 
 void wxWindow::SizerSetSize(int x, int y, int w, int h)
 {

-       int xx = x;
-       int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  SetSize(xx, yy, w, h);
+    int xx = x;
+    int yy = y;
+    TransformSizerToActual(&xx, &yy);
+    SetSize(xx, yy, w, h);

 }
 
 void wxWindow::SizerMove(int x, int y)
 {
 }
 
 void wxWindow::SizerMove(int x, int y)
 {

-       int xx = x;
-       int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  Move(xx, yy);
+    int xx = x;
+    int yy = y;
+    TransformSizerToActual(&xx, &yy);
+    Move(xx, yy);

 }
 
 // Only set the size/position of the constraint (if any)
 void wxWindow::SetSizeConstraint(int x, int y, int w, int h)
 {
 }
 
 // Only set the size/position of the constraint (if any)
 void wxWindow::SetSizeConstraint(int x, int y, int w, int h)
 {

-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    if (x != -1)
-    {
-      constr->left.SetValue(x);
-      constr->left.SetDone(TRUE);
-    }
-    if (y != -1)
+    wxLayoutConstraints *constr = GetConstraints();
+    if (constr)

     {
     {

-      constr->top.SetValue(y);
-      constr->top.SetDone(TRUE);
-    }
-    if (w != -1)
-    {
-      constr->width.SetValue(w);
-      constr->width.SetDone(TRUE);
-    }
-    if (h != -1)
-    {
-      constr->height.SetValue(h);
-      constr->height.SetDone(TRUE);
+        if (x != -1)
+        {
+            constr->left.SetValue(x);
+            constr->left.SetDone(TRUE);
+        }
+        if (y != -1)
+        {
+            constr->top.SetValue(y);
+            constr->top.SetDone(TRUE);
+        }
+        if (w != -1)
+        {
+            constr->width.SetValue(w);
+            constr->width.SetDone(TRUE);
+        }
+        if (h != -1)
+        {
+            constr->height.SetValue(h);
+            constr->height.SetDone(TRUE);
+        }

     }
     }

-  }

 }
 
 void wxWindow::MoveConstraint(int x, int y)
 {
 }
 
 void wxWindow::MoveConstraint(int x, int y)
 {

-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    if (x != -1)
-    {
-      constr->left.SetValue(x);
-      constr->left.SetDone(TRUE);
-    }
-    if (y != -1)
+    wxLayoutConstraints *constr = GetConstraints();
+    if (constr)

     {
     {

-      constr->top.SetValue(y);
-      constr->top.SetDone(TRUE);
+        if (x != -1)
+        {
+            constr->left.SetValue(x);
+            constr->left.SetDone(TRUE);
+        }
+        if (y != -1)
+        {
+            constr->top.SetValue(y);
+            constr->top.SetDone(TRUE);
+        }

     }
     }

-  }

 }
 
 void wxWindow::GetSizeConstraint(int *w, int *h) const
 {
 }
 
 void wxWindow::GetSizeConstraint(int *w, int *h) const
 {

-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetSize(w, h);
+    wxLayoutConstraints *constr = GetConstraints();
+    if (constr)
+    {
+        *w = constr->width.GetValue();
+        *h = constr->height.GetValue();
+    }
+    else
+        GetSize(w, h);

 }
 
 void wxWindow::GetClientSizeConstraint(int *w, int *h) const
 {
 }
 
 void wxWindow::GetClientSizeConstraint(int *w, int *h) const
 {

-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetClientSize(w, h);
+    wxLayoutConstraints *constr = GetConstraints();
+    if (constr)
+    {
+        *w = constr->width.GetValue();
+        *h = constr->height.GetValue();
+    }
+    else
+        GetClientSize(w, h);

 }
 
 void wxWindow::GetPositionConstraint(int *x, int *y) const
 {
 }
 
 void wxWindow::GetPositionConstraint(int *x, int *y) const
 {

-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *x = constr->left.GetValue();
-    *y = constr->top.GetValue();
-  }
-  else
-    GetPosition(x, y);
+    wxLayoutConstraints *constr = GetConstraints();
+    if (constr)
+    {
+        *x = constr->left.GetValue();
+        *y = constr->top.GetValue();
+    }
+    else
+        GetPosition(x, y);

 }
 
 bool wxWindow::Close(bool force)
 {
 }
 
 bool wxWindow::Close(bool force)
 {

-  wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
-  event.SetEventObject(this);
-  event.SetForce(force);
-
-  return GetEventHandler()->ProcessEvent(event);
+    wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
+    event.SetEventObject(this);
+    event.SetForce(force);
+    
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 wxObject* wxWindow::GetChild(int number) const
 {
 }
 
 wxObject* wxWindow::GetChild(int number) const
 {

-  // Return a pointer to the Nth object in the window
-  if (!GetChildren())
-    return(NULL) ;
-  wxNode *node = GetChildren()->First();
-  int n = number;
-  while (node && n--)
-    node = node->Next() ;
-  if (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
-    return(obj) ;
-  }
-  else
-    return NULL ;
+    // Return a pointer to the Nth object in the window
+    wxNode *node = GetChildren().First();
+    int n = number;
+    while (node && n--)
+        node = node->Next() ;
+    if (node)
+    {
+        wxObject *obj = (wxObject *)node->Data();
+        return(obj) ;
+    }
+    else
+        return NULL ;

 }
 
 void wxWindow::OnDefaultAction(wxControl *initiatingItem)
 }
 
 void wxWindow::OnDefaultAction(wxControl *initiatingItem)


@@ -1519,7 +2092,7 @@ void wxWindow::OnDefaultAction(wxControl *initiatingItem)
 
 void wxWindow::Clear()
 {
 
 void wxWindow::Clear()
 {

-       wxClientDC dc(this);
+    wxClientDC dc(this);

     wxBrush brush(GetBackgroundColour(), wxSOLID);
     dc.SetBackground(brush);
     dc.Clear();
     wxBrush brush(GetBackgroundColour(), wxSOLID);
     dc.SetBackground(brush);
     dc.Clear();


@@ -1528,117 +2101,121 @@ void wxWindow::Clear()
 // Fits the panel around the items
 void wxWindow::Fit()
 {
 // Fits the panel around the items
 void wxWindow::Fit()
 {

-       int maxX = 0;
-       int maxY = 0;
-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *win = (wxWindow *)node->Data();
-               int wx, wy, ww, wh;
-               win->GetPosition(&wx, &wy);
-               win->GetSize(&ww, &wh);
-               if ( wx + ww > maxX )
-                       maxX = wx + ww;
-               if ( wy + wh > maxY )
-                       maxY = wy + wh;
-
-               node = node->Next();
-       }
-       SetClientSize(maxX + 5, maxY + 5);
+    int maxX = 0;
+    int maxY = 0;
+    wxNode *node = GetChildren().First();
+    while ( node )
+    {
+        wxWindow *win = (wxWindow *)node->Data();
+        int wx, wy, ww, wh;
+        win->GetPosition(&wx, &wy);
+        win->GetSize(&ww, &wh);
+        if ( wx + ww > maxX )
+            maxX = wx + ww;
+        if ( wy + wh > maxY )
+            maxY = wy + wh;
+        
+        node = node->Next();
+    }
+    SetClientSize(maxX + 5, maxY + 5);

 }
 
 void wxWindow::SetValidator(const wxValidator& validator)
 {
 }
 
 void wxWindow::SetValidator(const wxValidator& validator)
 {

-       if ( m_windowValidator )
-               delete m_windowValidator;
-       m_windowValidator = validator.Clone();
-
-       if ( m_windowValidator )
-               m_windowValidator->SetWindow(this) ;
+    if ( m_windowValidator )
+        delete m_windowValidator;
+    m_windowValidator = validator.Clone();
+    
+    if ( m_windowValidator )
+        m_windowValidator->SetWindow(this) ;

 }
 
 }
 

-// Find a window by id or name
-wxWindow *wxWindow::FindWindow(long id)
+void wxWindow::SetClientObject( wxClientData *data )

 {
 {

-       if ( GetId() == id)
-               return this;
+    if (m_clientObject) delete m_clientObject;
+    m_clientObject = data;
+}

 
 

-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               wxWindow *found = child->FindWindow(id);
-               if ( found )
-                       return found;
-               node = node->Next();
-       }
-       return NULL;
+wxClientData *wxWindow::GetClientObject()
+{
+    return m_clientObject;

 }
 
 }
 

-wxWindow *wxWindow::FindWindow(const wxString& name)
+void wxWindow::SetClientData( void *data )

 {
 {

-       if ( GetName() == name)
-               return this;
+    m_clientData = data;
+}

 
 

-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               wxWindow *found = child->FindWindow(name);
-               if ( found )
-                       return found;
-               node = node->Next();
-       }
-       return NULL;
+void *wxWindow::GetClientData()
+{
+    return m_clientData;

 }
 
 }
 

-void wxWindow::OnIdle(wxIdleEvent& event)
+// Find a window by id or name
+wxWindow *wxWindow::FindWindow(long id)

 {
 {

-/* TODO: you may need to do something like this
- * if your GUI doesn't generate enter/leave events
+    if ( GetId() == id)
+        return this;
+    
+    wxNode *node = GetChildren().First();
+    while ( node )
+    {
+        wxWindow *child = (wxWindow *)node->Data();
+        wxWindow *found = child->FindWindow(id);
+        if ( found )
+            return found;
+        node = node->Next();
+    }
+    return NULL;
+}

 
 

-    // Check if we need to send a LEAVE event
-    if (m_mouseInWindow)
+wxWindow *wxWindow::FindWindow(const wxString& name)
+{
+    if ( GetName() == name)
+        return this;
+    
+    wxNode *node = GetChildren().First();
+    while ( node )

     {
     {

-        POINT pt;
-        ::GetCursorPos(&pt);
-        if (::WindowFromPoint(pt) != (HWND) GetHWND())
-        {
-            // Generate a LEAVE event
-            m_mouseInWindow = FALSE;
-            MSWOnMouseLeave(pt.x, pt.y, 0);
-        }
+        wxWindow *child = (wxWindow *)node->Data();
+        wxWindow *found = child->FindWindow(name);
+        if ( found )
+            return found;
+        node = node->Next();

     }
     }

-*/
+    return NULL;
+}

 
 

+void wxWindow::OnIdle(wxIdleEvent& event)
+{

     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)

-       UpdateWindowUI();
+    UpdateWindowUI();

 }
 
 // Raise the window to the top of the Z order
 void wxWindow::Raise()
 {
 }
 
 // Raise the window to the top of the Z order
 void wxWindow::Raise()
 {

-    Window window = XtWindow((Widget) GetMainWidget());
-    XRaiseWindow(XtDisplay((Widget) GetMainWidget()), window);
+    Window window = XtWindow((Widget) GetTopWidget());
+    XRaiseWindow(XtDisplay((Widget) GetTopWidget()), window);

 }
 
 // Lower the window to the bottom of the Z order
 void wxWindow::Lower()
 {
 }
 
 // Lower the window to the bottom of the Z order
 void wxWindow::Lower()
 {

-    Window window = XtWindow((Widget) GetMainWidget());
-    XLowerWindow(XtDisplay((Widget) GetMainWidget()), window);
+    Window window = XtWindow((Widget) GetTopWidget());
+    XLowerWindow(XtDisplay((Widget) GetTopWidget()), window);

 }
 
 bool wxWindow::AcceptsFocus() const
 {
 }
 
 bool wxWindow::AcceptsFocus() const
 {

-  return IsShown() && IsEnabled();
+    return IsShown() && IsEnabled();

 }
 
 // Update region access
 }
 
 // Update region access

-wxRegion wxWindow::GetUpdateRegion() const
+wxRegion& wxWindow::GetUpdateRegion() const

 {
 {

-    return m_updateRegion;
+    return (wxRegion&) m_updateRegion;

 }
 
 bool wxWindow::IsExposed(int x, int y, int w, int h) const
 }
 
 bool wxWindow::IsExposed(int x, int y, int w, int h) const


@@ -1657,8 +2234,8 @@ bool wxWindow::IsExposed(const wxRect& rect) const
 }
 
 /*
 }
 
 /*

- * Allocates control IDs
- */
+* Allocates control IDs
+*/

 
 int wxWindow::NewControlId()
 {
 
 int wxWindow::NewControlId()
 {


@@ -1679,7 +2256,7 @@ void wxWidgetResizeProc(Widget w, XConfigureEvent *event, String args[], int *nu
     wxWindow *win = (wxWindow *)wxWidgetHashTable->Get((long)w);
     if (!win)
         return;
     wxWindow *win = (wxWindow *)wxWidgetHashTable->Get((long)w);
     if (!win)
         return;

-
+    

     if (win->PreResize())
     {
         int width, height;
     if (win->PreResize())
     {
         int width, height;


@@ -1692,40 +2269,28 @@ void wxWidgetResizeProc(Widget w, XConfigureEvent *event, String args[], int *nu
 
 bool wxAddWindowToTable(Widget w, wxWindow *win)
 {
 
 bool wxAddWindowToTable(Widget w, wxWindow *win)
 {

-  wxWindow *oldItem = NULL;
-#if DEBUG
-//  printf("Adding widget %ld, name = %s\n", w, win->GetClassInfo()->GetClassName());
-#endif
-  if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
-  {
-    char buf[300];
-    sprintf(buf, "Widget table clash: new widget is %ld, %s", (long)w, win->GetClassInfo()->GetClassName());
-    wxError (buf);
-    fflush(stderr);
-    sprintf(buf, "Old widget was %s", oldItem->GetClassInfo()->GetClassName());
-    wxError (buf);
-    return FALSE;
-  }
-
-  wxWidgetHashTable->Put ((long) w, win);
-  return TRUE;
+    wxWindow *oldItem = NULL;
+    //  printf("Adding widget %ld, name = %s\n", w, win->GetClassInfo()->GetClassName());
+    if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
+    {
+        wxLogError("Widget table clash: new widget is %ld, %s", (long)w, win->GetClassInfo()->GetClassName());
+        return FALSE;
+    }
+    
+    wxWidgetHashTable->Put ((long) w, win);
+    return TRUE;

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

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

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

-#if DEBUG
-//  printf("Deleting widget %ld\n", w);
-#endif
-//  wxWindow *win = (wxWindow *)wxWidgetHashTable->Get ((long) w);
-
-  wxWidgetHashTable->Delete((long)w);
+    wxWidgetHashTable->Delete((long)w);

 }
 }

-  
+

 // Get the underlying X window and display
 WXWindow wxWindow::GetXWindow() const
 {
 // Get the underlying X window and display
 WXWindow wxWindow::GetXWindow() const
 {


@@ -1740,9 +2305,9 @@ WXDisplay *wxWindow::GetXDisplay() const
 WXWidget wxWindow::GetMainWidget() const
 {
     if (m_drawingArea)
 WXWidget wxWindow::GetMainWidget() const
 {
     if (m_drawingArea)

-      return m_drawingArea;
+        return m_drawingArea;

     else
     else

-      return m_mainWidget;
+        return m_mainWidget;

 }
 
 WXWidget wxWindow::GetClientWidget() const
 }
 
 WXWidget wxWindow::GetClientWidget() const


@@ -1750,377 +2315,406 @@ WXWidget wxWindow::GetClientWidget() const
     if (m_drawingArea != (WXWidget) 0)
         return m_drawingArea;
     else
     if (m_drawingArea != (WXWidget) 0)
         return m_drawingArea;
     else

-        return m_mainWidget;
+        return GetMainWidget();
+}
+
+WXWidget wxWindow::GetTopWidget() const
+{
+    return GetMainWidget();

 }
 
 void wxCanvasRepaintProc (Widget drawingArea, XtPointer clientData,
 }
 
 void wxCanvasRepaintProc (Widget drawingArea, XtPointer clientData,

- XmDrawingAreaCallbackStruct * cbs)
+                          XmDrawingAreaCallbackStruct * cbs)

 {
     if (!wxWidgetHashTable->Get ((long) (Widget) drawingArea))
 {
     if (!wxWidgetHashTable->Get ((long) (Widget) drawingArea))

-       return;
-
+        return;
+    

     XEvent * event = cbs->event;
     XEvent * event = cbs->event;

-    wxWindow * canvas = (wxWindow *) clientData;
-    Display * display = (Display *) canvas->GetXDisplay();
-    //    GC gc = (GC) canvas->GetDC()->gc;
-
+    wxWindow * win = (wxWindow *) clientData;
+    Display * display = (Display *) win->GetXDisplay();
+    

     switch (event->type)
     {
     switch (event->type)
     {

-      case Expose:
-      {
-       /* TODO
-        wxCanvasDC* canvasDC = canvas->GetDC();
-        if (canvasDC)
-       {
-          if (canvasDC->onpaint_reg)
-            XDestroyRegion(canvasDC->onpaint_reg);
-          canvasDC->onpaint_reg = XCreateRegion();
-          
-       }
-       */
-
-       int n = canvas->m_updateRects.Number();
-        XRectangle* xrects = new XRectangle[n];
-        int i;
-       for (i = 0; i < canvas->m_updateRects.Number(); i++)
-       {
-         wxRect* rect = (wxRect*) canvas->m_updateRects.Nth(i)->Data();
-         xrects[i].x = rect->x;
-          xrects[i].y = rect->y;
-          xrects[i].width = rect->width;
-          xrects[i].height = rect->height;
-         /* TODO (?) Actually ignore it I think.
-          if (canvasDC)
-            XUnionRectWithRegion(&(xrects[i]), canvasDC->onpaint_reg,
-              canvasDC->onpaint_reg);
-      */
-       }
-       /* TODO must clip the area being repainted. So we need a gc.
-         * Alternatively, wxPaintDC must do the clipping
-         * when it's created.
-        XSetClipRectangles(display, gc, 0, 0, xrects, n, Unsorted);
-       */
-
-        canvas->DoPaint() ; // xrects, n);
-        delete[] xrects;
-
-        canvas->m_updateRects.Clear();
-
-       /*
-        if (canvasDC)
-       {
-          XDestroyRegion(canvasDC->onpaint_reg);
-          canvasDC->onpaint_reg = NULL;
-       }
-
-       XGCValues gc_val;
-       gc_val.clip_mask = None;
-       XChangeGC(display, gc, GCClipMask, &gc_val);
-       */
-
-       break;
-    }
+    case Expose:
+        {
+            wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y,
+                event->xexpose.width, event->xexpose.height);
+                /*
+                cout << "Expose proc. wxRect: " << rect->x << ", " << rect->y << ", ";
+                cout << rect->width << ", " << rect->height << "\n\n";
+            */
+            
+            win->m_updateRects.Append((wxObject*) rect);
+            
+            if (event -> xexpose.count == 0)
+            {
+                wxPaintEvent event(win->GetId());
+                event.SetEventObject(win);
+                win->GetEventHandler()->ProcessEvent(event);
+                
+                win->ClearUpdateRects();
+            }
+            break;
+        }

     default:
     default:

-    {
-       cout << "\n\nNew Event ! is = " << event -> type << "\n";
-       break;
+        {
+            cout << "\n\nNew Event ! is = " << event -> type << "\n";
+            break;
+        }

     }
     }

-  }

 }
 
 // Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4)
 void 
 wxCanvasEnterLeave (Widget drawingArea, XtPointer clientData, XCrossingEvent * event)
 {
 }
 
 // Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4)
 void 
 wxCanvasEnterLeave (Widget drawingArea, XtPointer clientData, XCrossingEvent * event)
 {

-  XmDrawingAreaCallbackStruct cbs;
-  XEvent ev;
-
-  //if (event->mode!=NotifyNormal)
-  //  return ;
-
-//  ev = *((XEvent *) event); // Causes Purify error (copying too many bytes)
-  ((XCrossingEvent &) ev) = *event;
-
-  cbs.reason = XmCR_INPUT;
-  cbs.event = &ev;
-
-  wxCanvasInputEvent (drawingArea, (XtPointer) NULL, &cbs);
+    XmDrawingAreaCallbackStruct cbs;
+    XEvent ev;
+    
+    //if (event->mode!=NotifyNormal)
+    //  return ;
+    
+    //  ev = *((XEvent *) event); // Causes Purify error (copying too many bytes)
+    ((XCrossingEvent &) ev) = *event;
+    
+    cbs.reason = XmCR_INPUT;
+    cbs.event = &ev;
+    
+    wxCanvasInputEvent (drawingArea, (XtPointer) NULL, &cbs);

 }
 
 // Fix to make it work under Motif 1.0 (!)
 void wxCanvasMotionEvent (Widget drawingArea, XButtonEvent * event)
 {
 #if   XmVersion<=1000
 }
 
 // Fix to make it work under Motif 1.0 (!)
 void wxCanvasMotionEvent (Widget drawingArea, XButtonEvent * event)
 {
 #if   XmVersion<=1000

-
-  XmDrawingAreaCallbackStruct cbs;
-  XEvent ev;
-
-  //ev.xbutton = *event;
-  ev = *((XEvent *) event);
-  cbs.reason = XmCR_INPUT;
-  cbs.event = &ev;
-
-  wxCanvasInputEvent (drawingArea, (XtPointer) NULL, &cbs);
+    
+    XmDrawingAreaCallbackStruct cbs;
+    XEvent ev;
+    
+    //ev.xbutton = *event;
+    ev = *((XEvent *) event);
+    cbs.reason = XmCR_INPUT;
+    cbs.event = &ev;
+    
+    wxCanvasInputEvent (drawingArea, (XtPointer) NULL, &cbs);

 #endif
 }
 
 void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs)
 {
 #endif
 }
 
 void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs)
 {

-  wxWindow *canvas = (wxWindow *) wxWidgetHashTable->Get ((long) (Widget) drawingArea);
-  XEvent local_event;
-
-  if (canvas==NULL)
-    return ;
-
-  if (cbs->reason != XmCR_INPUT)
-    return;
-
-  local_event = *(cbs->event); // We must keep a copy!
-
+    wxWindow *canvas = (wxWindow *) wxWidgetHashTable->Get ((long) (Widget) drawingArea);
+    XEvent local_event;
+    
+    if (canvas==NULL)
+        return ;
+    
+    if (cbs->reason != XmCR_INPUT)
+        return;
+    
+    local_event = *(cbs->event);       // We must keep a copy!
+    
+  /*

   switch (local_event.xany.type)
   switch (local_event.xany.type)

+  {
+  case EnterNotify:
+  cout << "EnterNotify\n";
+  break;
+  case LeaveNotify:
+  cout << "LeaveNotify\n";
+  break;
+  case ButtonPress:
+  cout << "ButtonPress\n";
+  break;
+  case ButtonRelease:
+  cout << "ButtonRelease\n";
+  break;
+  case MotionNotify:
+  cout << "MotionNotify\n";
+  break;
+  default:
+  cout << "Something else\n";
+  break;
+  }
+    */
+    
+    switch (local_event.xany.type)

     {
     case EnterNotify:
     case LeaveNotify:
     case ButtonPress:
     case ButtonRelease:
     case MotionNotify:
     {
     case EnterNotify:
     case LeaveNotify:
     case ButtonPress:
     case ButtonRelease:
     case MotionNotify:

-      {
-       wxEventType eventType = wxEVT_NULL;
-
-       if (local_event.xany.type == EnterNotify)
-         {
-           //if (local_event.xcrossing.mode!=NotifyNormal)
-           //  return ; // Ignore grab events
-           eventType = wxEVT_ENTER_WINDOW;
-//            canvas->GetEventHandler()->OnSetFocus();
-         }
-       else if (local_event.xany.type == LeaveNotify)
-         {
-           //if (local_event.xcrossing.mode!=NotifyNormal)
-           //  return ; // Ignore grab events
-           eventType = wxEVT_LEAVE_WINDOW;
-//            canvas->GetEventHandler()->OnKillFocus();
-         }
-       else if (local_event.xany.type == MotionNotify)
-         {
-           eventType = wxEVT_MOTION;
-           if (local_event.xmotion.is_hint == NotifyHint)
-             {
-               Window root, child;
-               Display *dpy = XtDisplay (drawingArea);
-
-               XQueryPointer (dpy, XtWindow (drawingArea),
-                              &root, &child,
-                              &local_event.xmotion.x_root,
-                              &local_event.xmotion.y_root,
-                              &local_event.xmotion.x,
-                              &local_event.xmotion.y,
-                              &local_event.xmotion.state);
-             }
-           else
-             {
-             }
-         }
-
-       else if (local_event.xany.type == ButtonPress)
-         {
-           if (local_event.xbutton.button == Button1)
-             {
-               eventType = wxEVT_LEFT_DOWN;
-               canvas->m_button1Pressed = TRUE;
-             }
-           else if (local_event.xbutton.button == Button2)
-             {
-               eventType = wxEVT_MIDDLE_DOWN;
-               canvas->m_button2Pressed = TRUE;
-             }
-           else if (local_event.xbutton.button == Button3)
-             {
-               eventType = wxEVT_RIGHT_DOWN;
-               canvas->m_button3Pressed = TRUE;
-             }
-         }
-       else if (local_event.xany.type == ButtonRelease)
-         {
-           if (local_event.xbutton.button == Button1)
-             {
-               eventType = wxEVT_LEFT_UP;
-               canvas->m_button1Pressed = FALSE;
-             }
-           else if (local_event.xbutton.button == Button2)
-             {
-               eventType = wxEVT_MIDDLE_UP;
-               canvas->m_button2Pressed = FALSE;
-             }
-           else if (local_event.xbutton.button == Button3)
-             {
-               eventType = wxEVT_RIGHT_UP;
-               canvas->m_button3Pressed = FALSE;
-             }
-         }
-
-       wxMouseEvent wxevent (eventType);
-       wxevent.m_eventHandle = (char *) &local_event;
-
-       wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
-                           || (event_left_is_down (&local_event) 
-                               && (eventType != wxEVT_LEFT_UP)));
-       wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)
-                             || (event_middle_is_down (&local_event) 
-                                 && (eventType != wxEVT_MIDDLE_UP)));
-       wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)
-                            || (event_right_is_down (&local_event) 
-                                && (eventType != wxEVT_RIGHT_UP)));
-
-       wxevent.m_shiftDown = local_event.xbutton.state & ShiftMask;
-       wxevent.m_controlDown = local_event.xbutton.state & ControlMask;
-        wxevent.m_altDown = local_event.xbutton.state & Mod3Mask;
-        wxevent.m_metaDown = local_event.xbutton.state & Mod1Mask;
-        wxevent.SetTimestamp(local_event.xbutton.time);
-
-    // Now check if we need to translate this event into a double click
-    if (TRUE) // canvas->doubleClickAllowed)
-    {
-       if (wxevent.ButtonDown())
-       {
-             long dclickTime = XtGetMultiClickTime((Display*) wxGetDisplay()) ;
-
-            // get button and time-stamp
-            int button = 0;
-            if      (wxevent.LeftDown())   button = 1;
-            else if (wxevent.MiddleDown()) button = 2;
-            else if (wxevent.RightDown())  button = 3;
-            long ts = wxevent.GetTimestamp();
-            // check, if single or double click
-            if (canvas->m_lastButton && canvas->m_lastButton==button && (ts - canvas->m_lastTS) < dclickTime)
-              {
-               // I have a dclick
-                canvas->m_lastButton = 0;
-                switch ( eventType )
-                  {
-                  case wxEVT_LEFT_DOWN:
-                    wxevent.SetEventType(wxEVT_LEFT_DCLICK);
-                    break;
-                  case wxEVT_MIDDLE_DOWN:
-                    wxevent.SetEventType(wxEVT_MIDDLE_DCLICK);
-                    break;
-                  case wxEVT_RIGHT_DOWN:
-                    wxevent.SetEventType(wxEVT_RIGHT_DCLICK);
-                    break;
-
-                  default :
-                    break;
-                  }
-
-              }
-            else
-              {
-                // not fast enough or different button
-                canvas->m_lastTS     = ts;
-                canvas->m_lastButton = button;
-              }
-       }
-    }
-
-        wxevent.SetId(canvas->GetId());
-        wxevent.SetEventObject(canvas);
-       canvas->GetEventHandler()->ProcessEvent (wxevent);
-       /*
-       if (eventType == wxEVT_ENTER_WINDOW ||
-           eventType == wxEVT_LEAVE_WINDOW ||
-           eventType == wxEVT_MOTION
-         )
-         return;
-         */
-       break;
+        {
+            wxEventType eventType = wxEVT_NULL;
+            
+            if (local_event.xany.type == EnterNotify)
+            {
+                //if (local_event.xcrossing.mode!=NotifyNormal)
+                //  return ; // Ignore grab events
+                eventType = wxEVT_ENTER_WINDOW;
+                //            canvas->GetEventHandler()->OnSetFocus();
+            }
+            else if (local_event.xany.type == LeaveNotify)
+            {
+                //if (local_event.xcrossing.mode!=NotifyNormal)
+                //  return ; // Ignore grab events
+                eventType = wxEVT_LEAVE_WINDOW;
+                //            canvas->GetEventHandler()->OnKillFocus();
+            }
+            else if (local_event.xany.type == MotionNotify)
+            {
+                eventType = wxEVT_MOTION;
+                if (local_event.xmotion.is_hint == NotifyHint)
+                {
+                    Window root, child;
+                    Display *dpy = XtDisplay (drawingArea);
+                    
+                    XQueryPointer (dpy, XtWindow (drawingArea),
+                        &root, &child,
+                        &local_event.xmotion.x_root,
+                        &local_event.xmotion.y_root,
+                        &local_event.xmotion.x,
+                        &local_event.xmotion.y,
+                        &local_event.xmotion.state);
+                }
+                else
+                {
+                }
+            }
+            
+            else if (local_event.xany.type == ButtonPress)
+            {
+                if (local_event.xbutton.button == Button1)
+                {
+                    eventType = wxEVT_LEFT_DOWN;
+                    canvas->m_button1Pressed = TRUE;
+                }
+                else if (local_event.xbutton.button == Button2)
+                {
+                    eventType = wxEVT_MIDDLE_DOWN;
+                    canvas->m_button2Pressed = TRUE;
+                }
+                else if (local_event.xbutton.button == Button3)
+                {
+                    eventType = wxEVT_RIGHT_DOWN;
+                    canvas->m_button3Pressed = TRUE;
+                }
+            }
+            else if (local_event.xany.type == ButtonRelease)
+            {
+                if (local_event.xbutton.button == Button1)
+                {
+                    eventType = wxEVT_LEFT_UP;
+                    canvas->m_button1Pressed = FALSE;
+                }
+                else if (local_event.xbutton.button == Button2)
+                {
+                    eventType = wxEVT_MIDDLE_UP;
+                    canvas->m_button2Pressed = FALSE;
+                }
+                else if (local_event.xbutton.button == Button3)
+                {
+                    eventType = wxEVT_RIGHT_UP;
+                    canvas->m_button3Pressed = FALSE;
+                }
+            }
+            
+            wxMouseEvent wxevent (eventType);
+            wxevent.m_eventHandle = (char *) &local_event;
+            
+            wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
+                || (event_left_is_down (&local_event) 
+                && (eventType != wxEVT_LEFT_UP)));
+            wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)
+                || (event_middle_is_down (&local_event) 
+                && (eventType != wxEVT_MIDDLE_UP)));
+            wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)
+                || (event_right_is_down (&local_event) 
+                && (eventType != wxEVT_RIGHT_UP)));
+            
+            wxevent.m_shiftDown = local_event.xbutton.state & ShiftMask;
+            wxevent.m_controlDown = local_event.xbutton.state & ControlMask;
+            wxevent.m_altDown = local_event.xbutton.state & Mod3Mask;
+            wxevent.m_metaDown = local_event.xbutton.state & Mod1Mask;
+            wxevent.SetTimestamp(local_event.xbutton.time);
+            
+            // Now check if we need to translate this event into a double click
+            if (TRUE) // canvas->doubleClickAllowed)
+            {
+                if (wxevent.ButtonDown())
+                {
+                    long dclickTime = XtGetMultiClickTime((Display*) wxGetDisplay()) ;
+                    
+                    // get button and time-stamp
+                    int button = 0;
+                    if      (wxevent.LeftDown())   button = 1;
+                    else if (wxevent.MiddleDown()) button = 2;
+                    else if (wxevent.RightDown())  button = 3;
+                    long ts = wxevent.GetTimestamp();
+                    // check, if single or double click
+                    if (canvas->m_lastButton && canvas->m_lastButton==button && (ts - canvas->m_lastTS) < dclickTime)
+                    {
+                        // I have a dclick
+                        canvas->m_lastButton = 0;
+                        switch ( eventType )
+                        {
+                        case wxEVT_LEFT_DOWN:
+                            wxevent.SetEventType(wxEVT_LEFT_DCLICK);
+                            break;
+                        case wxEVT_MIDDLE_DOWN:
+                            wxevent.SetEventType(wxEVT_MIDDLE_DCLICK);
+                            break;
+                        case wxEVT_RIGHT_DOWN:
+                            wxevent.SetEventType(wxEVT_RIGHT_DCLICK);
+                            break;
+                            
+                        default :
+                            break;
+                        }
+                        
+                    }
+                    else
+                    {
+                        // not fast enough or different button
+                        canvas->m_lastTS     = ts;
+                        canvas->m_lastButton = button;
+                    }
+                }
+            }
+            
+            wxevent.SetId(canvas->GetId());
+            wxevent.SetEventObject(canvas);
+            wxevent.m_x = local_event.xbutton.x;
+            wxevent.m_y = local_event.xbutton.y;
+            canvas->GetEventHandler()->ProcessEvent (wxevent);
+            /*
+            if (eventType == wxEVT_ENTER_WINDOW ||
+            eventType == wxEVT_LEAVE_WINDOW ||
+            eventType == wxEVT_MOTION
+            )
+            return;
+            */
+            break;

       }
     case KeyPress:
       }
     case KeyPress:

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

         {
         {

-          // Implement wxFrame::OnCharHook by checking ancestor.
-          wxWindow *parent = canvas->GetParent();
-          while (parent && !parent->IsKindOf(CLASSINFO(wxFrame)))
-            parent = parent->GetParent();
-            
-          if (parent)
-          {
-            event.SetEventType(wxEVT_CHAR_HOOK);
-            if (parent->GetEventHandler()->ProcessEvent(event))
-              return;
-            event.SetEventType(wxEVT_CHAR);
-          }
+            KeySym keySym;
+            // XComposeStatus compose;
+            // (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, &compose);
+            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL);
+            int id = wxCharCodeXToWX (keySym);

 
 

-         canvas->GetEventHandler()->ProcessEvent (event);
+            wxEventType eventType = wxEVT_CHAR;
+
+            // TODO: Is this the correct criterion for wxEVT_KEY_DOWN down versus wxEVT_CHAR?
+            if (id > WXK_START) // Non-ASCII values
+                eventType = wxEVT_KEY_DOWN;
+            
+            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)
+            {
+                // Implement wxFrame::OnCharHook by checking ancestor.
+                wxWindow *parent = canvas->GetParent();
+                while (parent && !parent->IsKindOf(CLASSINFO(wxFrame)))
+                    parent = parent->GetParent();
+                
+                if (parent)
+                {
+                    event.SetEventType(wxEVT_CHAR_HOOK);
+                    if (parent->GetEventHandler()->ProcessEvent(event))
+                        return;
+                    event.SetEventType(wxEVT_CHAR);
+                }
+                
+                canvas->GetEventHandler()->ProcessEvent (event);
+            }
+            break;
+        }
+    case KeyRelease:
+        {
+            KeySym keySym;
+            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL);
+            int id = wxCharCodeXToWX (keySym);
+            
+            wxKeyEvent event (wxEVT_KEY_UP);
+            
+            if (local_event.xkey.state & ShiftMask)
+                event.m_shiftDown = TRUE;
+            if (local_event.xkey.state & ControlMask)
+                event.m_controlDown = TRUE;
+            if (local_event.xkey.state & Mod3Mask)
+                event.m_altDown = TRUE;
+            if (local_event.xkey.state & Mod1Mask)
+                event.m_metaDown = TRUE;
+            event.SetEventObject(canvas);
+            event.m_keyCode = id;
+            event.SetTimestamp(local_event.xkey.time);
+            
+            if (id > -1)
+            {
+                canvas->GetEventHandler()->ProcessEvent (event);
+            }
+            break;

         }
         }

-       break;
-      }

     case FocusIn:
     case FocusIn:

-      {
-        if (local_event.xfocus.detail != NotifyPointer)
-       {
-          wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId());
-          event.SetEventObject(canvas);
-          canvas->GetEventHandler()->ProcessEvent(event);
+        {
+            if (local_event.xfocus.detail != NotifyPointer)
+            {
+                wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId());
+                event.SetEventObject(canvas);
+                canvas->GetEventHandler()->ProcessEvent(event);
+            }
+            break;

         }
         }

-       break;
-      }

     case FocusOut:
     case FocusOut:

-      {
-        if (local_event.xfocus.detail != NotifyPointer)
-       {
-          wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId());
-          event.SetEventObject(canvas);
-          canvas->GetEventHandler()->ProcessEvent(event);
-       }
-        break;
-      }
+        {
+            if (local_event.xfocus.detail != NotifyPointer)
+            {
+                wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId());
+                event.SetEventObject(canvas);
+                canvas->GetEventHandler()->ProcessEvent(event);
+            }
+            break;
+        }

     default:
     default:

-      break;
+        break;

     }
 }
 
 void wxWindow::DoPaint()
 {
     }
 }
 
 void wxWindow::DoPaint()
 {

-  //TODO : make a temporary gc so we can do the XCopyArea below
-  if (0) // m_backingPixmap)
+    //TODO : make a temporary gc so we can do the XCopyArea below
+    if (0) // m_backingPixmap)

     {
     {

-      /*
-      Widget drawingArea = (Widget) m_drawingArea;
-      //      int orig = GetDC()->GetLogicalFunction();
-      //      GetDC()->SetLogicalFunction (wxCOPY);
-
+    /*
+    Widget drawingArea = (Widget) m_drawingArea;
+    //      int orig = GetDC()->GetLogicalFunction();
+    //      GetDC()->SetLogicalFunction (wxCOPY);
+    

       // TODO: it may not be necessary to store m_pixmapOffsetX/Y; we
       // should be able to calculate them.
       XCopyArea (XtDisplay (drawingArea), m_backingPixmap, XtWindow (drawingArea), GetDC ()->gc,
       // TODO: it may not be necessary to store m_pixmapOffsetX/Y; we
       // should be able to calculate them.
       XCopyArea (XtDisplay (drawingArea), m_backingPixmap, XtWindow (drawingArea), GetDC ()->gc,

-                m_pixmapOffsetX, m_pixmapOffsetY,
-                m_pixmapWidth, m_pixmapHeight,
-                0, 0);
-
-      //      GetDC()->SetLogicalFunction (orig);
-      */
+      m_pixmapOffsetX, m_pixmapOffsetY,
+      m_pixmapWidth, m_pixmapHeight,
+      0, 0);
+      
+        //      GetDC()->SetLogicalFunction (orig);
+        */

     }
     }

-  else
+    else

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


@@ -2131,162 +2725,793 @@ void wxWindow::DoPaint()
 // SetSize, but as per old wxCanvas (with drawing widget etc.)
 void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags)
 {
 // SetSize, but as per old wxCanvas (with drawing widget etc.)
 void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags)
 {

-  Widget drawingArea = (Widget) m_drawingArea;
-  bool managed = XtIsManaged(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
+    // 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);
+            
+        }
+    }
+    
+    if (managed)
+        XtManageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
+    XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
+    
+    /*
+    int ww, hh;
+    GetClientSize (&ww, &hh);
+    wxSizeEvent sizeEvent(wxSize(ww, hh), GetId());
+    sizeEvent.SetEventObject(this);
+    
+      GetEventHandler()->ProcessEvent(sizeEvent);
+    */
+    
+}
+
+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);
+        /* 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);
+          }
+    */
+    
+    XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
+    
+    /* TODO
+    allowRepainting = TRUE;
+    DoRefresh ();
+    */
+    
+    /*
+    wxSizeEvent sizeEvent(wxSize(w, h), GetId());
+    sizeEvent.SetEventObject(this);
+    
+      GetEventHandler()->ProcessEvent(sizeEvent);
+    */
+}
+
+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;
+}

 
 

-  if (managed)
-    XtUnmanageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-  XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
+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;
+}

 
 

-  if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+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())

     {
     {

-      XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
-                    XmNx, x, NULL);
+        wxPoint pt(GetParent()->GetClientAreaOrigin());
+        xx -= pt.x;
+        yy -= pt.y;

     }
     }

+    
+    *x = xx;
+    *y = yy;
+}

 
 

-  if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+// Add to hash table, add event handler
+bool wxWindow::AttachWidget (wxWindow* parent, WXWidget mainWidget,
+                             WXWidget formWidget, int x, int y, int width, int height)
+{
+    wxAddWindowToTable((Widget) mainWidget, this);
+    if (CanAddEventHandler())

     {
     {

-      XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow,
-                    XmNy, y, NULL);
+        XtAddEventHandler((Widget) mainWidget,
+            ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
+            False,
+            wxPanelItemEventHandler,
+            (XtPointer) this);

     }
     }

+    
+    if (!formWidget)
+    {
+        XtTranslations ptr;
+        XtOverrideTranslations ((Widget) mainWidget,
+            ptr = XtParseTranslationTable ("<Configure>: resize()"));
+        XtFree ((char *) ptr);
+    }
+    
+    // Some widgets have a parent form widget, e.g. wxRadioBox
+    if (formWidget)
+    {
+        if (!wxAddWindowToTable((Widget) formWidget, this))
+            return FALSE;
+        
+        XtTranslations ptr;
+        XtOverrideTranslations ((Widget) formWidget,
+            ptr = XtParseTranslationTable ("<Configure>: resize()"));
+        XtFree ((char *) ptr);
+    }
+    
+    if (x == -1)
+        x = 0;
+    if (y == -1)
+        y = 0;
+    SetSize (x, y, width, height);
+    
+    return TRUE;
+}

 
 

-  if (w > -1)
+// Remove event handler, remove from hash table
+bool wxWindow::DetachWidget(WXWidget widget)
+{
+    if (CanAddEventHandler())

     {
     {

-      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);
-       }
+        XtRemoveEventHandler((Widget) widget,
+            ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
+            False,
+            wxPanelItemEventHandler,
+            (XtPointer)this);
+    }
+    
+    wxDeleteWindowFromTable((Widget) widget);
+    return TRUE;
+}

 
 

-      XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
+void wxPanelItemEventHandler (Widget    wid,
+                              XtPointer client_data,
+                              XEvent*   event,
+                              Boolean *continueToDispatch)
+{
+    // Widget can be a label or the actual widget.
+    
+    wxWindow *window = (wxWindow *)wxWidgetHashTable->Get((long)wid);
+    if (window)
+    {
+        wxMouseEvent wxevent(0);
+        if (wxTranslateMouseEvent(wxevent, window, wid, event))
+        {
+            window->GetEventHandler()->ProcessEvent(wxevent);
+        }
+    }
+    // TODO: probably the key to allowing default behaviour
+    // to happen.
+    // Say we set a m_doDefault flag to FALSE at the start of this
+    // function. Then in e.g. wxWindow::OnMouseEvent we can
+    // call Default() which sets this flag to TRUE, indicating
+    // that default processing can happen. Thus, behaviour can appear
+    // to be overridden just by adding an event handler and not calling
+    // wxWindow::OnWhatever.
+    // ALSO, maybe we can use this instead of the current way of handling
+    // drawing area events, to simplify things.
+    *continueToDispatch = True;
+}
+
+static void wxScrollBarCallback(Widget scrollbar, XtPointer clientData,
+                                XmScaleCallbackStruct *cbs)
+{
+    Widget scrolledWindow = XtParent (scrollbar);
+    wxWindow *win = (wxWindow *) wxWidgetHashTable->Get ((long) scrolledWindow);
+    int orientation = (int) clientData;
+    
+    wxEventType eventType = wxEVT_NULL;
+    switch (cbs->reason)
+    {
+    case XmCR_INCREMENT:
+        {
+            eventType = wxEVT_SCROLL_LINEDOWN;
+            break;
+        }
+    case XmCR_DECREMENT:
+        {
+            eventType = wxEVT_SCROLL_LINEUP;
+            break;
+        }
+    case XmCR_DRAG:
+        {
+            eventType = wxEVT_SCROLL_THUMBTRACK;
+            break;
+        }
+    case XmCR_VALUE_CHANGED:
+        {
+            // TODO: Should this be intercepted too, or will it cause
+            // duplicate events?
+            eventType = wxEVT_SCROLL_THUMBTRACK;
+            break;
+        }
+    case XmCR_PAGE_INCREMENT:
+        {
+            eventType = wxEVT_SCROLL_PAGEDOWN;
+            break;
+        }
+    case XmCR_PAGE_DECREMENT:
+        {
+            eventType = wxEVT_SCROLL_PAGEUP;
+            break;
+        }
+    case XmCR_TO_TOP:
+        {
+            eventType = wxEVT_SCROLL_TOP;
+            break;
+        }
+    case XmCR_TO_BOTTOM:
+        {
+            eventType = wxEVT_SCROLL_BOTTOM;
+            break;
+        }
+    default:
+        {
+            // Should never get here
+            wxFAIL_MSG("Unknown scroll event.");
+            break;
+        }
+    }
+    
+    wxScrollEvent event(eventType, win->GetId());
+    event.SetEventObject(win);
+    event.SetPosition(cbs->value);
+    event.SetOrientation( (orientation == XmHORIZONTAL) ? wxHORIZONTAL : wxVERTICAL );
+    
+    win->GetEventHandler()->ProcessEvent(event);
+}

 
 

-      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;
+bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent)
+{
+    switch (xevent->xany.type)
+    {
+    case EnterNotify:
+    case LeaveNotify:
+    case ButtonPress:
+    case ButtonRelease:
+    case MotionNotify:
+        {
+            wxEventType eventType = wxEVT_NULL;
+            
+            if (xevent->xany.type == LeaveNotify)
+            {
+                win->m_button1Pressed = FALSE;
+                win->m_button2Pressed = FALSE;
+                win->m_button3Pressed = FALSE;
+                return FALSE;
+            }
+            else if (xevent->xany.type == MotionNotify)
+            {
+                eventType = wxEVT_MOTION;
+            }
+            else if (xevent->xany.type == ButtonPress)
+            {
+                if (xevent->xbutton.button == Button1)
+                {
+                    eventType = wxEVT_LEFT_DOWN;
+                    win->m_button1Pressed = TRUE;
+                }
+                else if (xevent->xbutton.button == Button2)
+                {
+                    eventType = wxEVT_MIDDLE_DOWN;
+                    win->m_button2Pressed = TRUE;
+                }
+                else if (xevent->xbutton.button == Button3)
+                {
+                    eventType = wxEVT_RIGHT_DOWN;
+                    win->m_button3Pressed = TRUE;
+                }
+            }
+            else if (xevent->xany.type == ButtonRelease)
+            {
+                if (xevent->xbutton.button == Button1)
+                {
+                    eventType = wxEVT_LEFT_UP;
+                    win->m_button1Pressed = FALSE;
+                }
+                else if (xevent->xbutton.button == Button2)
+                {
+                    eventType = wxEVT_MIDDLE_UP;
+                    win->m_button2Pressed = FALSE;
+                }
+                else if (xevent->xbutton.button == Button3)
+                {
+                    eventType = wxEVT_RIGHT_UP;
+                    win->m_button3Pressed = FALSE;
+                }
+                else return FALSE;
+            }
+            else return FALSE;
+            
+            wxevent.m_eventHandle = (char *)xevent;
+            wxevent.SetEventType(eventType);
+            
+            Position x1, y1;
+            XtVaGetValues(widget, XmNx, &x1, XmNy, &y1, NULL);
+            
+            int x2, y2;
+            win->GetPosition(&x2, &y2);
+            
+            // The button x/y must be translated to wxWindows
+            // window space - the widget might be a label or button,
+            // within a form.
+            int dx = 0;
+            int dy = 0;
+            if (widget != (Widget)win->GetMainWidget())
+            {
+                dx = x1;
+                dy = y1;
+            }
+            
+            wxevent.m_x = xevent->xbutton.x + dx;
+            wxevent.m_y = xevent->xbutton.y + dy;
+            
+            wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
+                || (event_left_is_down (xevent) 
+                && (eventType != wxEVT_LEFT_UP)));
+            wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)
+                || (event_middle_is_down (xevent) 
+                && (eventType != wxEVT_MIDDLE_UP)));
+            wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)
+                || (event_right_is_down (xevent) 
+                && (eventType != wxEVT_RIGHT_UP)));
+            
+            wxevent.m_shiftDown = xevent->xbutton.state & ShiftMask;
+            wxevent.m_controlDown = xevent->xbutton.state & ControlMask;
+            return TRUE;
+        }
+    }
+    return FALSE;
+}

 
 

-      w -= (spacing + wsbar);
+bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent)
+{
+    switch (xevent->xany.type)
+    {
+    case KeyPress:
+        {
+            char buf[20];
+            
+            KeySym keySym;
+            // XComposeStatus compose;
+            // (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, &compose);
+            (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
+            int id = wxCharCodeXToWX (keySym);
+            
+            if (xevent->xkey.state & ShiftMask)
+                wxevent.m_shiftDown = TRUE;
+            if (xevent->xkey.state & ControlMask)
+                wxevent.m_controlDown = TRUE;
+            if (xevent->xkey.state & Mod3Mask)
+                wxevent.m_altDown = TRUE;
+            if (xevent->xkey.state & Mod1Mask)
+                wxevent.m_metaDown = TRUE;
+            wxevent.SetEventObject(win);
+            wxevent.m_keyCode = id;
+            wxevent.SetTimestamp(xevent->xkey.time);
+            
+            wxevent.m_x = xevent->xbutton.x;
+            wxevent.m_y = xevent->xbutton.y;
+            
+            if (id > -1)
+                return TRUE;
+            else
+                return FALSE;
+            break;
+        }
+    default:
+        break;
+    }
+    return FALSE;
+}

 
 

-      XtVaSetValues ((Widget) m_drawingArea, XmNwidth, w, NULL);
+#define YAllocColor XAllocColor
+XColor g_itemColors[5];
+int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
+{
+    int result;
+    static XmColorProc colorProc;
+    
+    result = wxNO_COLORS;
+    
+    if (back)
+    {
+        g_itemColors[0].red = (((long) back->Red ()) << 8);
+        g_itemColors[0].green = (((long) back->Green ()) << 8);
+        g_itemColors[0].blue = (((long) back->Blue ()) << 8);
+        g_itemColors[0].flags = DoRed | DoGreen | DoBlue;
+        if (colorProc == (XmColorProc) NULL)
+        {
+            // Get a ptr to the actual function
+            colorProc = XmSetColorCalculation ((XmColorProc) NULL);
+            // And set it back to motif.
+            XmSetColorCalculation (colorProc);
+        }
+        (*colorProc) (&g_itemColors[wxBACK_INDEX],
+            &g_itemColors[wxFORE_INDEX],
+            &g_itemColors[wxSELE_INDEX],
+            &g_itemColors[wxTOPS_INDEX],
+            &g_itemColors[wxBOTS_INDEX]);
+        result = wxBACK_COLORS;

     }
     }

-  if (h > -1)
+    if (fore)

     {
     {

-      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);
+        g_itemColors[wxFORE_INDEX].red = (((long) fore->Red ()) << 8);
+        g_itemColors[wxFORE_INDEX].green = (((long) fore->Green ()) << 8);
+        g_itemColors[wxFORE_INDEX].blue = (((long) fore->Blue ()) << 8);
+        g_itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue;
+        if (result == wxNO_COLORS)
+            result = wxFORE_COLORS;
+    }
+    
+    Display *dpy = display;
+    Colormap cmap = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dpy);
+    
+    if (back)
+    {
+        /* 5 Colours to allocate */
+        for (int i = 0; i < 5; i++)
+            if (!YAllocColor (dpy, cmap, &g_itemColors[i]))
+                result = wxNO_COLORS;
+    }
+    else if (fore)
+    {
+        /* Only 1 colour to allocate */
+        if (!YAllocColor (dpy, cmap, &g_itemColors[wxFORE_INDEX]))
+            result = wxNO_COLORS;
+    }
+    
+    return (result);
+    
+}

 
 

-      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;
+// Changes the foreground and background colours to be derived
+// from the current background colour.
+// To change the foreground colour, you must call SetForegroundColour
+// explicitly.
+void wxWindow::ChangeBackgroundColour()
+{
+    if (GetMainWidget())
+        DoChangeBackgroundColour(GetMainWidget(), m_backgroundColour);
+    
+    // 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
+}

 
 

-      h -= (spacing + wsbar);
+void wxWindow::ChangeForegroundColour()
+{
+    if (GetMainWidget())
+        DoChangeForegroundColour(GetMainWidget(), m_foregroundColour);
+    if (m_scrolledWindow && (GetMainWidget() != m_scrolledWindow))
+        DoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);
+}

 
 

-      XtVaSetValues ((Widget) m_drawingArea, XmNheight, h, NULL);
-    }
-  if (managed)
-    XtManageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
-  XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
+// Change a widget's foreground and background colours.

 
 

-  int ww, hh;
-  GetClientSize (&ww, &hh);
-  wxSizeEvent sizeEvent(wxSize(ww, hh), GetId());
-  sizeEvent.SetEventObject(this);
-  
-  GetEventHandler()->ProcessEvent(sizeEvent);
+void wxWindow::DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
+{
+    // When should we specify the foreground, if it's calculated
+    // by wxComputeColours?
+    // Solution: say we start with the default (computed) foreground colour.
+    // If we call SetForegroundColour explicitly for a control or window,
+    // then the foreground is changed.
+    // Therefore SetBackgroundColour computes the foreground colour, and
+    // SetForegroundColour changes the foreground colour. The ordering is
+    // important.
+    
+    XtVaSetValues ((Widget) widget,
+        XmNforeground, foregroundColour.AllocColour(XtDisplay((Widget) widget)),
+        NULL);

 }
 
 }
 

-void wxWindow::CanvasSetClientSize (int w, int h)
+void wxWindow::DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour)

 {
 {

-  Widget drawingArea = (Widget) m_drawingArea;
+    wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
+        (wxColour*) NULL);
+    
+    XtVaSetValues ((Widget) widget,
+        XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
+        XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
+        XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
+        XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
+        NULL);
+    
+    if (changeArmColour)
+        XtVaSetValues ((Widget) widget,
+        XmNarmColor, g_itemColors[wxSELE_INDEX].pixel,
+        NULL);
+}

 
 

-  XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
+void wxWindow::SetBackgroundColour(const wxColour& col)
+{
+    m_backgroundColour = col;
+    ChangeBackgroundColour();
+}

 
 

-  if (w > -1)
-    XtVaSetValues ((Widget) m_drawingArea, XmNwidth, w, NULL);
-  if (h > -1)
-    XtVaSetValues ((Widget) m_drawingArea, XmNheight, h, NULL);
-  /* TODO: is this necessary?
-  allowRepainting = FALSE;
+void wxWindow::SetForegroundColour(const wxColour& col)
+{
+    m_foregroundColour = col;
+    ChangeForegroundColour();
+}

 
 

-  XSync (XtDisplay (drawingArea), FALSE);
-  XEvent event;
-  while (XtAppPending (wxTheApp->appContext))
+void wxWindow::ChangeFont(bool keepOriginalSize)
+{
+    // Note that this causes the widget to be resized back
+    // to its original size! We therefore have to set the size
+    // back again. TODO: a better way in Motif?
+    Widget w = (Widget) GetLabelWidget(); // Usually the main widget
+    if (w && m_windowFont.Ok())

     {
     {

-      XFlush (XtDisplay (drawingArea));
-      XtAppNextEvent (wxTheApp->appContext, &event);
-      XtDispatchEvent (&event);
+        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
+        
+        GetSize(& width1, & height1);
+        if (keepOriginalSize && (width != width1 || height != height1))
+        {
+            SetSize(-1, -1, width, height);
+        }

     }
     }

-    */
-
-  XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
+}

 
 

-  /* TODO
-  allowRepainting = TRUE;
-  DoRefresh ();
-  */
+void wxWindow::SetFont(const wxFont& font)
+{
+    m_windowFont = font;
+    ChangeFont();
+}

 
 

-  wxSizeEvent sizeEvent(wxSize(w, h), GetId());
-  sizeEvent.SetEventObject(this);
-  
-  GetEventHandler()->ProcessEvent(sizeEvent);
+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::CanvasGetClientSize (int *w, int *h) const
+bool wxWindow::ProcessAccelerator(wxKeyEvent& event)

 {
 {

-  // 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;
+    if (!m_acceleratorTable.Ok())
+        return FALSE;
+    
+    int count = m_acceleratorTable.GetCount();
+    wxAcceleratorEntry* entries = m_acceleratorTable.GetEntries();
+    int i;
+    for (i = 0; i < count; i++)
+    {
+        wxAcceleratorEntry* entry = & (entries[i]);
+        if (entry->MatchesEvent(event))
+        {
+            // Bingo, we have a match. Now find a control
+            // that matches the entry command id.
+            
+            // Need to go up to the top of the window hierarchy,
+            // since it might be e.g. a menu item
+            wxWindow* parent = this;
+            while (parent && !parent->IsKindOf(CLASSINFO(wxFrame)) && !parent->IsKindOf(CLASSINFO(wxDialog)))
+                parent = parent->GetParent();
+            
+            if (!parent)
+                return FALSE;
+            
+            if (parent->IsKindOf(CLASSINFO(wxFrame)))
+            {
+                // Try for a menu command
+                wxFrame* frame = (wxFrame*) parent;
+                if (frame->GetMenuBar())
+                {
+                    wxMenuItem* item = frame->GetMenuBar()->FindItemForId(entry->GetCommand());
+                    if (item)
+                    {
+                        wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
+                        commandEvent.SetEventObject(frame);
+                        
+                        // If ProcessEvent returns TRUE (it was handled), then
+                        // the calling code will skip the event handling.
+                        return frame->GetEventHandler()->ProcessEvent(commandEvent);
+                    }
+                }
+            }
+            
+            // Find a child matching the command id
+            wxWindow* child = parent->FindWindow(entry->GetCommand());
+            
+            // No such child
+            if (!child)
+                return FALSE;
+            
+            // Now we process those kinds of windows that we can.
+            // For now, only buttons.
+            if (child->IsKindOf(CLASSINFO(wxButton)))
+            {
+                wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId());
+                commandEvent.SetEventObject(child);
+                return child->GetEventHandler()->ProcessEvent(commandEvent);
+            }
+            
+            return FALSE;
+        } // matches event
+    }// for
+    
+    // We didn't match the key event against an accelerator.
+    return FALSE;

 }
 
 }
 

-void wxWindow::CanvasGetSize (int *w, int *h) const
+/*
+* wxNoOptimize: switch off size optimization
+*/
+
+int wxNoOptimize::m_count = 0;
+
+wxNoOptimize::wxNoOptimize()

 {
 {

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

 
 

-  *w = xx;
-  *h = yy;
+wxNoOptimize::~wxNoOptimize()
+{
+    m_count --;

 }
 
 }
 

-void wxWindow::CanvasGetPosition (int *x, int *y) const
+bool wxNoOptimize::CanOptimize()

 {
 {

-  Position xx, yy;
-  XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, &xx, XmNy, &yy, NULL);
-  *x = xx;
-  *y = yy;
+    return (m_count == 0);

 }
 }

+