Fix for the splashscreen bitmap not showing up in wxGTK.

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

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 6745c51afc04176a51d7a19e66253a6d9488fcda..89ba9d056a6b7f6a9688852592ecae56343d91c6 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -49,12 +49,6 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

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

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


@@ -74,11 +68,10 @@ static wxWindow* g_captureWindow = NULL;
 // event tables
 // ----------------------------------------------------------------------------
 
 // event tables
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxWindowX11, wxWindowBase)
+IMPLEMENT_ABSTRACT_CLASS(wxWindowX11, wxWindowBase)

 
 BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase)
     EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged)
 
 BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase)
     EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged)

-    EVT_IDLE(wxWindowX11::OnIdle)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -99,43 +92,15 @@ void wxWindowX11::Init()
     InitBase();
 
     // X11-specific
     InitBase();
 
     // X11-specific

-    // TODO: prune those that are no longer needed
-    m_needsRefresh = TRUE;

     m_mainWidget = (WXWindow) 0;
 
     m_mainWidget = (WXWindow) 0;
 

-    m_button1Pressed =
-    m_button2Pressed =
-    m_button3Pressed = FALSE;
-

     m_winCaptured = FALSE;
 
     m_isShown = TRUE;
     m_isBeingDeleted = FALSE;
     
     m_winCaptured = FALSE;
 
     m_isShown = TRUE;
     m_isBeingDeleted = FALSE;
     

-    m_hScrollBar =
-    m_vScrollBar =
-    m_borderWidget =
-    m_scrolledWindow =
-    m_drawingArea = (WXWindow) 0;
-
-    m_hScroll =
-    m_vScroll = FALSE;
-
-    m_scrollPosX =
-    m_scrollPosY = 0;
-
-    m_backingPixmap = (WXPixmap) 0;
-    m_pixmapWidth =
-    m_pixmapHeight = 0;
-
-    m_pixmapOffsetX =
-    m_pixmapOffsetY = 0;
-

     m_lastTS = 0;
     m_lastButton = 0;
     m_lastTS = 0;
     m_lastButton = 0;

-    m_canAddEventHandler = FALSE;
-
-    m_borderSize = 0;

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


@@ -149,24 +114,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
 
     CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
 
 
     CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
 

-    if (parent)
-        parent->AddChild(this);
-
-    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-    m_foregroundColour = *wxBLACK;
-
-    // TODO: How to create more interesting borders?
-    // Will presumably have to create multiple windows.
-    if (style & wxSIMPLE_BORDER)
-    {
-        m_borderSize = 1;
-    } else if (style & wxSUNKEN_BORDER)
-    {
-        m_borderSize = 1;
-    } else if (style & wxRAISED_BORDER)
-    {
-        m_borderSize = 1;
-    }
+    parent->AddChild(this);

 
     int w = size.GetWidth();
     int h = size.GetHeight();
 
     int w = size.GetWidth();
     int h = size.GetHeight();


@@ -177,18 +125,27 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
     if (x == -1) x = 0;
     if (y == -1) y = 0;
 
     if (x == -1) x = 0;
     if (y == -1) y = 0;
 

-    int screen = DefaultScreen(wxGlobalDisplay());
+    Display *xdisplay = (Display*) wxGlobalDisplay();
+    int xscreen = DefaultScreen( xdisplay );
+    Colormap cm = DefaultColormap( xdisplay, xscreen );

 
 

-    Window parentWindow;
-    if (parent)
-        parentWindow = (Window) parent->GetClientWindow();
-    else
-        parentWindow = RootWindow(wxGlobalDisplay(), screen);
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+    m_backgroundColour.CalcPixel( (WXColormap) cm ); 
+    m_hasBgCol = TRUE;
+    
+    m_foregroundColour = *wxBLACK;
+    m_foregroundColour.CalcPixel( (WXColormap) cm ); 
+    
+
+    Window parentWindow = (Window) parent->GetMainWindow();

 
 

