some wxArtProv docs

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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index e82f80539d37ceb928807ebb3b650597ad675002..e51b353f980b61795fd9209a41ff9bc859bbc48d 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -21,6 +21,12 @@
     #pragma implementation "window.h"
 #endif
 
     #pragma implementation "window.h"
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#define XtScreen XTSCREEN
+#endif
+

 #include "wx/setup.h"
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/setup.h"
 #include "wx/menu.h"
 #include "wx/dc.h"


@@ -40,12 +46,13 @@
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 

-#include "wx/listimpl.cpp"
-

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

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 
 #include <Xm/DrawingA.h>
 #include <Xm/Xm.h>
 
 #include <Xm/DrawingA.h>


@@ -54,6 +61,9 @@
 #include <Xm/Frame.h>
 #include <Xm/Label.h>
 #include <Xm/RowColumn.h>           // for XmMenuPosition
 #include <Xm/Frame.h>
 #include <Xm/Label.h>
 #include <Xm/RowColumn.h>           // for XmMenuPosition

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 


@@ -70,6 +80,8 @@ static const int SCROLL_MARGIN = 4;
 // ----------------------------------------------------------------------------
 
 extern wxHashTable *wxWidgetHashTable;
 // ----------------------------------------------------------------------------
 
 extern wxHashTable *wxWidgetHashTable;

+static wxWindow* g_captureWindow = NULL;
+

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


@@ -116,25 +128,17 @@ static int str16len(const char *s)
 // event tables
 // ----------------------------------------------------------------------------
 
 // event tables
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
 
     BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
         EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
         EVT_IDLE(wxWindow::OnIdle)
     END_EVENT_TABLE()
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
 
     BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
         EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
         EVT_IDLE(wxWindow::OnIdle)
     END_EVENT_TABLE()

-#endif // USE_SHARED_LIBRARY

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

-// ----------------------------------------------------------------------------
-// list types
-// ----------------------------------------------------------------------------
-
-WX_DEFINE_LIST(wxRectList);
-

 // ----------------------------------------------------------------------------
 // helper functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // helper functions
 // ----------------------------------------------------------------------------


@@ -222,7 +226,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 
     parent->AddChild(this);
 
 
     parent->AddChild(this);
 

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

     m_foregroundColour = *wxBLACK;
 
     //// TODO: we should probably optimize by only creating a
     m_foregroundColour = *wxBLACK;
 
     //// TODO: we should probably optimize by only creating a


@@ -253,13 +257,33 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
     XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
 
     Widget parentWidget = (Widget) parent->GetClientWidget();

-    if (style & wxBORDER)
+    
+    if (style & wxSIMPLE_BORDER)

     {
         m_borderWidget = (WXWidget)XtVaCreateManagedWidget
                                    (
                                     "canvasBorder",
                                     xmFrameWidgetClass, parentWidget,
                                     XmNshadowType, XmSHADOW_IN,
     {
         m_borderWidget = (WXWidget)XtVaCreateManagedWidget
                                    (
                                     "canvasBorder",
                                     xmFrameWidgetClass, parentWidget,
                                     XmNshadowType, XmSHADOW_IN,

+                                    XmNshadowThickness, 1,
+                                    NULL
+                                   );
+    } else if (style & wxSUNKEN_BORDER)
+    {
+        m_borderWidget = (WXWidget)XtVaCreateManagedWidget
+                                   (
+                                    "canvasBorder",
+                                    xmFrameWidgetClass, parentWidget,
+                                    XmNshadowType, XmSHADOW_IN,
+                                    NULL
+                                   );
+    } else if (style & wxRAISED_BORDER)
+    {
+        m_borderWidget = (WXWidget)XtVaCreateManagedWidget
+                                   (
+                                    "canvasBorder",
+                                    xmFrameWidgetClass, parentWidget,
+                                    XmNshadowType, XmSHADOW_OUT,

                                     NULL
                                    );
     }
                                     NULL
                                    );
     }


@@ -333,7 +357,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 
     // Scrolled widget needs to have its colour changed or we get a little blue
     // square where the scrollbars abutt
 
     // 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);
