First pass at integrating a code generator in XRCed. Initial patch

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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 63b1e37a5207c060e84ba199ada944b601a9d4ab..cea79f107fe2c1d6706ee468404ac3d712265303 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -17,9 +17,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "window.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY


@@ -27,7 +26,6 @@
 #define XtScreen XTSCREEN
 #endif
 
 #define XtScreen XTSCREEN
 #endif
 

-#include "wx/setup.h"

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


@@ -51,7 +49,7 @@
 // DoSetSizeIntr and DoMoveWindowIntr
 // PROBLEM:
 // under Motif composite controls (such as wxCalendarCtrl or generic wxSpinCtrl
 // DoSetSizeIntr and DoMoveWindowIntr
 // PROBLEM:
 // under Motif composite controls (such as wxCalendarCtrl or generic wxSpinCtrl

-// did nott work and/or segfaulted because
+// did not work and/or segfaulted because

 // 1) wxWindow::Create calls SetSize,
 //    which results in a call to DoSetSize much earlier than in the other ports
 // 2) if wxWindow::Create is called (wxControl::Create calls it)
 // 1) wxWindow::Create calls SetSize,
 //    which results in a call to DoSetSize much earlier than in the other ports
 // 2) if wxWindow::Create is called (wxControl::Create calls it)


@@ -82,12 +80,6 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

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

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


@@ -169,7 +161,7 @@ bool wxWindow::MapOrUnmap(WXWidget widget, bool domap)
 {
     Widget w = (Widget)widget;
     if ( !w )
 {
     Widget w = (Widget)widget;
     if ( !w )

-        return FALSE;
+        return false;

 
     //   Rationale: a lot of common operations (including but not
     // limited to moving, resizing and appending items to a listbox)
 
     //   Rationale: a lot of common operations (including but not
     // limited to moving, resizing and appending items to a listbox)


@@ -191,7 +183,7 @@ bool wxWindow::MapOrUnmap(WXWidget widget, bool domap)
         // XtUnmapWidget(w);
     }
 
         // XtUnmapWidget(w);
     }
 

-    return TRUE;
+    return true;

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