-    Window window = XCreateSimpleWindow(wxGlobalDisplay(), parentWindow,
-        x, y, w, h, m_borderSize,
-        m_backgroundColour.AllocColour(wxGlobalDisplay()),
-        m_foregroundColour.AllocColour(wxGlobalDisplay()));
+    Window window = XCreateSimpleWindow( 
+        xdisplay, parentWindow,
+        x, y, w, h, 0, 
+        m_backgroundColour.GetPixel(),
+        m_backgroundColour.GetPixel() );
+        
+    m_mainWidget = (WXWindow) window;

 
     // Select event types wanted
     XSelectInput(wxGlobalDisplay(), window,
 
     // Select event types wanted
     XSelectInput(wxGlobalDisplay(), window,


@@ -199,12 +156,9 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
 
     wxAddWindowToTable(window, (wxWindow*) this);
 
 
     wxAddWindowToTable(window, (wxWindow*) this);
 

-    // If a subwindow, show.
-//    if (parent && !parent->IsKindOf(CLASSINFO(wxTopLevelWindowX11)) && parent->IsShown())
-    {
-        m_isShown = TRUE;
-        XMapWindow(wxGlobalDisplay(), window);
-    }
+    // Is a subwindow, so map immediately
+    m_isShown = TRUE;
+    XMapWindow(wxGlobalDisplay(), window);

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


@@ -224,216 +178,26 @@ wxWindowX11::~wxWindowX11()
     m_isBeingDeleted = TRUE;
     
     // X11-specific actions first
     m_isBeingDeleted = TRUE;
     
     // X11-specific actions first

-    WXWindow wMain = GetMainWindow();
-    if ( wMain )
+    Window main = (Window) m_mainWidget;
+    if ( main )

     {
         // Removes event handlers
     {
         // Removes event handlers

-        //DetachWidget(wMain);
+        //DetachWidget(main);

     }
 
     }
 

-    ClearUpdateRects();
-
-    if ( m_parent )
+    if (m_parent)

         m_parent->RemoveChild( this );
 
         m_parent->RemoveChild( this );
 

-    // TODO
-
-#if 0    
-    // If m_drawingArea, we're a fully-fledged window with drawing area,
-    // scrollbars etc. (what wxCanvas used to be)
-    if ( m_drawingArea )
-    {
-        // Destroy children before destroying self
-        DestroyChildren();
-
-        if (m_backingPixmap)
-            XFreePixmap (XtDisplay ((Widget) GetMainWidget()), (Pixmap) m_backingPixmap);
-
-        Widget w = (Widget) m_drawingArea;
-        wxDeleteWindowFromTable(w);
-
-        if (w)
-        {
-            XtDestroyWidget(w);
-           m_drawingArea = (WXWidget) 0;
-        }
-
-        // Only if we're _really_ a canvas (not a dialog box/panel)
-        if (m_scrolledWindow)
-        {
-            wxDeleteWindowFromTable((Widget) m_scrolledWindow);
-        }
-
-        if (m_hScrollBar)
-        {
-            wxDeleteWindowFromTable((Widget) m_hScrollBar);
-           XtUnmanageChild((Widget) m_hScrollBar);
-        }
-        if (m_vScrollBar)
-        {
-            wxDeleteWindowFromTable((Widget) m_vScrollBar);
-           XtUnmanageChild((Widget) m_vScrollBar);
-        }
-
-        if (m_hScrollBar)
-           XtDestroyWidget((Widget) m_hScrollBar);
-        if (m_vScrollBar)
-           XtDestroyWidget((Widget) m_vScrollBar);
-
-        UnmanageAndDestroy(m_scrolledWindow);
-
-        if (m_borderWidget)
-        {
-            XtDestroyWidget ((Widget) m_borderWidget);
-            m_borderWidget = (WXWidget) 0;
-        }
-    }
-    else // Why wasn't this here before? JACS 8/3/2000
-#endif
-        DestroyChildren();
-
+    DestroyChildren();

 
     // Destroy the window
 
     // Destroy the window

-    if (GetMainWindow())
+    if (main)

     {
     {

-        XSelectInput(wxGlobalDisplay(), (Window) GetMainWindow(),
-            NoEventMask);
-        wxDeleteWindowFromTable((Window) GetMainWindow());
-        XDestroyWindow(wxGlobalDisplay(), (Window) GetMainWindow());
-        SetMainWindow((WXWindow) NULL);
-    }
-}
-
-// ----------------------------------------------------------------------------
-// scrollbar management
-// ----------------------------------------------------------------------------
-
-// Helper function
-void wxWindowX11::CreateScrollbar(wxOrientation orientation)
-{
-    // TODO
-#if 0
-    wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
-
-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
-
-    // Add scrollbars if required
-    if (orientation == wxHORIZONTAL)
-    {
-        Widget hScrollBar = XtVaCreateManagedWidget ("hsb",
-            xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
-            XmNorientation, XmHORIZONTAL,
-            NULL);
-        XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-        XtAddCallback (hScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-
-        XtVaSetValues (hScrollBar,
-            XmNincrement, 1,
-            XmNvalue, 0,
-            NULL);
-
-        m_hScrollBar = (WXWidget) hScrollBar;
-
-        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-        DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
-
-        XtRealizeWidget(hScrollBar);
-
-        XtVaSetValues((Widget) m_scrolledWindow,
-            XmNhorizontalScrollBar, (Widget) m_hScrollBar,
-            NULL);
-
-        m_hScroll = TRUE;
-
-        wxAddWindowToTable( hScrollBar, this );
-    }
-
-    if (orientation == wxVERTICAL)
-    {
-        Widget vScrollBar = XtVaCreateManagedWidget ("vsb",
-            xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
-            XmNorientation, XmVERTICAL,
-            NULL);
-        XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-        XtAddCallback (vScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-
-        XtVaSetValues (vScrollBar,
-            XmNincrement, 1,
-            XmNvalue, 0,
-            NULL);
-
-        m_vScrollBar = (WXWidget) vScrollBar;
-        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-        DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
-
-        XtRealizeWidget(vScrollBar);
-
-        XtVaSetValues((Widget) m_scrolledWindow,
-            XmNverticalScrollBar, (Widget) m_vScrollBar,
-            NULL);
-
-        m_vScroll = TRUE;
-
-        wxAddWindowToTable( vScrollBar, this );
-    }
-
-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
-#endif
-}
-
-void wxWindowX11::DestroyScrollbar(wxOrientation orientation)
-{
-    // TODO
-#if 0
-    wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
-
-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
-    // Add scrollbars if required
-    if (orientation == wxHORIZONTAL)
-    {
-        if (m_hScrollBar)
-        {
-            wxDeleteWindowFromTable((Widget)m_hScrollBar);
-            XtDestroyWidget((Widget) m_hScrollBar);
-        }
-        m_hScrollBar = (WXWidget) 0;
-        m_hScroll = FALSE;
-
-        XtVaSetValues((Widget) m_scrolledWindow,
-            XmNhorizontalScrollBar, (Widget) 0,
-            NULL);
-
-    }
-
-    if (orientation == wxVERTICAL)
-    {
-        if (m_vScrollBar)
-        {
-            wxDeleteWindowFromTable((Widget)m_vScrollBar);
-            XtDestroyWidget((Widget) m_vScrollBar);
-        }
-        m_vScrollBar = (WXWidget) 0;
-        m_vScroll = FALSE;
-
-        XtVaSetValues((Widget) m_scrolledWindow,
-            XmNverticalScrollBar, (Widget) 0,
-            NULL);
-
+        XSelectInput( wxGlobalDisplay(), main, NoEventMask);
+        wxDeleteWindowFromTable( main );
+        XDestroyWindow( wxGlobalDisplay(), main );
+        m_mainWidget = NULL;

     }
     }

-    XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
-#endif

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


@@ -442,8 +206,7 @@ void wxWindowX11::DestroyScrollbar(wxOrientation orientation)
 
 void wxWindowX11::SetFocus()
 {
 
 void wxWindowX11::SetFocus()
 {

-#if 0
-    Window wMain = (Window) GetMainWidget();
+    Window wMain = (Window) GetMainWindow();

     if (wMain)
     {
         XSetInputFocus(wxGlobalDisplay(), wMain, RevertToParent, CurrentTime);
     if (wMain)
     {
         XSetInputFocus(wxGlobalDisplay(), wMain, RevertToParent, CurrentTime);


@@ -451,9 +214,8 @@ void wxWindowX11::SetFocus()
         XWMHints wmhints;
         wmhints.flags = InputHint;
         wmhints.input = True;
         XWMHints wmhints;
         wmhints.flags = InputHint;
         wmhints.input = True;

-        XSetWMHints(wxGlobalDisplay(), wMain, &wmhints)
+        XSetWMHints(wxGlobalDisplay(), wMain, &wmhints);

     }
     }

-#endif

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


@@ -490,17 +252,23 @@ bool wxWindowX11::Enable(bool enable)
 
 bool wxWindowX11::Show(bool show)
 {
 
 bool wxWindowX11::Show(bool show)
 {

-    if ( !wxWindowBase::Show(show) )
-        return FALSE;
+    wxWindowBase::Show(show);

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

+        wxString msg;
+       msg.Printf("Mapping window of type %s", GetClassInfo()->GetClassName());
+       wxLogDebug(msg);

         XMapWindow(xdisp, xwin);
         XMapWindow(xdisp, xwin);

+       XSync(xdisp, False);

     }
     else
     {
     }
     else
     {

+        wxString msg;
+       msg.Printf("Unmapping window of type %s", GetClassInfo()->GetClassName());
+       wxLogDebug(msg);

         XUnmapWindow(xdisp, xwin);
     }
 
         XUnmapWindow(xdisp, xwin);
     }
 


@@ -510,26 +278,34 @@ bool wxWindowX11::Show(bool show)
 // Raise the window to the top of the Z order
 void wxWindowX11::Raise()
 {
 // Raise the window to the top of the Z order
 void wxWindowX11::Raise()
 {

-    Window window = (Window) GetTopWindow();
-    if (window)
-        XRaiseWindow(wxGlobalDisplay(), window);
+    if (m_mainWidget)
+        XRaiseWindow( wxGlobalDisplay(), (Window) m_mainWidget );

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

-    Window window = (Window) GetTopWindow();
-    if (window)
-        XLowerWindow(wxGlobalDisplay(), window);
+    if (m_mainWidget)
+        XLowerWindow( wxGlobalDisplay(), (Window) m_mainWidget );

 }
 
 void wxWindowX11::DoCaptureMouse()
 {
 }
 
 void wxWindowX11::DoCaptureMouse()
 {

-    g_captureWindow = (wxWindow*) this;
+    if ((g_captureWindow != NULL) && (g_captureWindow != this))
+    {
+       wxASSERT_MSG(FALSE, "Trying to capture before mouse released.");
+
+       // Core dump now
+       int *tmp = NULL;
+       (*tmp) = 1;
+       return;
+    }
+    

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

-    // TODO: should we also call XGrabButton, XGrabKeyboard?
+    g_captureWindow = (wxWindow*) this;
+

     if (GetMainWindow())
     {
         int res = XGrabPointer(wxGlobalDisplay(), (Window) GetMainWindow(),
     if (GetMainWindow())
     {
         int res = XGrabPointer(wxGlobalDisplay(), (Window) GetMainWindow(),


@@ -541,10 +317,62 @@ void wxWindowX11::DoCaptureMouse()
             None, /* cursor */ // TODO: This may need to be set to the cursor of this window
             CurrentTime);
 
             None, /* cursor */ // TODO: This may need to be set to the cursor of this window
             CurrentTime);
 

-        if (res == GrabSuccess)
+        if (res != GrabSuccess)
+        {
+           wxString msg;
+           msg.Printf("Failed to grab pointer for window %s", this->GetClassInfo()->GetClassName());
+           wxLogDebug(msg);
+           if (res == GrabNotViewable)
+           {
+               wxLogDebug("This is not a viewable window - perhaps not shown yet?");
+           }
+           g_captureWindow = NULL;
+            return;
+        }
+       wxLogDebug("Grabbed pointer");
+
+#if 0
+        res = XGrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
+            (Window) GetMainWindow(),
+            FALSE,
+            ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
+               GrabModeAsync,
+               GrabModeAsync,
+            None,
+            None);
+       
+        if (res != GrabSuccess)
+        {
+            wxLogDebug("Failed to grab mouse buttons.");
+            XUngrabPointer(wxGlobalDisplay(), CurrentTime);
+            return;
+        }
+#endif
+
+#if 0
+        res = XGrabKeyboard(wxGlobalDisplay(), (Window) GetMainWindow(),
+#if 0
+            ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask,
+#else
+            FALSE,
+#endif
+            GrabModeAsync,
+               GrabModeAsync,
+            CurrentTime);
+
+        if (res != GrabSuccess)

         {
         {

-            m_winCaptured = TRUE;
+            wxLogDebug("Failed to grab keyboard.");
+            XUngrabPointer(wxGlobalDisplay(), CurrentTime);
+#if 0
+            XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
+                (Window) GetMainWindow());
+#endif
+            return;

         }
         }

+#endif
+       
+        m_winCaptured = TRUE;

     }
 }
 
     }
 }
 


@@ -556,9 +384,16 @@ void wxWindowX11::DoReleaseMouse()
 
     Window wMain = (Window)GetMainWindow();
 
 
     Window wMain = (Window)GetMainWindow();
 

-    // TODO: should we also call XUngrabButton, XUngrabKeyboard?

     if ( wMain )
     if ( wMain )

+    {

         XUngrabPointer(wxGlobalDisplay(), wMain);
         XUngrabPointer(wxGlobalDisplay(), wMain);

+#if 0
+        XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
+                wMain);
+        XUngrabKeyboard(wxGlobalDisplay(), CurrentTime);
+#endif
+    }
+    wxLogDebug("Ungrabbed pointer");

 
     m_winCaptured = FALSE;
 }
 
     m_winCaptured = FALSE;
 }


@@ -571,8 +406,6 @@ bool wxWindowX11::SetFont(const wxFont& font)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    ChangeFont();
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -590,11 +423,10 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor)
     else
         cursor2 = wxSTANDARD_CURSOR;
 
     else
         cursor2 = wxSTANDARD_CURSOR;
 