+    wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

     DoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
     DoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
 
     DoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
     DoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
 


@@ -352,7 +376,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     // Without this, the cursor may not be restored properly (e.g. in splitter
     // sample).
     SetCursor(*wxSTANDARD_CURSOR);
     // Without this, the cursor may not be restored properly (e.g. in splitter
     // sample).
     SetCursor(*wxSTANDARD_CURSOR);

-    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

     SetSize(pos.x, pos.y, size.x, size.y);
 
     return TRUE;
     SetSize(pos.x, pos.y, size.x, size.y);
 
     return TRUE;


@@ -361,6 +385,9 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 // Destructor
 wxWindow::~wxWindow()
 {
 // Destructor
 wxWindow::~wxWindow()
 {

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

     m_isBeingDeleted = TRUE;
     
     // Motif-specific actions first
     m_isBeingDeleted = TRUE;
     
     // Motif-specific actions first


@@ -392,10 +419,9 @@ wxWindow::~wxWindow()
         if (w)
         {
             XtDestroyWidget(w);
         if (w)
         {
             XtDestroyWidget(w);

+           m_drawingArea = (WXWidget) 0;

         }
 
         }
 

-        m_mainWidget = (WXWidget) 0;
-

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


@@ -405,14 +431,19 @@ wxWindow::~wxWindow()
         if (m_hScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_hScrollBar);
         if (m_hScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_hScrollBar);

+           XtUnmanageChild((Widget) m_hScrollBar);

         }
         if (m_vScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_vScrollBar);
         }
         if (m_vScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_vScrollBar);

+           XtUnmanageChild((Widget) m_vScrollBar);

         }
 
         }
 

-        UnmanageAndDestroy(m_hScrollBar);
-        UnmanageAndDestroy(m_vScrollBar);
+        if (m_hScrollBar)
+           XtDestroyWidget((Widget) m_hScrollBar);
+        if (m_vScrollBar)
+           XtDestroyWidget((Widget) m_vScrollBar);
+

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


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

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

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


@@ -430,6 +464,12 @@ wxWindow::~wxWindow()
         // or dialog is destroyed, but before that you may get some memory
         // leaks and potential layout problems if you delete and then add
         // child windows.
         // or dialog is destroyed, but before that you may get some memory
         // leaks and potential layout problems if you delete and then add
         // child windows.

+
+        // GRG, Feb/2000: commented this out when adding support for
+        //   wxSCROLL[WIN]_THUMBRELEASE events. Also it was reported
+        //   that this call crashed wxMotif under OS/2, so it seems
+        //   that leaving it out is the right thing to do.
+        // SN, Feb/2000: newgrid/griddemo shows why it is needed :-(

         XtDestroyWidget((Widget) GetMainWidget());
         SetMainWidget((WXWidget) NULL);
     }
         XtDestroyWidget((Widget) GetMainWidget());
         SetMainWidget((WXWidget) NULL);
     }


@@ -453,7 +493,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
             xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
             XmNorientation, XmHORIZONTAL,
             NULL);
             xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
             XmNorientation, XmHORIZONTAL,
             NULL);

-        //      XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
+        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, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
         XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
         XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);


@@ -469,7 +509,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
 
         m_hScrollBar = (WXWidget) hScrollBar;
 
 
         m_hScrollBar = (WXWidget) hScrollBar;
 

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

         DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
 
         XtRealizeWidget(hScrollBar);
         DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
 
         XtRealizeWidget(hScrollBar);


@@ -489,7 +529,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
             xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
             XmNorientation, XmVERTICAL,
             NULL);
             xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
             XmNorientation, XmVERTICAL,
             NULL);

-        //      XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
+        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, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
         XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
         XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);


@@ -504,7 +544,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
             NULL);
 
         m_vScrollBar = (WXWidget) vScrollBar;
             NULL);
 
         m_vScrollBar = (WXWidget) vScrollBar;

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

         DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
 
         XtRealizeWidget(vScrollBar);
         DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
 
         XtRealizeWidget(vScrollBar);