@@ -200,18 +192,14 @@ bool wxWindow::MapOrUnmap(WXWidget widget, bool domap)
 
 void wxWindow::Init()
 {
 
 void wxWindow::Init()
 {

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

     // Motif-specific
     // Motif-specific

-    m_needsRefresh = TRUE;
+    m_needsRefresh = true;

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

-    m_winCaptured = FALSE;
+    m_winCaptured = false;
+
+    m_isShown = true;

 
 

-    m_isShown = TRUE;
-    m_isBeingDeleted = FALSE;
-    

     m_hScrollBar =
     m_vScrollBar =
     m_borderWidget =
     m_hScrollBar =
     m_vScrollBar =
     m_borderWidget =


@@ -239,7 +227,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
                       long style,
                       const wxString& name)
 {
                       long style,
                       const wxString& name)
 {

-    wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" );
+    wxCHECK_MSG( parent, false, "can't create wxWindow without parent" );

 
     CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
 
 
     CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
 


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

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

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


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

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

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

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

     actions[0].proc = (XtActionProc) wxCanvasMotionEvent;
     XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
 
     actions[0].proc = (XtActionProc) wxCanvasMotionEvent;
     XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
 


@@ -342,8 +330,8 @@ 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
     wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     // Scrolled widget needs to have its colour changed or we get a little blue
     // square where the scrollbars abutt
     wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

-    wxDoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
-    wxDoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
+    wxDoChangeBackgroundColour(m_scrolledWindow, backgroundColour, true);
+    wxDoChangeBackgroundColour(m_drawingArea, backgroundColour, true);

 
     XmScrolledWindowSetAreas(
                              (Widget)m_scrolledWindow,
 
     XmScrolledWindowSetAreas(
                              (Widget)m_scrolledWindow,


@@ -354,8 +342,8 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     // sample).
     SetCursor(*wxSTANDARD_CURSOR);
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
     // sample).
     SetCursor(*wxSTANDARD_CURSOR);
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

-    DoSetSizeIntr(pos.x, pos.y, size.x,size.y, wxSIZE_AUTO, TRUE);
-    return TRUE;
+    DoSetSizeIntr(pos.x, pos.y, size.x,size.y, wxSIZE_AUTO, true);
+    return true;

 }
 
 // Destructor
 }
 
 // Destructor


@@ -363,9 +351,9 @@ wxWindow::~wxWindow()
 {
     if (g_captureWindow == this)
         g_captureWindow = NULL;
 {
     if (g_captureWindow == this)
         g_captureWindow = NULL;

-    
-    m_isBeingDeleted = TRUE;
-    
+
+    m_isBeingDeleted = true;
+

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


@@ -494,7 +482,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
         m_hScrollBar = DoCreateScrollBar( m_scrolledWindow, wxHORIZONTAL,
                                           (void (*)())wxScrollBarCallback );
 
         m_hScrollBar = DoCreateScrollBar( m_scrolledWindow, wxHORIZONTAL,
                                           (void (*)())wxScrollBarCallback );
 

-        wxDoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
+        wxDoChangeBackgroundColour(m_hScrollBar, backgroundColour, true);

 
         XtRealizeWidget( (Widget)m_hScrollBar );
 
 
         XtRealizeWidget( (Widget)m_hScrollBar );
 


@@ -509,7 +497,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
         m_vScrollBar = DoCreateScrollBar( m_scrolledWindow, wxVERTICAL,
                                           (void (*)())wxScrollBarCallback );
 
         m_vScrollBar = DoCreateScrollBar( m_scrolledWindow, wxVERTICAL,
                                           (void (*)())wxScrollBarCallback );
 

-        wxDoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
+        wxDoChangeBackgroundColour(m_vScrollBar, backgroundColour, true);

 
         XtRealizeWidget((Widget)m_vScrollBar);
 
 
         XtRealizeWidget((Widget)m_vScrollBar);
 


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

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

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


@@ -596,7 +584,7 @@ wxWindow *wxWindowBase::FindFocus()
 bool wxWindow::Enable(bool enable)
 {
     if ( !wxWindowBase::Enable(enable) )
 bool wxWindow::Enable(bool enable)
 {
     if ( !wxWindowBase::Enable(enable) )

-        return FALSE;
+        return false;

 
     Widget wMain = (Widget)GetMainWidget();
     if ( wMain )
 
     Widget wMain = (Widget)GetMainWidget();
     if ( wMain )


@@ -605,13 +593,13 @@ bool wxWindow::Enable(bool enable)
         XmUpdateDisplay(wMain);
     }
 
         XmUpdateDisplay(wMain);
     }
 

-    return TRUE;
+    return true;

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

-        return FALSE;
+        return false;

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


@@ -624,7 +612,7 @@ bool wxWindow::Show(bool show)
             MapOrUnmap(GetMainWidget(), show);
     }
 
             MapOrUnmap(GetMainWidget(), show);
     }
 

-    return TRUE;
+    return true;

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


@@ -643,17 +631,17 @@ void wxWindow::Lower()
     XLowerWindow(XtDisplay(wTop), window);
 }
 
     XLowerWindow(XtDisplay(wTop), window);
 }
 

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

 {
 {

-    XtVaSetValues((Widget)GetMainWidget(), XmNtitle, title.c_str(), NULL);
+    XtVaSetValues((Widget)GetMainWidget(), XmNtitle, label.c_str(), NULL);

 }
 
 }
 

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

 {
 {

-    char *title;
-    XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &title, NULL);
+    char *label;
+    XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &label, NULL);

 
 

-    return wxString(title);
+    return wxString(label);

 }
 
 void wxWindow::DoCaptureMouse()
 }
 
 void wxWindow::DoCaptureMouse()


@@ -664,9 +652,9 @@ void wxWindow::DoCaptureMouse()
 
     Widget wMain = (Widget)GetMainWidget();
     if ( wMain )
 
     Widget wMain = (Widget)GetMainWidget();
     if ( wMain )

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

 
 

-    m_winCaptured = TRUE;
+    m_winCaptured = true;

 }
 
 void wxWindow::DoReleaseMouse()
 }
 
 void wxWindow::DoReleaseMouse()


@@ -679,7 +667,7 @@ void wxWindow::DoReleaseMouse()
     if ( wMain )
         XtRemoveGrab(wMain);
 
     if ( wMain )
         XtRemoveGrab(wMain);
 

-    m_winCaptured = FALSE;
+    m_winCaptured = false;

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


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

-        return FALSE;
+        return false;

     }
 
     ChangeFont();
 
     }
 
     ChangeFont();
 