-    WXDisplay *dpy = GetXDisplay();
-    WXCursor x_cursor = cursor2->GetXCursor(dpy);
+    WXCursor x_cursor = cursor2->GetCursor();

 
     Window win = (Window) GetMainWindow();
 
     Window win = (Window) GetMainWindow();

-    XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);
+    XDefineCursor((Display*) wxGlobalDisplay(), win, (Cursor) x_cursor);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -602,150 +434,14 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor)
 // Coordinates relative to the window
 void wxWindowX11::WarpPointer (int x, int y)
 {
 // Coordinates relative to the window
 void wxWindowX11::WarpPointer (int x, int y)
 {

-    Window wClient = (Window) GetClientWindow();
-
-    XWarpPointer(wxGlobalDisplay(), None, wClient, 0, 0, 0, 0, x, y);
-}
-
-// ---------------------------------------------------------------------------
-// scrolling stuff
-// ---------------------------------------------------------------------------
-
-int wxWindowX11::GetScrollPos(int orient) const
-{
-    if (orient == wxHORIZONTAL)
-        return m_scrollPosX;
-    else
-        return m_scrollPosY;
-}
-
-// This now returns the whole range, not just the number of positions that we
-// can scroll.
-int wxWindowX11::GetScrollRange(int WXUNUSED(orient)) const
-{
-    // TODO
-    return 0;
-#if 0
-    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
-    wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
-
-    int range;
-    XtVaGetValues(scrollBar, XmNmaximum, &range, NULL);
-    return range;
-#endif
-}
-
-int wxWindowX11::GetScrollThumb(int orient) const
-{
-    // TODO
-    return 0;
-
-#if 0
-    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
-    wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
-
-    int thumb;
-    XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL);
-    return thumb;
-#endif
-}
-
-void wxWindowX11::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
-{
-    // TODO
-
-#if 0
-    Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
-
-    if ( scrollBar )
-    {
-        XtVaSetValues (scrollBar, XmNvalue, pos, NULL);
-    }
-#endif
-    SetInternalScrollPos((wxOrientation)orient, pos);
-}
-
-// New function that will replace some of the above.
-void wxWindowX11::SetScrollbar(int WXUNUSED(orient), int WXUNUSED(pos), int WXUNUSED(thumbVisible),
-                            int WXUNUSED(range), bool WXUNUSED(refresh))
-{
-    // TODO
-#if 0
-    int oldW, oldH;
-    GetSize(& oldW, & oldH);
-
-    if (range == 0)
-        range = 1;
-    if (thumbVisible == 0)
-        thumbVisible = 1;
-
-    if (thumbVisible > range)
-        thumbVisible = range;
-
-    // Save the old state to see if it changed
-    WXWidget oldScrollBar = GetScrollbar((wxOrientation)orient);
-
-    if (orient == wxHORIZONTAL)
-    {
-        if (thumbVisible == range)
-        {
-            if (m_hScrollBar)
-                DestroyScrollbar(wxHORIZONTAL);
-        }
-        else
-        {
-            if (!m_hScrollBar)
-                CreateScrollbar(wxHORIZONTAL);
-        }
-    }
-    if (orient == wxVERTICAL)
-    {
-        if (thumbVisible == range)
-        {
-            if (m_vScrollBar)
-                DestroyScrollbar(wxVERTICAL);
-        }
-        else
-        {
-            if (!m_vScrollBar)
-                CreateScrollbar(wxVERTICAL);
-        }
-    }
-    WXWidget newScrollBar =  GetScrollbar((wxOrientation)orient);
-
-    if (oldScrollBar != newScrollBar)
-    {
-        // This is important! Without it, scrollbars misbehave badly.
-        XtUnrealizeWidget((Widget) m_scrolledWindow);
-        XmScrolledWindowSetAreas ((Widget) m_scrolledWindow, (Widget) m_hScrollBar, (Widget) m_vScrollBar, (Widget) m_drawingArea);
-        XtRealizeWidget((Widget) m_scrolledWindow);
-        XtManageChild((Widget) m_scrolledWindow);
-    }
-
-    if (newScrollBar)
-    {
-        XtVaSetValues((Widget) newScrollBar,
-        XmNvalue, pos,
-        XmNminimum, 0,
-        XmNmaximum, range,
-        XmNsliderSize, thumbVisible,
-        NULL);
-    }
-
-    SetInternalScrollPos((wxOrientation)orient, pos);
-
-    int newW, newH;
-    GetSize(& newW, & newH);
-
-    // Adjusting scrollbars can resize the canvas accidentally
-    if (newW != oldW || newH != oldH)
-        SetSize(-1, -1, oldW, oldH);
-#endif
+    if (m_mainWidget)
+        XWarpPointer( wxGlobalDisplay(), None, (Window) m_mainWidget, 0, 0, 0, 0, x, y);

 }
 
 // Does a physical scroll
 void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
 }
 
 // Does a physical scroll
 void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
 {

+#if 0

     int x, y, w, h;
     if (rect)
     {
     int x, y, w, h;
     if (rect)
     {


@@ -908,10 +604,7 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
         delete rect;
         node = node->Next();
     }
         delete rect;
         node = node->Next();
     }

-    
-    // TODO
-
-    // XmUpdateDisplay((Widget) GetMainWidget());
+#endif

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


@@ -958,7 +651,7 @@ bool wxWindowX11::PreResize()
 // Get total size
 void wxWindowX11::DoGetSize(int *x, int *y) const
 {
 // Get total size
 void wxWindowX11::DoGetSize(int *x, int *y) const
 {

-    Window window = (Window) GetTopWindow();
+    Window window = (Window) m_mainWidget;

     if (window)
     {
         XWindowAttributes attr;
     if (window)
     {
         XWindowAttributes attr;


@@ -967,15 +660,15 @@ void wxWindowX11::DoGetSize(int *x, int *y) const
         
         if (status)
         {
         
         if (status)
         {

-            *x = attr.width + 2*m_borderSize;
-            *y = attr.height + 2*m_borderSize;
+            *x = attr.width /* + 2*m_borderSize */ ;
+            *y = attr.height /* + 2*m_borderSize */ ;

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

-    Window window = (Window) GetTopWindow();
+    Window window = (Window) m_mainWidget;

     if (window)
     {
         XWindowAttributes attr;
     if (window)
     {
         XWindowAttributes attr;


@@ -1003,7 +696,7 @@ void wxWindowX11::DoScreenToClient(int *x, int *y) const
 {
     Display *display = wxGlobalDisplay();
     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));
 {
     Display *display = wxGlobalDisplay();
     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));

-    Window thisWindow = (Window) GetClientWindow();
+    Window thisWindow = (Window) m_mainWidget;

 
     Window childWindow;
     int xx = *x;
 
     Window childWindow;
     int xx = *x;


@@ -1015,7 +708,7 @@ void wxWindowX11::DoClientToScreen(int *x, int *y) const
 {
     Display *display = wxGlobalDisplay();
     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));
 {
     Display *display = wxGlobalDisplay();
     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));

-    Window thisWindow = (Window) GetClientWindow();
+    Window thisWindow = (Window) m_mainWidget;

 
     Window childWindow;
     int xx = *x;
 
     Window childWindow;
     int xx = *x;


@@ -1027,12 +720,12 @@ void wxWindowX11::DoClientToScreen(int *x, int *y) const
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 void wxWindowX11::DoGetClientSize(int *x, int *y) const
 {
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 void wxWindowX11::DoGetClientSize(int *x, int *y) const
 {

-    Window window = (Window) GetClientWindow();
+    Window window = (Window) m_mainWidget;

 
     if (window)
     {
         XWindowAttributes attr;
 
     if (window)
     {
         XWindowAttributes attr;

-        Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
+        Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr );

         wxASSERT(status);
         
         if (status)
         wxASSERT(status);
         
         if (status)


@@ -1053,25 +746,28 @@ void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
     if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
 
     if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {

+       int yy = 0;
+        AdjustForParentClientOrigin( x, yy, sizeFlags);

         windowChanges.x = x;
         valueMask |= CWX;
     }
     if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
         windowChanges.x = x;
         valueMask |= CWX;
     }
     if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {

+       int xx = 0;
+        AdjustForParentClientOrigin( xx, y, sizeFlags);

         windowChanges.y = y;
         valueMask |= CWY;
     }
     if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
         windowChanges.y = y;
         valueMask |= CWY;
     }
     if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {

-        windowChanges.width = width - m_borderSize*2;
+        windowChanges.width = width /* - m_borderSize*2 */;

         valueMask |= CWWidth;
     }
     if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
         valueMask |= CWWidth;
     }
     if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {

-        windowChanges.height = height - m_borderSize*2;
+        windowChanges.height = height /* -m_borderSize*2*/;

         valueMask |= CWHeight;
     }
         valueMask |= CWHeight;
     }

-    AdjustForParentClientOrigin( x, y, sizeFlags);

 
     XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
         valueMask, & windowChanges);
 
     XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
         valueMask, & windowChanges);


@@ -1192,13 +888,12 @@ void wxWindowX11::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;
+    wxFont fontToUse = m_font;
+    if (theFont) fontToUse = *theFont;

 
 

-    wxCHECK_RET( fontToUse->Ok(), "valid window font needed" );
-    
-    WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay());
+    wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
+
+    WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, GetXDisplay());

 
     int direction, ascent, descent2;
     XCharStruct overall;
 
     int direction, ascent, descent2;
     XCharStruct overall;