@@ -551,7 +591,7 @@ void wxWindow::DestroyScrollbar(wxOrientation orientation)
             XtDestroyWidget((Widget) m_vScrollBar);
         }
         m_vScrollBar = (WXWidget) 0;
             XtDestroyWidget((Widget) m_vScrollBar);
         }
         m_vScrollBar = (WXWidget) 0;

-        m_vScroll = TRUE;
+        m_vScroll = FALSE;

 
         XtVaSetValues((Widget) m_scrolledWindow,
             XmNverticalScrollBar, (Widget) 0,
 
         XtVaSetValues((Widget) m_scrolledWindow,
             XmNverticalScrollBar, (Widget) 0,


@@ -673,8 +713,9 @@ wxString wxWindow::GetTitle() const
     return wxString(title);
 }
 
     return wxString(title);
 }
 

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

 {
 {

+    g_captureWindow = this;

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


@@ -685,8 +726,9 @@ void wxWindow::CaptureMouse()
     m_winCaptured = TRUE;
 }
 
     m_winCaptured = TRUE;
 }
 

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

 {
 {

+    g_captureWindow = NULL;

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


@@ -718,11 +760,16 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
         return FALSE;
     }
 
         return FALSE;
     }
 

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

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

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

 
     Widget w = (Widget) GetMainWidget();
     Window win = XtWindow(w);
 
     Widget w = (Widget) GetMainWidget();
     Window win = XtWindow(w);


@@ -888,6 +935,18 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
         GetClientSize(& w, & h);
     }
 
         GetClientSize(& w, & h);
     }
 

+    wxNode *cnode = m_children.First();
+    while (cnode)
+    {
+        wxWindow *child = (wxWindow*) cnode->Data();
+       int sx = 0;
+       int sy = 0;
+       child->GetSize( &sx, &sy );
+        wxPoint pos( child->GetPosition() );
+       child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );
+       cnode = cnode->Next();
+    }
+

     int x1 = (dx >= 0) ? x : x - dx;
     int y1 = (dy >= 0) ? y : y - dy;
     int w1 = w - abs(dx);
     int x1 = (dx >= 0) ? x : x - dx;
     int y1 = (dy >= 0) ? y : y - dy;
     int w1 = w - abs(dx);


@@ -1153,7 +1212,7 @@ void wxWindow::DoGetSize(int *x, int *y) const
     Widget widget = (Widget) GetTopWidget();
     Dimension xx, yy;
     XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
     Widget widget = (Widget) GetTopWidget();
     Dimension xx, yy;
     XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);

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

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


@@ -1176,7 +1235,7 @@ void wxWindow::DoGetPosition(int *x, int *y) const
         yy -= pt.y;
     }
 
         yy -= pt.y;
     }
 

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

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


@@ -1212,7 +1271,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
     Widget widget = (Widget) GetClientWidget();
     Dimension xx, yy;
     XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
     Widget widget = (Widget) GetClientWidget();
     Dimension xx, yy;
     XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);

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

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


@@ -1222,69 +1281,61 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     GetSize(& oldW, & oldH);
     GetPosition(& oldX, & oldY);
 
     GetSize(& oldW, & oldH);
     GetPosition(& oldX, & oldY);
 

-    bool useOldPos = FALSE;
-    bool useOldSize = FALSE;
+    if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+    {
+        if ( x == -1 )
+            x = oldX;
+        if ( y == -1 )
+            y = oldY;
+    }

 
 

-    if ((x == -1) && (x == -1) && ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0))
-        useOldPos = TRUE;
-    else if (x == oldX && y == oldY)
-        useOldPos = TRUE;
+    if ( width == -1 )
+        width = oldW;
+    if ( height == -1 )
+        height = oldH;

 
 

-    if ((width == -1) && (height == -1))
-        useOldSize = TRUE;
-    else if (width == oldW && height == oldH)
-        useOldSize = TRUE;
+    bool nothingChanged = (x == oldX) && (y == oldY) &&
+                          (width == oldW) && (height == oldH);

 
     if (!wxNoOptimize::CanOptimize())
     {
 
     if (!wxNoOptimize::CanOptimize())
     {

-        useOldSize = FALSE; useOldPos = FALSE;
+        nothingChanged = FALSE;

     }
 
     }
 