-    return TRUE;
+    return true;

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


@@ -700,7 +688,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
     if ( !wxWindowBase::SetCursor(cursor) )
     {
         // no change
     if ( !wxWindowBase::SetCursor(cursor) )
     {
         // no change

-        return FALSE;
+        return false;

     }
 
     //    wxASSERT_MSG( m_cursor.Ok(),
     }
 
     //    wxASSERT_MSG( m_cursor.Ok(),


@@ -718,7 +706,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
     Window win = XtWindow(w);
     XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);
 
     Window win = XtWindow(w);
     XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);
 

-    return TRUE;
+    return true;

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


@@ -758,10 +746,12 @@ int wxWindow::GetScrollPos(int orient) const
 int wxWindow::GetScrollRange(int orient) const
 {
     Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
 int wxWindow::GetScrollRange(int orient) const
 {
     Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);

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

 
     int range = 0;
 
     int range = 0;

-    if (scrollBar) 
+    if (scrollBar)

         XtVaGetValues(scrollBar, XmNmaximum, &range, NULL);
     return range;
 }
         XtVaGetValues(scrollBar, XmNmaximum, &range, NULL);
     return range;
 }


@@ -769,10 +759,11 @@ int wxWindow::GetScrollRange(int orient) const
 int wxWindow::GetScrollThumb(int orient) const
 {
     Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
 int wxWindow::GetScrollThumb(int orient) const
 {
     Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);

-    wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
+    //wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );

 
 

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

     return thumb;
 }
 
     return thumb;
 }
 


@@ -860,7 +851,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 
     // Adjusting scrollbars can resize the canvas accidentally
     if (newW != oldW || newH != oldH)
 
     // Adjusting scrollbars can resize the canvas accidentally
     if (newW != oldW || newH != oldH)

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

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


@@ -897,7 +888,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
     XCopyArea(display, window, window, (GC) dc.GetGC(),
               x1, y1, w1, h1, x2, y2);
 
     XCopyArea(display, window, window, (GC) dc.GetGC(),
               x1, y1, w1, h1, x2, y2);
 

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

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


@@ -1073,6 +1064,12 @@ void wxWindow::DoSetToolTip(wxToolTip * WXUNUSED(tooltip))
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {

+    if ( x == wxDefaultCoord && y == wxDefaultCoord )
+    {
+        wxPoint mouse = ScreenToClient(wxGetMousePosition());
+        x = mouse.x; y = mouse.y;
+    }
+

     Widget widget = (Widget) GetMainWidget();
 
     /* The menuId field seems to be usused, so we'll use it to
     Widget widget = (Widget) GetMainWidget();
 
     /* The menuId field seems to be usused, so we'll use it to


@@ -1083,15 +1080,15 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
     */
 
     if (menu->GetParent() && (menu->GetId() != -1))
     */
 
     if (menu->GetParent() && (menu->GetId() != -1))

-        return FALSE;
+        return false;

 
     if (menu->GetMainWidget())
     {
 
     if (menu->GetMainWidget())
     {

-        menu->DestroyMenu(TRUE);
+        menu->DestroyMenu(true);

     }
 
     menu->SetId(1); /* Mark as popped-up */
     }
 
     menu->SetId(1); /* Mark as popped-up */

-    menu->CreateMenu(NULL, widget, menu);
+    menu->CreateMenu(NULL, widget, menu, 0);

     menu->SetInvokingWindow(this);
 
     menu->UpdateUI();
     menu->SetInvokingWindow(this);
 
     menu->UpdateUI();


@@ -1150,7 +1147,7 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
         wxDoEventLoopIteration( evtLoop );
     }
 
         wxDoEventLoopIteration( evtLoop );
     }
 

-    return TRUE;
+    return true;

 }
 
 #endif
 }
 
 #endif


@@ -1161,7 +1158,7 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 
 bool wxWindow::PreResize()
 {
 
 bool wxWindow::PreResize()
 {

-    return TRUE;
+    return true;

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


@@ -1177,7 +1174,7 @@ void wxWindow::DoGetSize(int *x, int *y) const
                    XmNwidth, &xx,
                    XmNheight, &yy,
                    NULL );
                    XmNwidth, &xx,
                    XmNheight, &yy,
                    NULL );

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

     if(y) *y = yy;
 }
 
     if(y) *y = yy;
 }
 