@@ -1210,7 +905,7 @@ void wxWindowX11::GetTextExtent(const wxString& string,
         &ascent, &descent2, &overall);
 #endif
 
         &ascent, &descent2, &overall);
 #endif
 

-    XTextExtents((XFontStruct*) pFontStruct, string, slen,
+    XTextExtents((XFontStruct*) pFontStruct, string.c_str(), slen,

                  &direction, &ascent, &descent2, &overall);
 
     if ( x )
                  &direction, &ascent, &descent2, &overall);
 
     if ( x )


@@ -1230,46 +925,46 @@ void wxWindowX11::GetTextExtent(const wxString& string,
 
 void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect)
 {
 
 void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect)
 {

-    m_needsRefresh = TRUE;
-    Display *display = wxGlobalDisplay();
-    Window thisWindow = (Window) GetMainWindow();
-
-    XExposeEvent dummyEvent;
-    int width, height;
-    GetSize(&width, &height);
+    if (eraseBack)
+    {
+        if (rect)
+        {
+            // Schedule for later Updating in ::Update() or ::OnInternalIdle().
+            m_clearRegion.Union( rect->x, rect->y, rect->width, rect->height );
+        }
+        else
+        {
+            int height,width;
+            GetSize( &width, &height );
+            
+            // Schedule for later Updating in ::Update() or ::OnInternalIdle().
+            m_clearRegion.Clear();
+            m_clearRegion.Union( 0, 0, width, height );
+        }
+    }

 
 

-    dummyEvent.type = Expose;
-    dummyEvent.display = display;
-    dummyEvent.send_event = True;
-    dummyEvent.window = thisWindow;

     if (rect)
     {
     if (rect)
     {

-        dummyEvent.x = rect->x;
-        dummyEvent.y = rect->y;
-        dummyEvent.width = rect->width;
-        dummyEvent.height = rect->height;
+         // Schedule for later Updating in ::Update() or ::OnInternalIdle().
+         m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height );

     }
     else
     {
     }
     else
     {

-        dummyEvent.x = 0;
-        dummyEvent.y = 0;
-        dummyEvent.width = width;
-        dummyEvent.height = height;
+        int height,width;
+        GetSize( &width, &height );
+            
+        // Schedule for later Updating in ::Update() or ::OnInternalIdle().
+        m_updateRegion.Clear();
+        m_updateRegion.Union( 0, 0, width, height );

     }
     }