-    if (useOldPos && useOldSize)
-        return;
-
-    if (m_drawingArea)
+    if ( !nothingChanged )

     {
     {

-        CanvasSetSize(x, y, width, height, sizeFlags);
-        return;
-    }
-    Widget widget = (Widget) GetTopWidget();
-    if (!widget)
-        return;
+        if (m_drawingArea)
+        {
+            CanvasSetSize(x, y, width, height, sizeFlags);
+            return;
+        }

 
 

-    bool managed = XtIsManaged( widget );
-    if (managed)
-        XtUnmanageChild(widget);
+        Widget widget = (Widget) GetTopWidget();
+        if (!widget)
+            return;

 
 

-    int xx = x; int yy = y;
-    AdjustForParentClientOrigin(xx, yy, sizeFlags);
+        bool managed = XtIsManaged( widget );
+        if (managed)
+            XtUnmanageChild(widget);

 
 

-    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);
-    }
+        int xx = x;
+        int yy = y;
+        AdjustForParentClientOrigin(xx, yy, sizeFlags);

 
 

-    if (managed)
-        XtManageChild(widget);
+        DoMoveWindow(xx, yy, width, height);
+
+        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.
+        // How about this bit. Maybe we don't need to generate size events
+        // all the time -- they'll be generated when the window is sized anyway.

 #if 0
 #if 0

-    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
-    sizeEvent.SetEventObject(this);
+        wxSizeEvent sizeEvent(wxSize(width, height), GetId());
+        sizeEvent.SetEventObject(this);

 
 

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

 #endif // 0
 #endif // 0

+    }

 }
 
 void wxWindow::DoSetClientSize(int width, int height)
 }
 
 void wxWindow::DoSetClientSize(int width, int height)


@@ -1315,17 +1366,6 @@ wxPoint wxWindow::GetClientAreaOrigin() const
     return wxPoint(0, 0);
 }
 
     return wxPoint(0, 0);
 }
 

-// Makes an adjustment to the window position (for example, a frame that has
-// a toolbar that it manages itself).
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
-{
-    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
-    {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        x += pt.x; y += pt.y;
-    }
-}
-

 void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
 {
     m_minWidth = minW;
 void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
 {
     m_minWidth = minW;


@@ -1356,6 +1396,16 @@ void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, in
         XtVaSetValues(widget, XmNheightInc, incH, NULL);
 }
 
         XtVaSetValues(widget, XmNheightInc, incH, NULL);
 }
 

+void wxWindow::DoMoveWindow(int x, int y, int width, int height)
+{
+    XtVaSetValues((Widget)GetTopWidget(),
+                  XmNx, x,
+                  XmNy, y,
+                  XmNwidth, width,
+                  XmNheight, height,
+                  NULL);
+}
+

 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------


@@ -1591,7 +1641,7 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
     }
 }
 
     }
 }
 