@@ -1185,7 +1182,7 @@ void wxWindow::DoGetPosition(int *x, int *y) const
 {
     Widget widget = (Widget)
         ( m_drawingArea ?
 {
     Widget widget = (Widget)
         ( m_drawingArea ?

-          ( m_borderWidget ? m_borderWidget : m_scrolledWindow ) : 
+          ( m_borderWidget ? m_borderWidget : m_scrolledWindow ) :

           GetTopWidget() );
 
     Position xx, yy;
           GetTopWidget() );
 
     Position xx, yy;


@@ -1196,8 +1193,8 @@ void wxWindow::DoGetPosition(int *x, int *y) const
     if (GetParent())
     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());
     if (GetParent())
     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());

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

     }
 
     if(x) *x = xx;
     }
 
     if(x) *x = xx;


@@ -1242,7 +1239,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
 
 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)
 {

-    DoSetSizeIntr(x, y, width, height, sizeFlags, FALSE);
+    DoSetSizeIntr(x, y, width, height, sizeFlags, false);

 }
 
 void wxWindow::DoSetSizeIntr(int x, int y, int width, int height,
 }
 
 void wxWindow::DoSetSizeIntr(int x, int y, int width, int height,


@@ -1264,7 +1261,7 @@ void wxWindow::DoSetSizeIntr(int x, int y, int width, int height,
             y = oldY;
     }
 
             y = oldY;
     }
 

-    wxSize size(-1, -1);
+    wxSize size(wxDefaultSize);

     if ( width <= 0 )
     {
         if ( ( sizeFlags & wxSIZE_AUTO_WIDTH ) && !fromCtor )
     if ( width <= 0 )
     {
         if ( ( sizeFlags & wxSIZE_AUTO_WIDTH ) && !fromCtor )


@@ -1364,13 +1361,6 @@ void wxWindow::DoSetClientSize(int width, int height)
         XtVaSetValues(widget, XmNheight, height, NULL);
 }
 
         XtVaSetValues(widget, XmNheight, height, NULL);
 }
 