-    dummyEvent.count = 0;
+}

 
 

-    if (eraseBack)
+void wxWindowX11::Update()
+{
+    if (!m_updateRegion.IsEmpty())

     {
     {

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

     }
     }

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

 }
 
 void wxWindowX11::Clear()
 }
 
 void wxWindowX11::Clear()


@@ -1280,31 +975,42 @@ void wxWindowX11::Clear()
     dc.Clear();
 }
 
     dc.Clear();
 }
 

-void wxWindowX11::ClearUpdateRects()
+void wxWindowX11::X11SendPaintEvents()

 {
 {

-    wxRectList::Node* node = m_updateRects.GetFirst();
-    while (node)
+    m_clipPaintRegion = TRUE;
+
+    //    if (!m_clearRegion.IsEmpty())

     {
     {

-        wxRect* rect = node->GetData();
-        delete rect;
-        node = node->GetNext();
+        wxWindowDC dc( (wxWindow*)this );
+        dc.SetClippingRegion( m_clearRegion );
+        
+        wxEraseEvent erase_event( GetId(), &dc );
+        erase_event.SetEventObject( this );
+    
+        if (!GetEventHandler()->ProcessEvent(erase_event))
+        {
+            wxRegionIterator upd( m_clearRegion );
+            while (upd)
+            {
+                XClearArea( wxGlobalDisplay(), (Window) m_mainWidget, 
+                            upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight(), False );
+                upd ++;
+            }
+        }
+        m_clearRegion.Clear();

     }
 
     }
 

-    m_updateRects.Clear();
-}
+    wxNcPaintEvent nc_paint_event( GetId() );
+    nc_paint_event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( nc_paint_event );

 
 

-void wxWindowX11::DoPaint()
-{
-    // Set an erase event first
-    wxEraseEvent eraseEvent(GetId());
-    eraseEvent.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(eraseEvent);
-    
-    wxPaintEvent event(GetId());
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
+    wxPaintEvent paint_event( GetId() );
+    paint_event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( paint_event );
+
+    m_updateRegion.Clear();

     
     

-    m_needsRefresh = FALSE;
+    m_clipPaintRegion = FALSE;

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


@@ -1330,84 +1036,16 @@ void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event)
     }
 }
 
     }
 }
 