-void wxWindow::OnIdle(wxIdleEvent& event)
+void wxWindow::OnIdle(wxIdleEvent& WXUNUSED(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)


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

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

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


@@ -1633,7 +1683,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
                 // Try for a menu command
                 if (frame->GetMenuBar())
                 {
                 // Try for a menu command
                 if (frame->GetMenuBar())
                 {

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

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


@@ -1690,7 +1740,7 @@ bool wxAddWindowToTable(Widget w, wxWindow *win)
 
     wxWidgetHashTable->Put((long) w, win);
 
 
     wxWidgetHashTable->Put((long) w, win);
 

-    wxLogDebug("Widget 0x%08x <-> window %p (%s)",
+    wxLogTrace("widget", "Widget 0x%08x <-> window %p (%s)",

                w, win, win->GetClassInfo()->GetClassName());
 
     return TRUE;
                w, win, win->GetClassInfo()->GetClassName());
 
     return TRUE;


@@ -1711,7 +1761,7 @@ void wxDeleteWindowFromTable(Widget w)
 // ----------------------------------------------------------------------------
 
 // Add to hash table, add event handler
 // ----------------------------------------------------------------------------
 
 // Add to hash table, add event handler

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

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


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

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

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


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

-                               XtPointer clientData,
+                               XtPointer WXUNUSED(clientData),

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


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

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

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


@@ -1900,7 +1950,7 @@ static void wxCanvasMotionEvent (Widget drawingArea, XButtonEvent * event)
 }
 
 static void wxCanvasInputEvent(Widget drawingArea,
 }
 
 static void wxCanvasInputEvent(Widget drawingArea,

-                               XtPointer data,
+                               XtPointer WXUNUSED(data),

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


@@ -1944,22 +1994,6 @@ static void wxCanvasInputEvent(Widget drawingArea,
             else if (local_event.xany.type == MotionNotify)
             {
                 eventType = wxEVT_MOTION;
             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)
             }
 
             else if (local_event.xany.type == ButtonPress)


@@ -2017,6 +2051,26 @@ static void wxCanvasInputEvent(Widget drawingArea,
             wxevent.m_metaDown = local_event.xbutton.state & Mod1Mask;
             wxevent.SetTimestamp(local_event.xbutton.time);
 
             wxevent.m_metaDown = local_event.xbutton.state & Mod1Mask;
             wxevent.SetTimestamp(local_event.xbutton.time);
 

+           if ( 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
+                {
+                }
+           }
+

             // Now check if we need to translate this event into a double click
             if (TRUE) // canvas->doubleClickAllowed)
             {
             // Now check if we need to translate this event into a double click
             if (TRUE) // canvas->doubleClickAllowed)
             {


@@ -2041,22 +2095,21 @@ static void wxCanvasInputEvent(Widget drawingArea,
                     {
                         // I have a dclick
                         canvas->SetLastClick(0, ts);
                     {
                         // I have a dclick
                         canvas->SetLastClick(0, ts);

-                        switch ( eventType )
+
+                        wxEventType typeDouble;
+                        if ( eventType == wxEVT_LEFT_DOWN )
+                            typeDouble = wxEVT_LEFT_DCLICK;
+                        else if ( eventType == wxEVT_MIDDLE_DOWN )
+                            typeDouble = wxEVT_MIDDLE_DCLICK;
+                        else if ( eventType == wxEVT_RIGHT_DOWN )
+                            typeDouble = wxEVT_RIGHT_DCLICK;
+                        else
+                            typeDouble = wxEVT_NULL;
+
+                        if ( typeDouble != wxEVT_NULL )

                         {
                         {

-                        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;
+                            wxevent.SetEventType(typeDouble);

                         }
                         }

-

                     }
                     else
                     {
                     }
                     else
                     {


@@ -2083,12 +2136,13 @@ static void wxCanvasInputEvent(Widget drawingArea,
     case KeyPress:
         {
             KeySym keySym;
     case KeyPress:
         {
             KeySym keySym;

+            static char buf[100];

 #if 0
             XComposeStatus compose;
 #if 0
             XComposeStatus compose;

-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, &compose);
+            (void) XLookupString ((XKeyEvent *) & local_event, buf, 20, &keySym, &compose);

 #endif // 0
 
 #endif // 0
 

-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL);
+            (void) XLookupString ((XKeyEvent *) & local_event, buf, 20, &keySym, NULL);

             int id = wxCharCodeXToWX (keySym);
 
             wxEventType eventType = wxEVT_CHAR;
             int id = wxCharCodeXToWX (keySym);
 
             wxEventType eventType = wxEVT_CHAR;


@@ -2136,8 +2190,9 @@ static void wxCanvasInputEvent(Widget drawingArea,
         }
     case KeyRelease:
         {
         }
     case KeyRelease:
         {

+            static char buf[100];

             KeySym keySym;
             KeySym keySym;

-            (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL);
+            (void) XLookupString ((XKeyEvent *) & local_event, buf, 20, &keySym, NULL);

             int id = wxCharCodeXToWX (keySym);
 
             wxKeyEvent event (wxEVT_KEY_UP);
             int id = wxCharCodeXToWX (keySym);
 
             wxKeyEvent event (wxEVT_KEY_UP);


@@ -2186,7 +2241,7 @@ static void wxCanvasInputEvent(Widget drawingArea,
 }
 
 static void wxPanelItemEventHandler(Widget    wid,
 }
 
 static void wxPanelItemEventHandler(Widget    wid,

-                                    XtPointer client_data,
+                                    XtPointer WXUNUSED(client_data),

                                     XEvent*   event,
                                     Boolean  *continueToDispatch)
 {
                                     XEvent*   event,
                                     Boolean  *continueToDispatch)
 {


@@ -2239,9 +2294,7 @@ static void wxScrollBarCallback(Widget scrollbar,
         }
     case XmCR_VALUE_CHANGED:
         {
         }
     case XmCR_VALUE_CHANGED:
         {

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

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


@@ -2600,22 +2653,12 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
                 {
                     // I have a dclick
                     win->SetLastClick(0, ts);
                 {
                     // I have a dclick
                     win->SetLastClick(0, ts);

-                    switch ( eventType )
-                    {
-                        case wxEVT_LEFT_DOWN:
-                            eventType = wxEVT_LEFT_DCLICK;
-                            break;
-                        case wxEVT_MIDDLE_DOWN:
-                            eventType = wxEVT_MIDDLE_DCLICK;
-                            break;
-                        case wxEVT_RIGHT_DOWN:
-                            eventType = wxEVT_RIGHT_DCLICK;
-                            break;
-
-                        default :
-                            break;
-                    }
-                    
+                    if ( eventType == wxEVT_LEFT_DOWN )
+                        eventType = wxEVT_LEFT_DCLICK;
+                    else if ( eventType == wxEVT_MIDDLE_DOWN )
+                        eventType = wxEVT_MIDDLE_DCLICK;
+                    else if ( eventType == wxEVT_RIGHT_DOWN )
+                        eventType = wxEVT_RIGHT_DCLICK;

                 }
                 else
                 {
                 }
                 else
                 {


@@ -2693,7 +2736,7 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget,
     return FALSE;
 }
 
     return FALSE;
 }
 

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

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


@@ -2818,7 +2861,7 @@ void wxWindow::ChangeBackgroundColour()
         DoChangeBackgroundColour(m_scrolledWindow, m_backgroundColour);
         // Have to set the scrollbar colours back since
         // the scrolled window seemed to change them
         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);
+        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

 
         if (m_hScrollBar)
             DoChangeBackgroundColour(m_hScrollBar, backgroundColour);
 
         if (m_hScrollBar)
             DoChangeBackgroundColour(m_hScrollBar, backgroundColour);


@@ -2928,15 +2971,45 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
 wxWindow *wxGetActiveWindow()
 {
     // TODO
 wxWindow *wxGetActiveWindow()
 {
     // TODO

+    wxFAIL_MSG("Not implemented");

     return NULL;
 }
 
     return NULL;
 }
 

+/* static */
+wxWindow *wxWindowBase::GetCapture()
+{
+    return (wxWindow *)g_captureWindow;
+}
+
+
+// Find the wxWindow at the current mouse position, returning the mouse
+// position.
+wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+{
+    return wxFindWindowAtPoint(wxGetMousePosition());
+}
+
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
+{
+    Display *display = (Display*) wxGetDisplay();
+    Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
+    Window rootReturn, childReturn;
+    int rootX, rootY, winX, winY;
+    unsigned int maskReturn;
+
+    XQueryPointer (display,
+                  rootWindow,
+                  &rootReturn,
+                   &childReturn,
+                   &rootX, &rootY, &winX, &winY, &maskReturn);
+    return wxPoint(rootX, rootY);
+}
+
+

 // ----------------------------------------------------------------------------
 // wxNoOptimize: switch off size optimization
 // ----------------------------------------------------------------------------
 
 int wxNoOptimize::ms_count = 0;
 
 // ----------------------------------------------------------------------------
 // wxNoOptimize: switch off size optimization
 // ----------------------------------------------------------------------------
 
 int wxNoOptimize::ms_count = 0;
 

-
-
-