-// For implementation purposes - sometimes decorations make the client area
-// smaller
-wxPoint wxWindow::GetClientAreaOrigin() const
-{
-    return wxPoint(0, 0);
-}
-

 void wxWindow::DoMoveWindowIntr(int xx, int yy, int w, int h,
                                 int flags)
 {
 void wxWindow::DoMoveWindowIntr(int xx, int yy, int w, int h,
                                 int flags)
 {


@@ -1435,6 +1425,8 @@ void wxWindow::DoMoveWindowIntr(int xx, int yy, int w, int h,
     }
     else
     {
     }
     else
     {

+        if( xx < 0 ) xx = 0;
+        if( yy < 0 ) yy = 0;

         if( w < 1 ) w = 1;
         if( h < 1 ) h = 1;
 
         if( w < 1 ) w = 1;
         if( h < 1 ) h = 1;
 


@@ -1461,29 +1453,24 @@ int wxWindow::GetCharHeight() const
 {
     wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
 
 {
     wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
 

-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
+    int height;

 
 

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

 
 

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

 }
 
 int wxWindow::GetCharWidth() const
 {
     wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
 
 }
 
 int wxWindow::GetCharWidth() const
 {
     wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
 

-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
+    int width;

 
 

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

 
 

-    return overall.width;
+    return width;

 }
 
 void wxWindow::GetTextExtent(const wxString& string,
 }
 
 void wxWindow::GetTextExtent(const wxString& string,


@@ -1491,36 +1478,14 @@ void wxWindow::GetTextExtent(const wxString& string,
                              int *descent, int *externalLeading,
                              const wxFont *theFont) const
 {
                              int *descent, int *externalLeading,
                              const wxFont *theFont) const
 {

-    wxFont *fontToUse = (wxFont *)theFont;
-    if (!fontToUse)
-        fontToUse = (wxFont *) & m_font;
+    const wxFont *fontToUse = theFont ? theFont : &m_font;

 
     wxCHECK_RET( fontToUse->Ok(), "valid window font needed" );
 
     wxCHECK_RET( fontToUse->Ok(), "valid window font needed" );

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

 
 

-    if ( x )
-        *x = (overall.width);
-    if ( y )
-        *y = (ascent + descent2);
-    if (descent)
-        *descent = descent2;

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

-
+    wxGetTextExtent (GetXDisplay(), *fontToUse, 1.0,
+                     string, x, y, NULL, descent);

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


@@ -1534,7 +1499,7 @@ void wxWindow::AddUpdateRect(int x, int y, int w, int h)
 
 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
 
 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {

-    m_needsRefresh = TRUE;
+    m_needsRefresh = true;

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


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

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

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


@@ -1646,7 +1611,7 @@ void wxWindow::DoPaint()
         event.SetEventObject(this);
         GetEventHandler()->ProcessEvent(event);
 
         event.SetEventObject(this);
         GetEventHandler()->ProcessEvent(event);
 

-        m_needsRefresh = FALSE;
+        m_needsRefresh = false;

     }
 }
 
     }
 }
 


@@ -1665,7 +1630,7 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
         if ( win->GetParent() )
         {
             wxSysColourChangedEvent event2;
         if ( win->GetParent() )
         {
             wxSysColourChangedEvent event2;

-            event.m_eventObject = win;
+            event.SetEventObject(win);

             win->GetEventHandler()->ProcessEvent(event2);
         }
 
             win->GetEventHandler()->ProcessEvent(event2);
         }
 


@@ -1689,7 +1654,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
 {
 #if wxUSE_ACCEL
     if (!m_acceleratorTable.Ok())
 {
 #if wxUSE_ACCEL
     if (!m_acceleratorTable.Ok())

-        return FALSE;
+        return false;

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


@@ -1709,7 +1674,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
                 parent = parent->GetParent();
 
             if (!parent)
                 parent = parent->GetParent();
 
             if (!parent)

-                return FALSE;
+                return false;

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


@@ -1724,7 +1689,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
                         wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
                         commandEvent.SetEventObject(frame);
 
                         wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
                         commandEvent.SetEventObject(frame);
 

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

                         // the calling code will skip the event handling.
                         return frame->GetEventHandler()->ProcessEvent(commandEvent);
                     }
                         // the calling code will skip the event handling.
                         return frame->GetEventHandler()->ProcessEvent(commandEvent);
                     }


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

-                return FALSE;
+                return false;

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


@@ -1748,13 +1713,13 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
                 return child->GetEventHandler()->ProcessEvent(commandEvent);
             }
 
                 return child->GetEventHandler()->ProcessEvent(commandEvent);
             }
 

-            return FALSE;
+            return false;

         } // matches event
     }// for
 #endif
 
     // We didn't match the key event against an accelerator.
         } // matches event
     }// for
 #endif
 
     // We didn't match the key event against an accelerator.

-    return FALSE;
+    return false;

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


@@ -1762,25 +1727,25 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------

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

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

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

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

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

     }
 
     }
 

-    wxWidgetHashTable->Put((long) w, win);
+    wxWidgetHashTable->Put(key, win);

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

-               (WXWidget)w, win, win->GetClassInfo()->GetClassName());
+               w, win, win->GetClassInfo()->GetClassName());

 
 

-    return TRUE;
+    return true;

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


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

-            return FALSE;
+            return false;

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


@@ -1835,9 +1800,9 @@ bool wxWindow::AttachWidget (wxWindow* WXUNUSED(parent), WXWidget mainWidget,
         x = 0;
     if (y == -1)
         y = 0;
         x = 0;
     if (y == -1)
         y = 0;

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

 
 

-    return TRUE;
+    return true;

 }
 
 // Remove event handler, remove from hash table
 }
 
 // Remove event handler, remove from hash table


@@ -1851,7 +1816,7 @@ bool wxWindow::DetachWidget(WXWidget widget)
                           (XtPointer)this);
 
     wxDeleteWindowFromTable((Widget) widget);
                           (XtPointer)this);
 
     wxDeleteWindowFromTable((Widget) widget);

-    return TRUE;
+    return true;

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