-void wxWindowX11::OnIdle(wxIdleEvent& WXUNUSED(event))
+void wxWindowX11::OnInternalIdle()

 {
 {

+    // Update invalidated regions.
+    Update();
+    

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

-// ----------------------------------------------------------------------------
-// accelerators
-// ----------------------------------------------------------------------------
-
-bool wxWindowX11::ProcessAccelerator(wxKeyEvent& event)
-{
-    if (!m_acceleratorTable.Ok())
-        return FALSE;
-
-    const wxAcceleratorEntry* entry = m_acceleratorTable.GetEntry(event);
-    if (entry)
-    {
-            // Bingo, we have a match. Now find a control that matches the
-           // entry command id.
-
-            // Need to go up to the top of the window hierarchy, since it might
-            // be e.g. a menu item
-            wxWindow* parent = (wxWindow*) this;
-            while ( parent && !parent->IsTopLevel() )
-                parent = parent->GetParent();
-
-            if (!parent)
-                return FALSE;
-
-            wxFrame* frame = wxDynamicCast(parent, wxFrame);
-            if ( frame )
-            {
-                // Try for a menu command
-                if (frame->GetMenuBar())
-                {
-                    wxMenuItem* item = frame->GetMenuBar()->FindItem(entry->GetCommand());
-                    if (item)
-                    {
-                        wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
-                        commandEvent.SetEventObject(frame);
-
-                        // If ProcessEvent returns TRUE (it was handled), then
-                        // the calling code will skip the event handling.
-                        return frame->GetEventHandler()->ProcessEvent(commandEvent);
-                    }
-                }
-            }
-
-            // Find a child matching the command id
-            wxWindow* child = parent->FindWindow(entry->GetCommand());
-
-            // No such child
-            if (!child)
-                return FALSE;
-
-            // Now we process those kinds of windows that we can.
-            // For now, only buttons.
-            if ( wxDynamicCast(child, wxButton) )
-            {
-                wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId());
-                commandEvent.SetEventObject(child);
-                return child->GetEventHandler()->ProcessEvent(commandEvent);
-            }
-
-            return FALSE;
-
-    }// if
-
-    // We didn't match the key event against an accelerator.
-    return FALSE;
-}
-
-// ============================================================================
-// X11-specific stuff from here on
-// ============================================================================
-

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


@@ -1462,103 +1100,9 @@ WXDisplay *wxWindowX11::GetXDisplay() const
 
 WXWindow wxWindowX11::GetMainWindow() const
 {
 
 WXWindow wxWindowX11::GetMainWindow() const
 {

-    if (m_drawingArea)
-        return m_drawingArea;
-    else
-        return m_mainWidget;
-}
-
-WXWindow wxWindowX11::GetClientWindow() const
-{
-    if (m_drawingArea != (WXWindow) 0)
-        return m_drawingArea;
-    else
-        return GetMainWindow();
-}
-
-WXWindow wxWindowX11::GetTopWindow() const
-{
-    return GetMainWindow();
-}
-
-WXWindow wxWindowX11::GetLabelWindow() const
-{
-    return GetMainWindow();
+    return m_mainWidget;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// callbacks
-// ----------------------------------------------------------------------------
-
-// TODO: implement wxWindow scrollbar, presumably using wxScrollBar
-#if 0
-static void wxScrollBarCallback(Widget scrollbar,
-                                XtPointer clientData,
-                                XmScrollBarCallbackStruct *cbs)
-{
-    wxWindow *win = wxGetWindowFromTable(scrollbar);
-    int orientation = (int) clientData;
-
-    wxEventType eventType = wxEVT_NULL;
-    switch (cbs->reason)
-    {
-    case XmCR_INCREMENT:
-        {
-            eventType = wxEVT_SCROLLWIN_LINEDOWN;
-            break;
-        }
-    case XmCR_DECREMENT:
-        {
-            eventType = wxEVT_SCROLLWIN_LINEUP;
-            break;
-        }
-    case XmCR_DRAG:
-        {
-            eventType = wxEVT_SCROLLWIN_THUMBTRACK;
-            break;
-        }
-    case XmCR_VALUE_CHANGED:
-        {
-            eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
-            break;
-        }
-    case XmCR_PAGE_INCREMENT:
-        {
-            eventType = wxEVT_SCROLLWIN_PAGEDOWN;
-            break;
-        }
-    case XmCR_PAGE_DECREMENT:
-        {
-            eventType = wxEVT_SCROLLWIN_PAGEUP;
-            break;
-        }
-    case XmCR_TO_TOP:
-        {
-            eventType = wxEVT_SCROLLWIN_TOP;
-            break;
-        }
-    case XmCR_TO_BOTTOM:
-        {
-            eventType = wxEVT_SCROLLWIN_BOTTOM;
-            break;
-        }
-    default:
-        {
-            // Should never get here
-            wxFAIL_MSG("Unknown scroll event.");
-            break;
-        }
-    }
-
-    wxScrollWinEvent event(eventType,
-                           cbs->value,
-                           ((orientation == XmHORIZONTAL) ?
-                            wxHORIZONTAL : wxVERTICAL));
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent(event);
-}
-#endif
-

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


@@ -1600,19 +1144,16 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window,
                 if (xevent->xbutton.button == Button1)
                 {
                     eventType = wxEVT_LEFT_DOWN;
                 if (xevent->xbutton.button == Button1)
                 {
                     eventType = wxEVT_LEFT_DOWN;

-                    win->SetButton1(TRUE);

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

-                    win->SetButton2(TRUE);

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

-                    win->SetButton3(TRUE);

                     button = 3;
                 }
 
                     button = 3;
                 }
 


@@ -1646,17 +1187,14 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window,
                 if (xevent->xbutton.button == Button1)
                 {
                     eventType = wxEVT_LEFT_UP;
                 if (xevent->xbutton.button == Button1)
                 {
                     eventType = wxEVT_LEFT_UP;

-                    win->SetButton1(FALSE);

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

-                    win->SetButton2(FALSE);

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

-                    win->SetButton3(FALSE);

                 }
                 else return FALSE;
             }
                 }
                 else return FALSE;
             }


@@ -1801,81 +1339,27 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
 }
 #endif
 
 }
 #endif
 

-// Changes the foreground and background colours to be derived from the current
-// background colour. To change the foreground colour, you must call
-// SetForegroundColour explicitly.
-void wxWindowX11::ChangeBackgroundColour()
+bool wxWindowX11::SetBackgroundColour(const wxColour& col)

 {
 {

-    // TODO
-#if 0
-    WXWidget mainWidget = GetMainWidget();
-    if ( mainWidget )
-        DoChangeBackgroundColour(mainWidget, m_backgroundColour);
-#endif
-}
+    wxWindowBase::SetBackgroundColour(col);

 
 

-void wxWindowX11::ChangeForegroundColour()
-{
-    // TODO
-#if 0
-    WXWidget mainWidget = GetMainWidget();
-    if ( mainWidget )
-        DoChangeForegroundColour(mainWidget, m_foregroundColour);
-    if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
-        DoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);
-#endif
-}
+    if (!GetMainWindow())
+        return FALSE;

 
 

-// Change a widget's foreground and background colours.
-void wxWindowX11::DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour)
-{
-    // TODO
-#if 0
-    // When should we specify the foreground, if it's calculated
-    // by wxComputeColours?
-    // Solution: say we start with the default (computed) foreground colour.
-    // If we call SetForegroundColour explicitly for a control or window,
-    // then the foreground is changed.
-    // Therefore SetBackgroundColour computes the foreground colour, and
-    // SetForegroundColour changes the foreground colour. The ordering is
-    // important.
-
-    Widget w = (Widget)widget;
-    XtVaSetValues(
-                  w,
-                  XmNforeground, foregroundColour.AllocColour(XtDisplay(w)),
-                  NULL
-                 );
-#endif
-}
+    Display *xdisplay = (Display*) wxGlobalDisplay();
+    int xscreen = DefaultScreen( xdisplay );
+    Colormap cm = DefaultColormap( xdisplay, xscreen );

 
 