@@ -1928,9 +1893,8 @@ void wxWidgetResizeProc(Widget w, XConfigureEvent *WXUNUSED(event),
 
     if (win->PreResize())
     {
 
     if (win->PreResize())
     {

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

         sizeEvent.SetEventObject(win);
         win->GetEventHandler()->ProcessEvent(sizeEvent);
     }
         sizeEvent.SetEventObject(win);
         win->GetEventHandler()->ProcessEvent(sizeEvent);
     }


@@ -1999,7 +1963,7 @@ static void wxCanvasInputEvent(Widget drawingArea,
                                XmDrawingAreaCallbackStruct * cbs)
 {
     wxWindow *canvas = wxGetWindowFromTable(drawingArea);
                                XmDrawingAreaCallbackStruct * cbs)
 {
     wxWindow *canvas = wxGetWindowFromTable(drawingArea);

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

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


@@ -2007,27 +1971,25 @@ static void wxCanvasInputEvent(Widget drawingArea,
     if (cbs->reason != XmCR_INPUT)
         return;
 
     if (cbs->reason != XmCR_INPUT)
         return;
 

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

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

-    {
-        wxMouseEvent wxevent;
-        if(wxTranslateMouseEvent(wxevent, canvas, drawingArea, &local_event))

         {
         {

-            canvas->GetEventHandler()->ProcessEvent(wxevent);
+            wxMouseEvent wxevent(0);
+            if (wxTranslateMouseEvent(wxevent, canvas, drawingArea, xevent))
+            {
+                canvas->GetEventHandler()->ProcessEvent(wxevent);
+            }
+            break;

         }
         }

-        break;
-    }

     case KeyPress:
         {
             wxKeyEvent event (wxEVT_CHAR);
     case KeyPress:
         {
             wxKeyEvent event (wxEVT_CHAR);

-            if (wxTranslateKeyEvent (event, canvas, (Widget) 0, &local_event))
+            if (wxTranslateKeyEvent (event, canvas, (Widget) 0, xevent))

             {
                 // Implement wxFrame::OnCharHook by checking ancestor.
                 wxWindow *parent = canvas;
             {
                 // Implement wxFrame::OnCharHook by checking ancestor.
                 wxWindow *parent = canvas;


@@ -2057,7 +2019,7 @@ static void wxCanvasInputEvent(Widget drawingArea,
     case KeyRelease:
         {
             wxKeyEvent event (wxEVT_KEY_UP);
     case KeyRelease:
         {
             wxKeyEvent event (wxEVT_KEY_UP);

-            if (wxTranslateKeyEvent (event, canvas, (Widget) 0, &local_event))
+            if (wxTranslateKeyEvent (event, canvas, (Widget) 0, xevent))

             {
                 canvas->GetEventHandler()->ProcessEvent (event);
             }
             {
                 canvas->GetEventHandler()->ProcessEvent (event);
             }


@@ -2065,7 +2027,7 @@ static void wxCanvasInputEvent(Widget drawingArea,
         }
     case FocusIn:
         {
         }
     case FocusIn:
         {

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

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


@@ -2075,7 +2037,7 @@ static void wxCanvasInputEvent(Widget drawingArea,
         }
     case FocusOut:
         {
         }
     case FocusOut:
         {

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

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


@@ -2106,9 +2068,9 @@ static void wxPanelItemEventHandler(Widget    wid,
     }
 
     // TODO: probably the key to allowing default behaviour to happen. Say we
     }
 
     // TODO: probably the key to allowing default behaviour to happen. Say we

-    // set a m_doDefault flag to FALSE at the start of this function. Then in
+    // set a m_doDefault flag to false at the start of this function. Then in

     // e.g. wxWindow::OnMouseEvent we can call Default() which sets this flag to
     // e.g. wxWindow::OnMouseEvent we can call Default() which sets this flag to

-    // TRUE, indicating that default processing can happen. Thus, behaviour can
+    // true, indicating that default processing can happen. Thus, behaviour can

     // appear to be overridden just by adding an event handler and not calling
     // wxWindow::OnWhatever. ALSO, maybe we can use this instead of the current
     // way of handling drawing area events, to simplify things.
     // appear to be overridden just by adding an event handler and not calling
     // wxWindow::OnWhatever. ALSO, maybe we can use this instead of the current
     // way of handling drawing area events, to simplify things.


@@ -2120,7 +2082,7 @@ static void wxScrollBarCallback(Widget scrollbar,
                                 XmScrollBarCallbackStruct *cbs)
 {
     wxWindow *win = wxGetWindowFromTable(scrollbar);
                                 XmScrollBarCallbackStruct *cbs)
 {
     wxWindow *win = wxGetWindowFromTable(scrollbar);

-    wxOrientation orientation = (wxOrientation)(int)clientData;
+    wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);

 
     wxEventType eventType = wxEVT_NULL;
     switch (cbs->reason)
 
     wxEventType eventType = wxEVT_NULL;
     switch (cbs->reason)


@@ -2183,24 +2145,18 @@ static void wxScrollBarCallback(Widget scrollbar,
 // For repainting arbitrary windows
 void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
 {
 // For repainting arbitrary windows
 void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
 {

-    Window window;
-    Display *display;
-

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

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

     {
     {

-    case Expose:
+        case Expose:

         {
         {

-            window = (Window) win -> GetXWindow();
-            display = (Display *) win -> GetXDisplay();
-

             win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
                                event->xexpose.width, event->xexpose.height);
 
             win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
                                event->xexpose.width, event->xexpose.height);
 

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

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


@@ -2215,7 +2171,7 @@ void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event,
 // ----------------------------------------------------------------------------
 
 bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
 // ----------------------------------------------------------------------------
 
 bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,

-                           Widget widget, XEvent *xevent)
+                           Widget widget, const XEvent *xevent)

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


@@ -2230,6 +2186,8 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
         case ButtonRelease:
         case MotionNotify:
         {
         case ButtonRelease:
         case MotionNotify:
         {

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

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


@@ -2243,6 +2201,18 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
             else if (xevent->xany.type == MotionNotify)
             {
                 eventType = wxEVT_MOTION;
             else if (xevent->xany.type == MotionNotify)
             {
                 eventType = wxEVT_MOTION;

+
+                if (xevent->xmotion.is_hint == NotifyHint)
+                {
+                    Window root, child;
+                    int x_root, y_root;
+                    unsigned int state;
+                    Display *dpy = XtDisplay (widget);
+
+                    XQueryPointer (dpy, XtWindow (widget),
+                        &root, &child,
+                        &x_root, &y_root, &eventx, &eventy, &state);
+                }

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


@@ -2304,11 +2274,11 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
                     eventType = wxEVT_RIGHT_UP;
                 }
                 else
                     eventType = wxEVT_RIGHT_UP;
                 }
                 else

-                    return FALSE;
+                    return false;

             }
             else
             {
             }
             else
             {

-                return FALSE;
+                return false;

             }
 
             wxevent.SetEventType(eventType);
             }
 
             wxevent.SetEventType(eventType);


@@ -2319,7 +2289,7 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
             int x2, y2;
             win->GetPosition(&x2, &y2);
 
             int x2, y2;
             win->GetPosition(&x2, &y2);
 

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

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


@@ -2330,8 +2300,8 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
                 dy = y1;
             }
 
                 dy = y1;
             }
 

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

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


@@ -2343,22 +2313,22 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
                 || (event_right_is_down (xevent)
                 && (eventType != wxEVT_RIGHT_UP)));
 
                 || (event_right_is_down (xevent)
                 && (eventType != wxEVT_RIGHT_UP)));
 

-            wxevent.m_shiftDown = xevent->xbutton.state & ShiftMask;
-            wxevent.m_controlDown = xevent->xbutton.state & ControlMask;
-            wxevent.m_altDown = xevent->xbutton.state & Mod3Mask;
-            wxevent.m_metaDown = xevent->xbutton.state & Mod1Mask;
+            wxevent.m_shiftDown = (xevent->xbutton.state & ShiftMask) == ShiftMask;
+            wxevent.m_controlDown = (xevent->xbutton.state & ControlMask) == ControlMask;
+            wxevent.m_altDown = (xevent->xbutton.state & Mod3Mask) == Mod3Mask;
+            wxevent.m_metaDown = (xevent->xbutton.state & Mod1Mask) == Mod1Mask;

 
             wxevent.SetId(win->GetId());
             wxevent.SetEventObject(win);
 
 
             wxevent.SetId(win->GetId());
             wxevent.SetEventObject(win);
 

-            return TRUE;
+            return true;

         }
     }
         }
     }

-    return FALSE;
+    return false;

 }
 
 bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
 }
 
 bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,

-                         Widget WXUNUSED(widget), XEvent *xevent)
+                         Widget WXUNUSED(widget), const XEvent *xevent)

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


@@ -2376,13 +2346,13 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
                 id = toupper(id);
 
             if (xevent->xkey.state & ShiftMask)
                 id = toupper(id);
 
             if (xevent->xkey.state & ShiftMask)

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

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

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

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

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

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

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

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


@@ -2391,15 +2361,14 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
             wxevent.m_y = xevent->xbutton.y;
 
             if (id > -1)
             wxevent.m_y = xevent->xbutton.y;
 
             if (id > -1)

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

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

-    return FALSE;
+    return false;

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


@@ -2417,9 +2386,9 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
 
     if (back)
     {
 
     if (back)
     {

-        g_itemColors[0].red = (((long) back->Red ()) << 8);
-        g_itemColors[0].green = (((long) back->Green ()) << 8);
-        g_itemColors[0].blue = (((long) back->Blue ()) << 8);
+        g_itemColors[0].red = (unsigned short)(((long) back->Red ()) << 8);
+        g_itemColors[0].green = (unsigned short)(((long) back->Green ()) << 8);
+        g_itemColors[0].blue = (unsigned short)(((long) back->Blue ()) << 8);

         g_itemColors[0].flags = DoRed | DoGreen | DoBlue;
         if (colorProc == (XmColorProc) NULL)
         {
         g_itemColors[0].flags = DoRed | DoGreen | DoBlue;
         if (colorProc == (XmColorProc) NULL)
         {


@@ -2437,9 +2406,9 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
     }
     if (fore)
     {
     }
     if (fore)
     {

-        g_itemColors[wxFORE_INDEX].red = (((long) fore->Red ()) << 8);
-        g_itemColors[wxFORE_INDEX].green = (((long) fore->Green ()) << 8);
-        g_itemColors[wxFORE_INDEX].blue = (((long) fore->Blue ()) << 8);
+        g_itemColors[wxFORE_INDEX].red = (unsigned short)(((long) fore->Red ()) << 8);
+        g_itemColors[wxFORE_INDEX].green = (unsigned short)(((long) fore->Green ()) << 8);
+        g_itemColors[wxFORE_INDEX].blue = (unsigned short)(((long) fore->Blue ()) << 8);

         g_itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue;
         if (result == wxNO_COLORS)
             result = wxFORE_COLORS;
         g_itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue;
         if (result == wxNO_COLORS)
             result = wxFORE_COLORS;


@@ -2473,6 +2442,8 @@ void wxWindow::ChangeBackgroundColour()
     WXWidget mainWidget = GetMainWidget();
     if ( mainWidget )
         wxDoChangeBackgroundColour(mainWidget, m_backgroundColour);
     WXWidget mainWidget = GetMainWidget();
     if ( mainWidget )
         wxDoChangeBackgroundColour(mainWidget, m_backgroundColour);

+    if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
+        wxDoChangeForegroundColour(m_scrolledWindow, m_backgroundColour);

 }
 
 void wxWindow::ChangeForegroundColour()
 }
 
 void wxWindow::ChangeForegroundColour()


@@ -2487,21 +2458,21 @@ void wxWindow::ChangeForegroundColour()
 bool wxWindow::SetBackgroundColour(const wxColour& col)
 {
     if ( !wxWindowBase::SetBackgroundColour(col) )
 bool wxWindow::SetBackgroundColour(const wxColour& col)
 {
     if ( !wxWindowBase::SetBackgroundColour(col) )

-        return FALSE;
+        return false;

 
     ChangeBackgroundColour();
 
 
     ChangeBackgroundColour();
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindow::SetForegroundColour(const wxColour& col)
 {
     if ( !wxWindowBase::SetForegroundColour(col) )
 }
 
 bool wxWindow::SetForegroundColour(const wxColour& col)
 {
     if ( !wxWindowBase::SetForegroundColour(col) )

-        return FALSE;
+        return false;

 
     ChangeForegroundColour();
 
 
     ChangeForegroundColour();
 

-    return TRUE;
+    return true;

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


@@ -2520,7 +2491,7 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {

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

         }
     }
 }
         }
     }
 }


@@ -2547,7 +2518,8 @@ wxWindow *wxWindowBase::GetCapture()
 // position.
 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {
 // position.
 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {

-    return wxFindWindowAtPoint(wxGetMousePosition());
+    pt = wxGetMousePosition();
+    return wxFindWindowAtPoint(pt);

 }
 
 // Get the current mouse position.
 }
 
 // Get the current mouse position.


@@ -2573,4 +2545,3 @@ wxPoint wxGetMousePosition()
 // ----------------------------------------------------------------------------
 
 int wxNoOptimize::ms_count = 0;
 // ----------------------------------------------------------------------------
 
 int wxNoOptimize::ms_count = 0;

-