-void wxWindowX11::DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour)
-{
-    // TODO
-#if 0
-    wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
-        (wxColour*) NULL);
-
-    XtVaSetValues ((Widget) widget,
-        XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
-        XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
-        XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
-        XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
-        NULL);
-
-    if (changeArmColour)
-        XtVaSetValues ((Widget) widget,
-        XmNarmColor, g_itemColors[wxSELE_INDEX].pixel,
-        NULL);
-#endif
-}
-
-bool wxWindowX11::SetBackgroundColour(const wxColour& col)
-{
-    if ( !wxWindowBase::SetBackgroundColour(col) )
-        return FALSE;
+    wxColour colour( col );
+    colour.CalcPixel( (WXColormap) cm );
+    
+    XSetWindowAttributes attrib;
+    attrib.background_pixel = colour.GetPixel();

 
 

-    ChangeBackgroundColour();
+    XChangeWindowAttributes(wxGlobalDisplay(),
+        (Window) GetMainWindow(),
+        CWBackPixel,
+        & attrib);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -1885,40 +1369,9 @@ bool wxWindowX11::SetForegroundColour(const wxColour& col)
     if ( !wxWindowBase::SetForegroundColour(col) )
         return FALSE;
 
     if ( !wxWindowBase::SetForegroundColour(col) )
         return FALSE;
 

-    ChangeForegroundColour();
-

     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxWindowX11::ChangeFont(bool keepOriginalSize)
-{
-    // TODO
-#if 0
-    // Note that this causes the widget to be resized back
-    // to its original size! We therefore have to set the size
-    // back again. TODO: a better way in Motif?
-    Widget w = (Widget) GetLabelWidget(); // Usually the main widget
-    if (w && m_font.Ok())
-    {
-        int width, height, width1, height1;
-        GetSize(& width, & height);
-
-        // lesstif 0.87 hangs here
-#ifndef LESSTIF_VERSION
-        XtVaSetValues (w,
-            XmNfontList, (XmFontList) m_font.GetFontList(1.0, XtDisplay(w)),
-            NULL);
-#endif
-
-        GetSize(& width1, & height1);
-        if (keepOriginalSize && (width != width1 || height != height1))
-        {
-            SetSize(-1, -1, width, height);
-        }
-    }
-#endif
-}
-

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