return wxDefaultSize (as done in all other platforms) when the combo box is empty

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

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 1983d4bb41770e1c7d8d762832debed691c21b30..6cae3175d72ad30eb58bd3e2cdf935322565bfc5 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -9,6 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -17,28 +24,33 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "window.h"
+#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/hash.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/panel.h"
+    #include "wx/frame.h"
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/button.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+    #include "wx/timer.h"
+    #include "wx/settings.h"
+    #include "wx/msgdlg.h"
+    #include "wx/scrolbar.h"
+    #include "wx/listbox.h"
+    #include "wx/scrolwin.h"
+    #include "wx/layout.h"
+    #include "wx/menuitem.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/setup.h"
-#include "wx/menu.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/panel.h"
-#include "wx/layout.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/settings.h"
-#include "wx/msgdlg.h"
-#include "wx/frame.h"
-#include "wx/scrolwin.h"
-#include "wx/module.h"
-#include "wx/menuitem.h"
-#include "wx/log.h"
+#include "wx/fontutil.h"
+#include "wx/univ/renderer.h"

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


@@ -49,18 +61,12 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

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

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

-extern wxHashTable *wxWidgetHashTable;

 static wxWindow* g_captureWindow = NULL;
 static wxWindow* g_captureWindow = NULL;

+static GC g_eraseGC;

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -78,7 +84,6 @@ 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()
 
 // ============================================================================


@@ -95,115 +100,276 @@ END_EVENT_TABLE()
 
 void wxWindowX11::Init()
 {
 
 void wxWindowX11::Init()
 {

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

     // X11-specific
     // X11-specific

-    m_mainWidget = (WXWindow) 0;
-
-    m_winCaptured = FALSE;
-
-    m_isShown = TRUE;
-    m_isBeingDeleted = FALSE;
-    
+    m_mainWindow = (WXWindow) 0;
+    m_clientWindow = (WXWindow) 0;
+    m_insertIntoMain = false;
+    m_updateNcArea = false;
+
+    m_winCaptured = false;
+    m_needsInputFocus = false;
+    m_isShown = true;

     m_lastTS = 0;
     m_lastButton = 0;
 }
 
 // real construction (Init() must have been called before!)
 bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
     m_lastTS = 0;
     m_lastButton = 0;
 }
 
 // real construction (Init() must have been called before!)
 bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,

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

 {
 {

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

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

-    int w = size.GetWidth();
-    int h = size.GetHeight();
-    int x = size.GetX();
-    int y = size.GetY();
-    if (w == -1) w = 20;
-    if (h == -1) h = 20;
-    if (x == -1) x = 0;
-    if (y == -1) y = 0;
-

     Display *xdisplay = (Display*) wxGlobalDisplay();
     int xscreen = DefaultScreen( xdisplay );
     Display *xdisplay = (Display*) wxGlobalDisplay();
     int xscreen = DefaultScreen( xdisplay );

+    Visual *xvisual = DefaultVisual( xdisplay, xscreen );

     Colormap cm = DefaultColormap( xdisplay, xscreen );
 
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     Colormap cm = DefaultColormap( xdisplay, xscreen );
 
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

-    m_backgroundColour.CalcPixel( (WXColormap) cm ); 
-    m_hasBgCol = TRUE;
-    
+    m_backgroundColour.CalcPixel( (WXColormap) cm );
+

     m_foregroundColour = *wxBLACK;
     m_foregroundColour = *wxBLACK;

-    m_foregroundColour.CalcPixel( (WXColormap) cm ); 
-    
+    m_foregroundColour.CalcPixel( (WXColormap) cm );
+
+    Window xparent = (Window) parent->GetClientAreaWindow();
+
+    // Add window's own scrollbars to main window, not to client window
+    if (parent->GetInsertIntoMain())
+    {
+        // wxLogDebug( "Inserted into main: %s", GetName().c_str() );
+        xparent = (Window) parent->GetMainWindow();
+    }
+
+    // Size (not including the border) must be nonzero (or a Value error results)!
+    // Note: The Xlib manual doesn't mention this restriction of XCreateWindow.
+    wxSize size2(size);
+    if (size2.x <= 0)
+        size2.x = 20;
+    if (size2.y <= 0)
+        size2.y = 20;
+
+    wxPoint pos2(pos);
+    if (pos2.x == wxDefaultCoord)
+        pos2.x = 0;
+    if (pos2.y == wxDefaultCoord)
+        pos2.y = 0;
+
+    AdjustForParentClientOrigin(pos2.x, pos2.y);
+
+#if wxUSE_TWO_WINDOWS
+    bool need_two_windows =
+        ((( wxSUNKEN_BORDER | wxBORDER_THEME | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0);
+#else
+    bool need_two_windows = false;
+#endif
+
+#if wxUSE_NANOX
+    long xattributes = 0;
+#else
+    XSetWindowAttributes xattributes;
+    long xattributes_mask = 0;
+
+    xattributes_mask |= CWBackPixel;
+    xattributes.background_pixel = m_backgroundColour.GetPixel();
+
+    xattributes_mask |= CWBorderPixel;
+    xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
+
+    xattributes_mask |= CWEventMask;
+#endif
+
+    if (need_two_windows)
+    {
+#if wxUSE_NANOX
+        long backColor, foreColor;
+        backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
+        foreColor = GR_RGB(m_foregroundColour.Red(), m_foregroundColour.Green(), m_foregroundColour.Blue());
+
+        Window xwindow = XCreateWindowWithColor( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+                                    0, 0, InputOutput, xvisual, backColor, foreColor);
+        XSelectInput( xdisplay, xwindow,
+          GR_EVENT_MASK_CLOSE_REQ | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+          ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+          KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+                      PropertyChangeMask );
+
+#else
+        // Normal X11
+        xattributes.event_mask =
+            ExposureMask | StructureNotifyMask | ColormapChangeMask;
+
+        Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+            0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+
+#endif
+
+        XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
+
+        m_mainWindow = (WXWindow) xwindow;
+        wxAddWindowToTable( xwindow, (wxWindow*) this );
+
+        XMapWindow( xdisplay, xwindow );
+
+#if !wxUSE_NANOX
+        xattributes.event_mask =
+            ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+            ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+            KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+            PropertyChangeMask | VisibilityChangeMask ;
+
+        if (!HasFlag( wxFULL_REPAINT_ON_RESIZE ))
+        {
+            xattributes_mask |= CWBitGravity;
+            xattributes.bit_gravity = StaticGravity;
+        }
+#endif
+
+        if (HasFlag(wxSUNKEN_BORDER) || HasFlag(wxRAISED_BORDER) || HasFlag(wxBORDER_THEME))
+        {
+            pos2.x = 2;
+            pos2.y = 2;
+            size2.x -= 4;
+            size2.y -= 4;
+        }
+        else if (HasFlag( wxSIMPLE_BORDER ))
+        {
+            pos2.x = 1;
+            pos2.y = 1;
+            size2.x -= 2;
+            size2.y -= 2;
+        }
+        else
+        {
+            pos2.x = 0;
+            pos2.y = 0;
+        }
+
+        // Make again sure the size is nonzero.
+        if (size2.x <= 0)
+            size2.x = 1;
+        if (size2.y <= 0)
+            size2.y = 1;

 
 

-    Window parentWindow = (Window) parent->GetMainWindow();
+#if wxUSE_NANOX
+        backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
+        foreColor = GR_RGB(m_foregroundColour.Red(), m_foregroundColour.Green(), m_foregroundColour.Blue());

 
 

-    Window window = XCreateSimpleWindow( 
-        xdisplay, parentWindow,
-        x, y, w, h, 0, 
-        m_backgroundColour.GetPixel(),
-        m_backgroundColour.GetPixel() );
-        
-    m_mainWidget = (WXWindow) window;
+        xwindow = XCreateWindowWithColor( xdisplay, xwindow, pos2.x, pos2.y, size2.x, size2.y,
+                                    0, 0, InputOutput, xvisual, backColor, foreColor);
+        XSelectInput( xdisplay, xwindow,
+          GR_EVENT_MASK_CLOSE_REQ | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+          ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+          KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+                      PropertyChangeMask );

 
 

-    // Select event types wanted
-    XSelectInput(wxGlobalDisplay(), window,
-        ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
-        ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
-        KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
-        PropertyChangeMask);
+#else
+        xwindow = XCreateWindow( xdisplay, xwindow, pos2.x, pos2.y, size2.x, size2.y,
+            0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#endif
+
+        XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
+
+        m_clientWindow = (WXWindow) xwindow;
+        wxAddClientWindowToTable( xwindow, (wxWindow*) this );

 
 

-    wxAddWindowToTable(window, (wxWindow*) this);
+        XMapWindow( xdisplay, xwindow );
+    }
+    else
+    {
+        // wxLogDebug( "No two windows needed %s", GetName().c_str() );
+#if wxUSE_NANOX
+        long backColor, foreColor;
+        backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
+        foreColor = GR_RGB(m_foregroundColour.Red(), m_foregroundColour.Green(), m_foregroundColour.Blue());
+
+        Window xwindow = XCreateWindowWithColor( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+                                    0, 0, InputOutput, xvisual, backColor, foreColor);
+        XSelectInput( xdisplay, xwindow,
+          GR_EVENT_MASK_CLOSE_REQ | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+          ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+          KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+                      PropertyChangeMask );
+
+#else
+        xattributes.event_mask =
+            ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+            ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+            KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+            PropertyChangeMask | VisibilityChangeMask ;
+
+        if (!HasFlag( wxFULL_REPAINT_ON_RESIZE ))
+        {
+            xattributes_mask |= CWBitGravity;
+            xattributes.bit_gravity = NorthWestGravity;
+        }
+
+        Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+            0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#endif
+
+        XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
+
+        m_mainWindow = (WXWindow) xwindow;
+        m_clientWindow = m_mainWindow;
+        wxAddWindowToTable( xwindow, (wxWindow*) this );
+
+        XMapWindow( xdisplay, xwindow );
+    }

 
     // Is a subwindow, so map immediately
 
     // Is a subwindow, so map immediately

-    m_isShown = TRUE;
-    XMapWindow(wxGlobalDisplay(), window);
+    m_isShown = true;

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

-    SetSize(pos.x, pos.y, size.x, size.y);

 
 

-    return TRUE;
+    // Don't call this, it can have nasty repercussions for composite controls,
+    // for example
+    //    SetSize(pos.x, pos.y, size.x, size.y);
+
+    return true;

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

+    SendDestroyEvent();
+

     if (g_captureWindow == this)
     if (g_captureWindow == this)

-       g_captureWindow = NULL;
-    
-    m_isBeingDeleted = TRUE;
-    
-    // X11-specific actions first
-    Window main = (Window) m_mainWidget;
-    if ( main )
-    {
-        // Removes event handlers
-        //DetachWidget(main);
-    }
+        g_captureWindow = NULL;

 
 

-    if (m_parent)
-        m_parent->RemoveChild( this );
+    m_isBeingDeleted = true;

 
     DestroyChildren();
 
 
     DestroyChildren();
 

+    if (m_clientWindow != m_mainWindow)
+    {
+        // Destroy the cleint window
+        Window xwindow = (Window) m_clientWindow;
+        wxDeleteClientWindowFromTable( xwindow );
+        XDestroyWindow( wxGlobalDisplay(), xwindow );
+        m_clientWindow = NULL;
+    }
+

     // Destroy the window
     // Destroy the window

-    if (main)
+    if ( m_mainWindow )

     {
     {

-        XSelectInput( wxGlobalDisplay(), main, NoEventMask);
-        wxDeleteWindowFromTable( main );
-        XDestroyWindow( wxGlobalDisplay(), main );
-        m_mainWidget = NULL;
+        Window xwindow = (Window) m_mainWindow;
+        wxDeleteWindowFromTable( xwindow );
+        XDestroyWindow( wxGlobalDisplay(), xwindow );
+        m_mainWindow = NULL;

     }
 }
 
     }
 }
 


@@ -213,33 +379,51 @@ wxWindowX11::~wxWindowX11()
 
 void wxWindowX11::SetFocus()
 {
 
 void wxWindowX11::SetFocus()
 {

-    Window wMain = (Window) GetMainWindow();
-    if (wMain)
+    Window xwindow = (Window) m_clientWindow;
+
+    wxCHECK_RET( xwindow, wxT("invalid window") );
+
+    // Don't assert; we might be trying to set the focus for a panel
+    // with only static controls, so the panel returns false from AcceptsFocus.
+    // The app should be not be expected to deal with this.
+    if (!AcceptsFocus())
+        return;
+
+#if 0
+    if (GetName() == "scrollBar")

     {
     {

-        XSetInputFocus(wxGlobalDisplay(), wMain, RevertToParent, CurrentTime);
-        
-        XWMHints wmhints;
-        wmhints.flags = InputHint;
-        wmhints.input = True;
-        XSetWMHints(wxGlobalDisplay(), wMain, &wmhints);
+        char *crash = NULL;
+        *crash = 0;
+    }
+#endif
+
+    if (wxWindowIsVisible(xwindow))
+    {
+        wxLogTrace( _T("focus"), _T("wxWindowX11::SetFocus: %s"), GetClassInfo()->GetClassName());
+        //        XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
+        XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToNone, CurrentTime );
+        m_needsInputFocus = false;
+    }
+    else
+    {
+        m_needsInputFocus = true;

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

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

 {
 {

-    Window wFocus = (Window) 0;
+    Window xfocus = (Window) 0;

     int revert = 0;
 
     int revert = 0;
 

-    XGetInputFocus(wxGlobalDisplay(), & wFocus, & revert);
-    if (wFocus)
+    XGetInputFocus( wxGlobalDisplay(), &xfocus, &revert);
+    if (xfocus)

     {
     {

-        wxWindow *win = NULL;
-        do
+        wxWindow *win = wxGetWindowFromTable( xfocus );
+        if (!win)

         {
         {

-            win = wxGetWindowFromTable(wFocus);
-            wFocus = wxGetWindowParent(wFocus);
-        } while (wFocus && !win);
+            win = wxGetClientWindowFromTable( xfocus );
+        }

 
         return win;
     }
 
         return win;
     }


@@ -252,157 +436,121 @@ wxWindow *wxWindowBase::FindFocus()
 bool wxWindowX11::Enable(bool enable)
 {
     if ( !wxWindowBase::Enable(enable) )
 bool wxWindowX11::Enable(bool enable)
 {
     if ( !wxWindowBase::Enable(enable) )

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

 }
 
 bool wxWindowX11::Show(bool show)
 {
     wxWindowBase::Show(show);
 
 }
 
 bool wxWindowX11::Show(bool show)
 {
     wxWindowBase::Show(show);
 

-    Window xwin = (Window) GetXWindow();
-    Display *xdisp = (Display*) GetXDisplay();
+    Window xwindow = (Window) m_mainWindow;
+    Display *xdisp = wxGlobalDisplay();

     if (show)
     {
     if (show)
     {

-        wxString msg;
-       msg.Printf("Mapping window of type %s", GetClassInfo()->GetClassName());
-       wxLogDebug(msg);
-        XMapWindow(xdisp, xwin);
-       XSync(xdisp, False);
+        // wxLogDebug( "Mapping window of type %s", GetName().c_str() );
+        XMapWindow(xdisp, xwindow);

     }
     else
     {
     }
     else
     {

-        wxString msg;
-       msg.Printf("Unmapping window of type %s", GetClassInfo()->GetClassName());
-       wxLogDebug(msg);
-        XUnmapWindow(xdisp, xwin);
+        // wxLogDebug( "Unmapping window of type %s", GetName().c_str() );
+        XUnmapWindow(xdisp, xwindow);

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 // 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()
 {

-    if (m_mainWidget)
-        XRaiseWindow( wxGlobalDisplay(), (Window) m_mainWidget );
+    if (m_mainWindow)
+        XRaiseWindow( wxGlobalDisplay(), (Window) m_mainWindow );

 }
 
 // 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()
 {

-    if (m_mainWidget)
-        XLowerWindow( wxGlobalDisplay(), (Window) m_mainWidget );
+    if (m_mainWindow)
+        XLowerWindow( wxGlobalDisplay(), (Window) m_mainWindow );
+}
+
+void wxWindowX11::SetLabel(const wxString& WXUNUSED(label))
+{
+    // TODO
+}
+
+wxString wxWindowX11::GetLabel() const
+{
+    // TODO
+    return wxEmptyString;

 }
 
 void wxWindowX11::DoCaptureMouse()
 {
     if ((g_captureWindow != NULL) && (g_captureWindow != this))
     {
 }
 
 void wxWindowX11::DoCaptureMouse()
 {
     if ((g_captureWindow != NULL) && (g_captureWindow != this))
     {

-       wxASSERT_MSG(FALSE, "Trying to capture before mouse released.");
+        wxFAIL_MSG(wxT("Trying to capture before mouse released."));

 
 

-       // Core dump now
-       int *tmp = NULL;
-       (*tmp) = 1;
-       return;
+        // Core dump now
+        int *tmp = NULL;
+        (*tmp) = 1;
+        return;

     }
     }

-    
-    if ( m_winCaptured )
+
+    if (m_winCaptured)

         return;
 
         return;
 

+    Window xwindow = (Window) m_clientWindow;
+
+    wxCHECK_RET( xwindow, wxT("invalid window") );
+

     g_captureWindow = (wxWindow*) this;
 
     g_captureWindow = (wxWindow*) this;
 

-    if (GetMainWindow())
+    if (xwindow)

     {
     {

-        int res = XGrabPointer(wxGlobalDisplay(), (Window) GetMainWindow(),
+        int res = XGrabPointer(wxGlobalDisplay(), xwindow,

             FALSE,
             ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
             GrabModeAsync,
             FALSE,
             ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
             GrabModeAsync,

-               GrabModeAsync,
+            GrabModeAsync,

             None,
             None, /* cursor */ // TODO: This may need to be set to the cursor of this window
             None,
             None, /* cursor */ // TODO: This may need to be set to the cursor of this window

-            CurrentTime);
+            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");
+            wxString msg;
+            msg.Printf(wxT("Failed to grab pointer for window %s"), this->GetClassInfo()->GetClassName());
+            wxLogDebug(msg);
+            if (res == GrabNotViewable)
+                wxLogDebug( wxT("This is not a viewable window - perhaps not shown yet?") );

 
 

-#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);
+            g_captureWindow = NULL;

             return;
         }
             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)
-        {
-            wxLogDebug("Failed to grab keyboard.");
-            XUngrabPointer(wxGlobalDisplay(), CurrentTime);
-#if 0
-            XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
-                (Window) GetMainWindow());
-#endif
-            return;
-        }
-#endif
-       
-        m_winCaptured = TRUE;
+        m_winCaptured = true;

     }
 }
 
 void wxWindowX11::DoReleaseMouse()
 {
     g_captureWindow = NULL;
     }
 }
 
 void wxWindowX11::DoReleaseMouse()
 {
     g_captureWindow = NULL;

+

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

-    Window wMain = (Window)GetMainWindow();
+    Window xwindow = (Window) m_clientWindow;

 
 

-    if ( wMain )
+    if (xwindow)

     {
     {

-        XUngrabPointer(wxGlobalDisplay(), wMain);
-#if 0
-        XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
-                wMain);
-        XUngrabKeyboard(wxGlobalDisplay(), CurrentTime);
-#endif
+        XUngrabPointer( wxGlobalDisplay(), CurrentTime );

     }
     }

-    wxLogDebug("Ungrabbed pointer");

 
 

-    m_winCaptured = FALSE;
+    // wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() );
+
+    m_winCaptured = false;

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


@@ -410,10 +558,10 @@ bool wxWindowX11::SetFont(const wxFont& font)
     if ( !wxWindowBase::SetFont(font) )
     {
         // nothing to do
     if ( !wxWindowBase::SetFont(font) )
     {
         // nothing to do

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

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


@@ -421,197 +569,152 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor)
     if ( !wxWindowBase::SetCursor(cursor) )
     {
         // no change
     if ( !wxWindowBase::SetCursor(cursor) )
     {
         // no change

-        return FALSE;
+        return false;

     }
 
     }
 

-    wxCursor* cursor2 = NULL;
+    Window xwindow = (Window) m_clientWindow;
+
+    wxCHECK_MSG( xwindow, false, wxT("invalid window") );
+
+    wxCursor cursorToUse;

     if (m_cursor.Ok())
     if (m_cursor.Ok())

-        cursor2 = & m_cursor;
+        cursorToUse = m_cursor;

     else
     else

-        cursor2 = wxSTANDARD_CURSOR;
+        cursorToUse = *wxSTANDARD_CURSOR;

 
 

-    WXCursor x_cursor = cursor2->GetCursor();
+    Cursor xcursor = (Cursor) cursorToUse.GetCursor();

 
 

-    Window win = (Window) GetMainWindow();
-    XDefineCursor((Display*) wxGlobalDisplay(), win, (Cursor) x_cursor);
+    XDefineCursor( wxGlobalDisplay(), xwindow, xcursor );

 
 

-    return TRUE;
+    return true;

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

-    if (m_mainWidget)
-        XWarpPointer( wxGlobalDisplay(), None, (Window) m_mainWidget, 0, 0, 0, 0, x, y);
+    Window xwindow = (Window) m_clientWindow;
+
+    wxCHECK_RET( xwindow, wxT("invalid window") );
+
+    XWarpPointer( wxGlobalDisplay(), None, xwindow, 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)
-    {
-        // Use specified rectangle
-        x = rect->x; y = rect->y; w = rect->width; h = rect->height;
-    }
-    else
-    {
-        // Use whole client area
-        x = 0; y = 0;
-        GetClientSize(& w, & h);
-    }
-    
-    wxNode *cnode = m_children.First();
-    while (cnode)
+    // No scrolling requested.
+    if ((dx == 0) && (dy == 0)) return;
+
+    if (!m_updateRegion.IsEmpty())

     {
     {

-        wxWindow *child = (wxWindow*) cnode->Data();
-        int sx = 0;
-        int sy = 0;
-        child->GetSize( &sx, &sy );
-        wxPoint pos( child->GetPosition() );
-        child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );
-        cnode = cnode->Next();
+        m_updateRegion.Offset( dx, dy );
+
+        int cw = 0;
+        int ch = 0;
+        GetSize( &cw, &ch );  // GetClientSize() ??
+        m_updateRegion.Intersect( 0, 0, cw, ch );

     }
     }

-    
-    int x1 = (dx >= 0) ? x : x - dx;
-    int y1 = (dy >= 0) ? y : y - dy;
-    int w1 = w - abs(dx);
-    int h1 = h - abs(dy);
-    int x2 = (dx >= 0) ? x + dx : x;
-    int y2 = (dy >= 0) ? y + dy : y;
-    
-    wxClientDC dc((wxWindow*) this);
-    
-    dc.SetLogicalFunction (wxCOPY);
-    
-    Window window = (Window) GetMainWindow();
-    Display* display = wxGlobalDisplay();
-    
-    XCopyArea(display, window, window, (GC) dc.GetGC(),
-        x1, y1, w1, h1, x2, y2);
-    
-    dc.SetAutoSetting(TRUE);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBrush(brush); // FIXME: needed?
-    
-    // We'll add rectangles to the list of update rectangles according to which
-    // bits we've exposed.
-    wxList updateRects;
-    
-    if (dx > 0)
+
+    if (!m_clearRegion.IsEmpty())

     {
     {

-        wxRect *rect = new wxRect;
-        rect->x = x;
-        rect->y = y;
-        rect->width = dx;
-        rect->height = h;
-        
-        XFillRectangle(display, window,
-            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
-        
-        rect->x = rect->x;
-        rect->y = rect->y;
-        rect->width = rect->width;
-        rect->height = rect->height;
-        
-        updateRects.Append((wxObject*) rect);
+        m_clearRegion.Offset( dx, dy );
+
+        int cw = 0;
+        int ch = 0;
+        GetSize( &cw, &ch );  // GetClientSize() ??
+        m_clearRegion.Intersect( 0, 0, cw, ch );

     }
     }

-    else if (dx < 0)
+
+    Window xwindow = (Window) GetClientAreaWindow();
+
+    wxCHECK_RET( xwindow, wxT("invalid window") );
+
+    Display *xdisplay = wxGlobalDisplay();
+
+    GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
+    XSetGraphicsExposures( xdisplay, xgc, True );
+
+    int s_x = 0;
+    int s_y = 0;
+    int cw;
+    int ch;
+    if (rect)

     {
     {

-        wxRect *rect = new wxRect;
-        
-        rect->x = x + w + dx;
-        rect->y = y;
-        rect->width = -dx;
-        rect->height = h;
-        
-        XFillRectangle(display, window,
-            (GC) dc.GetGC(), rect->x, rect->y, rect->width,
-            rect->height);
-        
-        rect->x = rect->x;
-        rect->y = rect->y;
-        rect->width = rect->width;
-        rect->height = rect->height;
-        
-        updateRects.Append((wxObject*) rect);
+        s_x = rect->x;
+        s_y = rect->y;
+
+        cw = rect->width;
+        ch = rect->height;

     }
     }

-    if (dy > 0)
+    else

     {
     {

-        wxRect *rect = new wxRect;
-        
-        rect->x = x;
-        rect->y = y;
-        rect->width = w;
-        rect->height = dy;
-        
-        XFillRectangle(display, window,
-            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
-        
-        rect->x = rect->x;
-        rect->y = rect->y;
-        rect->width = rect->width;
-        rect->height = rect->height;
-        
-        updateRects.Append((wxObject*) rect);
+        s_x = 0;
+        s_y = 0;
+        GetClientSize( &cw, &ch );

     }
     }

-    else if (dy < 0)
+
+#if wxUSE_TWO_WINDOWS
+    wxPoint offset( 0,0 );
+#else
+    wxPoint offset = GetClientAreaOrigin();
+    s_x += offset.x;
+    s_y += offset.y;
+#endif
+
+    int w = cw - abs(dx);
+    int h = ch - abs(dy);
+
+    if ((h < 0) || (w < 0))

     {
     {

-        wxRect *rect = new wxRect;
-        
-        rect->x = x;
-        rect->y = y + h + dy;
-        rect->width = w;
-        rect->height = -dy;
-        
-        XFillRectangle(display, window,
-            (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
-        
-        rect->x = rect->x;
-        rect->y = rect->y;
-        rect->width = rect->width;
-        rect->height = rect->height;
-        
-        updateRects.Append((wxObject*) rect);
+        Refresh();

     }
     }

-    dc.SetBrush(wxNullBrush);
-    
-    // Now send expose events
-    
-    wxNode* node = updateRects.First();
-    while (node)
+    else

     {
     {

-        wxRect* rect = (wxRect*) node->Data();
-        XExposeEvent event;
-        
-        event.type = Expose;
-        event.display = display;
-        event.send_event = True;
-        event.window = window;
-        
-        event.x = rect->x;
-        event.y = rect->y;
-        event.width = rect->width;
-        event.height = rect->height;
-        
-        event.count = 0;
-        
-        XSendEvent(display, window, False, ExposureMask, (XEvent *)&event);
-        
-        node = node->Next();
-        
+        wxRect rect;
+        if (dx < 0) rect.x = cw+dx + offset.x; else rect.x = s_x;
+        if (dy < 0) rect.y = ch+dy + offset.y; else rect.y = s_y;
+        if (dy != 0) rect.width = cw; else rect.width = abs(dx);
+        if (dx != 0) rect.height = ch; else rect.height = abs(dy);
+
+        int d_x = s_x;
+        int d_y = s_y;
+
+        if (dx < 0) s_x += -dx;
+        if (dy < 0) s_y += -dy;
+        if (dx > 0) d_x += dx + offset.x;
+        if (dy > 0) d_y += dy + offset.y;
+
+        XCopyArea( xdisplay, xwindow, xwindow, xgc, s_x, s_y, w, h, d_x, d_y );
+
+        // wxLogDebug( "Copy: s_x %d s_y %d w %d h %d d_x %d d_y %d", s_x, s_y, w, h, d_x, d_y );
+
+        // wxLogDebug( "Update: %d %d %d %d", rect.x, rect.y, rect.width, rect.height );
+
+        m_updateRegion.Union( rect );
+        m_clearRegion.Union( rect );

     }
     }

-    
-    // Delete the update rects
-    node = updateRects.First();
-    while (node)
+
+    XFreeGC( xdisplay, xgc );
+
+    // Move Clients, but not the scrollbars
+    // FIXME: There may be a better method to move a lot of Windows within X11
+    wxScrollBar *sbH = ((wxWindow *) this)->GetScrollbar( wxHORIZONTAL );
+    wxScrollBar *sbV = ((wxWindow *) this)->GetScrollbar( wxVERTICAL );
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+    while ( node )

     {
     {

-        wxRect* rect = (wxRect*) node->Data();
-        delete rect;
-        node = node->Next();
+        // Only propagate to non-top-level windows
+        wxWindow *win = node->GetData();
+        if ( win->GetParent() && win != sbH && win != sbV )
+        {
+            wxPoint pos = win->GetPosition();
+            // Add the delta to the old Position
+            pos.x += dx;
+            pos.y += dy;
+            win->SetPosition(pos);
+        }
+        node = node->GetNext();

     }
     }

-#endif

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


@@ -652,41 +755,44 @@ void wxWindowX11::DoSetToolTip(wxToolTip * WXUNUSED(tooltip))
 
 bool wxWindowX11::PreResize()
 {
 
 bool wxWindowX11::PreResize()
 {

-    return TRUE;
+    return true;

 }
 
 // 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) m_mainWidget;
-    if (window)
+    Window xwindow = (Window) m_mainWindow;
+
+    wxCHECK_RET( xwindow, wxT("invalid window") );
+
+    //XSync(wxGlobalDisplay(), False);
+
+    XWindowAttributes attr;
+    Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
+    wxASSERT(status);
+
+    if (status)

     {
     {

-        XWindowAttributes attr;
-        Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
-        wxASSERT(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) m_mainWidget;
+    Window window = (Window) m_mainWindow;

     if (window)
     {
     if (window)
     {

+        //XSync(wxGlobalDisplay(), False);

         XWindowAttributes attr;
         Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
         wxASSERT(status);
         XWindowAttributes attr;
         Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
         wxASSERT(status);

-        
+

         if (status)
         {
             *x = attr.x;
             *y = attr.y;
         if (status)
         {
             *x = attr.x;
             *y = attr.y;

-            
+

             // We may be faking the client origin. So a window that's really at (0, 30)
             // may appear (to wxWin apps) to be at (0, 0).
             if (GetParent())
             // We may be faking the client origin. So a window that's really at (0, 30)
             // may appear (to wxWin apps) to be at (0, 0).
             if (GetParent())


@@ -703,38 +809,42 @@ 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) m_mainWidget;
+    Window thisWindow = (Window) m_clientWindow;

 
     Window childWindow;
 
     Window childWindow;

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

 }
 
 void wxWindowX11::DoClientToScreen(int *x, int *y) const
 {
     Display *display = wxGlobalDisplay();
     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));
 }
 
 void wxWindowX11::DoClientToScreen(int *x, int *y) const
 {
     Display *display = wxGlobalDisplay();
     Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));

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

 
     Window childWindow;
 
     Window childWindow;

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

 }
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 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) m_mainWidget;
+    Window window = (Window) m_mainWindow;

 
     if (window)
     {
         XWindowAttributes attr;
         Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr );
         wxASSERT(status);
 
     if (window)
     {
         XWindowAttributes attr;
         Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr );
         wxASSERT(status);

-        
+

         if (status)
         {
             *x = attr.width ;
         if (status)
         {
             *x = attr.width ;


@@ -745,91 +855,147 @@ void wxWindowX11::DoGetClientSize(int *x, int *y) const
 
 void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 
 void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {

-    if (!GetMainWindow())
-        return;
+    //    wxLogDebug("DoSetSize: %s (%ld) %d, %d %dx%d", GetClassInfo()->GetClassName(), GetId(), x, y, width, height);

 
 

-    XWindowChanges windowChanges;
-    int valueMask = 0;
+    Window xwindow = (Window) m_mainWindow;
+
+    wxCHECK_RET( xwindow, wxT("invalid window") );
+
+    XWindowAttributes attr;
+    Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
+    wxCHECK_RET( status, wxT("invalid window attributes") );
+
+    int new_x = attr.x;
+    int new_y = attr.y;
+    int new_w = attr.width;
+    int new_h = attr.height;

 
 

-    if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if (x != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

     {
     {

-       int yy = 0;
+        int yy = 0;

         AdjustForParentClientOrigin( x, yy, sizeFlags);
         AdjustForParentClientOrigin( x, yy, sizeFlags);

-        windowChanges.x = x;
-        valueMask |= CWX;
+        new_x = x;

     }
     }

-    if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if (y != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

     {
     {

-       int xx = 0;
+        int xx = 0;

         AdjustForParentClientOrigin( xx, y, sizeFlags);
         AdjustForParentClientOrigin( xx, y, sizeFlags);

-        windowChanges.y = y;
-        valueMask |= CWY;
+        new_y = y;

     }
     }

-    if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if (width != wxDefaultCoord)

     {
     {

-        windowChanges.width = width /* - m_borderSize*2 */;
-        valueMask |= CWWidth;
+        new_w = width;
+        if (new_w <= 0)
+            new_w = 20;

     }
     }

-    if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if (height != wxDefaultCoord)

     {
     {

-        windowChanges.height = height /* -m_borderSize*2*/;
-        valueMask |= CWHeight;
+        new_h = height;
+        if (new_h <= 0)
+            new_h = 20;

     }
 
     }
 

-    XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
-        valueMask, & windowChanges);
+    DoMoveWindow( new_x, new_y, new_w, new_h );

 }
 
 void wxWindowX11::DoSetClientSize(int width, int height)
 {
 }
 
 void wxWindowX11::DoSetClientSize(int width, int height)
 {

-    if (!GetMainWindow())
-        return;
+    //    wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height);

 
 

-    XWindowChanges windowChanges;
-    int valueMask = 0;
+    Window xwindow = (Window) m_mainWindow;

 
 

-    if (width != -1)
-    {
-        windowChanges.width = width ;
-        valueMask |= CWWidth;
-    }
-    if (height != -1)
+    wxCHECK_RET( xwindow, wxT("invalid window") );
+
+    XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
+
+    if (m_mainWindow != m_clientWindow)

     {
     {

-        windowChanges.height = height ;
-        valueMask |= CWHeight;
+        xwindow = (Window) m_clientWindow;
+
+        wxWindow *window = (wxWindow*) this;
+        wxRenderer *renderer = window->GetRenderer();
+        if (renderer)
+        {
+            wxRect border = renderer->GetBorderDimensions( (wxBorder)(m_windowStyle & wxBORDER_MASK) );
+            width -= border.x + border.width;
+            height -= border.y + border.height;
+        }
+
+        XResizeWindow( wxGlobalDisplay(), xwindow, width, height );

     }
     }

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

 }
 
 }
 

-// For implementation purposes - sometimes decorations make the client area
-// smaller
-wxPoint wxWindowX11::GetClientAreaOrigin() const
+void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)

 {
 {

-    return wxPoint(0, 0);
-}
+    Window xwindow = (Window) m_mainWindow;

 
 

-// Makes an adjustment to the window position (for example, a frame that has
-// a toolbar that it manages itself).
-void wxWindowX11::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
-{
-    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
+    wxCHECK_RET( xwindow, wxT("invalid window") );
+
+#if !wxUSE_NANOX
+
+    XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, width, height );
+    if (m_mainWindow != m_clientWindow)

     {
     {

-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        x += pt.x; y += pt.y;
+        xwindow = (Window) m_clientWindow;
+
+        wxWindow *window = (wxWindow*) this;
+        wxRenderer *renderer = window->GetRenderer();
+        if (renderer)
+        {
+            wxRect border = renderer->GetBorderDimensions( (wxBorder)(m_windowStyle & wxBORDER_MASK) );
+            x = border.x;
+            y = border.y;
+            width -= border.x + border.width;
+            height -= border.y + border.height;
+        }
+        else
+        {
+            x = 0;
+            y = 0;
+        }
+
+        wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL );
+        if (sb && sb->IsShown())
+        {
+            wxSize size = sb->GetSize();
+            height -= size.y;
+        }
+        sb = window->GetScrollbar( wxVERTICAL );
+        if (sb && sb->IsShown())
+        {
+            wxSize size = sb->GetSize();
+            width -= size.x;
+        }
+
+        XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, wxMax(1, width), wxMax(1, height) );

     }
     }

+
+#else
+
+    XWindowChanges windowChanges;
+    windowChanges.x = x;
+    windowChanges.y = y;
+    windowChanges.width = width;
+    windowChanges.height = height;
+    windowChanges.stack_mode = 0;
+    int valueMask = CWX | CWY | CWWidth | CWHeight;
+
+    XConfigureWindow( wxGlobalDisplay(), xwindow, valueMask, &windowChanges );
+
+#endif

 }
 
 }
 

-void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
+void wxWindowX11::DoSetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)

 {
     m_minWidth = minW;
     m_minHeight = minH;
     m_maxWidth = maxW;
     m_maxHeight = maxH;
 
 {
     m_minWidth = minW;
     m_minHeight = minH;
     m_maxWidth = maxW;
     m_maxHeight = maxH;
 

+#if !wxUSE_NANOX

     XSizeHints sizeHints;
     sizeHints.flags = 0;
     XSizeHints sizeHints;
     sizeHints.flags = 0;

-    
+

     if (minW > -1 && minH > -1)
     {
         sizeHints.flags |= PMinSize;
     if (minW > -1 && minH > -1)
     {
         sizeHints.flags |= PMinSize;


@@ -849,12 +1015,8 @@ void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW,
         sizeHints.height_inc = incH;
     }
 
         sizeHints.height_inc = incH;
     }
 

-    XSetWMNormalHints(wxGlobalDisplay(), (Window) GetMainWindow(), & sizeHints);
-}
-
-void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
-{
-    DoSetSize(x, y, width, height);
+    XSetWMNormalHints(wxGlobalDisplay(), (Window) m_mainWindow, &sizeHints );
+#endif

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


@@ -863,9 +1025,21 @@ void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
 
 int wxWindowX11::GetCharHeight() const
 {
 
 int wxWindowX11::GetCharHeight() const
 {

-    wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
-
-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
+    wxFont font(GetFont());
+    wxCHECK_MSG( font.Ok(), 0, wxT("valid window font needed") );
+
+#if wxUSE_UNICODE
+    // There should be an easier way.
+    PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() );
+    pango_layout_set_font_description( layout, font.GetNativeFontInfo()->description );
+    pango_layout_set_text(layout, "H", 1 );
+    int w,h;
+    pango_layout_get_pixel_size(layout, &w, &h);
+    g_object_unref( G_OBJECT( layout ) );
+
+    return h;
+#else
+    WXFontStructPtr pFontStruct = font.GetFontStruct(1.0, wxGlobalDisplay());

 
     int direction, ascent, descent;
     XCharStruct overall;
 
     int direction, ascent, descent;
     XCharStruct overall;


@@ -874,13 +1048,26 @@ int wxWindowX11::GetCharHeight() const
 
     //  return (overall.ascent + overall.descent);
     return (ascent + descent);
 
     //  return (overall.ascent + overall.descent);
     return (ascent + descent);

+#endif

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

-    wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
-
-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
+    wxFont font(GetFont());
+    wxCHECK_MSG( font.Ok(), 0, wxT("valid window font needed") );
+
+#if wxUSE_UNICODE
+    // There should be an easier way.
+    PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() );
+    pango_layout_set_font_description( layout, font.GetNativeFontInfo()->description );
+    pango_layout_set_text(layout, "H", 1 );
+    int w,h;
+    pango_layout_get_pixel_size(layout, &w, &h);
+    g_object_unref( G_OBJECT( layout ) );
+
+    return w;
+#else
+    WXFontStructPtr pFontStruct = font.GetFontStruct(1.0, wxGlobalDisplay());

 
     int direction, ascent, descent;
     XCharStruct overall;
 
     int direction, ascent, descent;
     XCharStruct overall;


@@ -888,32 +1075,59 @@ int wxWindowX11::GetCharWidth() const
         &descent, &overall);
 
     return overall.width;
         &descent, &overall);
 
     return overall.width;

+#endif

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

-                             int *x, int *y,
-                             int *descent, int *externalLeading,
-                             const wxFont *theFont) const
+                                int *x, int *y,
+                                int *descent, int *externalLeading,
+                                const wxFont *theFont) const

 {
 {

-    wxFont *fontToUse = (wxFont *)theFont;
-    if (!fontToUse)
-        fontToUse = (wxFont *) & m_font;
+    wxFont fontToUse = GetFont();
+    if (theFont) fontToUse = *theFont;
+
+    wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
+
+    if (string.empty())
+    {
+        if (x) (*x) = 0;
+        if (y) (*y) = 0;
+        return;
+    }
+
+#if wxUSE_UNICODE
+    PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() );
+
+    PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description;
+    pango_layout_set_font_description(layout, desc);
+
+    const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
+    pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
+
+    PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
+

 
 

-    wxCHECK_RET( fontToUse->Ok(), "valid window font needed" );
-    
-    WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay());
+    PangoRectangle rect;
+    pango_layout_line_get_extents(line, NULL, &rect);
+
+    if (x) (*x) = (wxCoord) (rect.width / PANGO_SCALE);
+    if (y) (*y) = (wxCoord) (rect.height / PANGO_SCALE);
+    if (descent)
+    {
+        // Do something about metrics here
+        (*descent) = 0;
+    }
+    if (externalLeading) (*externalLeading) = 0;  // ??
+
+    g_object_unref( G_OBJECT( layout ) );
+#else
+    WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, wxGlobalDisplay());

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

-    int slen = string.Len();
+    int slen = string.length();

 
 

-#if 0
-    if (use16)
-        XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction,
-        &ascent, &descent2, &overall);
-#endif
-
-    XTextExtents((XFontStruct*) pFontStruct, string, slen,
+    XTextExtents((XFontStruct*) pFontStruct, (const char*) string.c_str(), slen,

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


@@ -924,7 +1138,7 @@ void wxWindowX11::GetTextExtent(const wxString& string,
         *descent = descent2;
     if (externalLeading)
         *externalLeading = 0;
         *descent = descent2;
     if (externalLeading)
         *externalLeading = 0;

-
+#endif

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


@@ -944,7 +1158,7 @@ void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect)
         {
             int height,width;
             GetSize( &width, &height );
         {
             int height,width;
             GetSize( &width, &height );

-            
+

             // Schedule for later Updating in ::Update() or ::OnInternalIdle().
             m_clearRegion.Clear();
             m_clearRegion.Union( 0, 0, width, height );
             // Schedule for later Updating in ::Update() or ::OnInternalIdle().
             m_clearRegion.Clear();
             m_clearRegion.Union( 0, 0, width, height );


@@ -958,68 +1172,116 @@ void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect)
     }
     else
     {
     }
     else
     {

-       int height,width;
-       GetSize( &width, &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 );
     }
         // Schedule for later Updating in ::Update() or ::OnInternalIdle().
         m_updateRegion.Clear();
         m_updateRegion.Union( 0, 0, width, height );
     }

-    
-    // Actually don't schedule yet..
-    Update();

 }
 
 void wxWindowX11::Update()
 {
 }
 
 void wxWindowX11::Update()
 {

+    if (m_updateNcArea)
+    {
+        // wxLogDebug("wxWindowX11::UpdateNC: %s", GetClassInfo()->GetClassName());
+        // Send nc paint events.
+        SendNcPaintEvents();
+    }
+

     if (!m_updateRegion.IsEmpty())
     {
     if (!m_updateRegion.IsEmpty())
     {

-        X11SendPaintEvents();
+        // wxLogDebug("wxWindowX11::Update: %s", GetClassInfo()->GetClassName());
+        // Actually send erase events.
+        SendEraseEvents();
+
+        // Actually send paint events.
+        SendPaintEvents();

     }
 }
 
     }
 }
 

-void wxWindowX11::Clear()
+void wxWindowX11::SendEraseEvents()

 {
 {

-    wxClientDC dc((wxWindow*) this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
+    if (m_clearRegion.IsEmpty()) return;
+
+    wxClientDC dc( (wxWindow*)this );
+    dc.SetDeviceClippingRegion( m_clearRegion );
+
+    wxEraseEvent erase_event( GetId(), &dc );
+    erase_event.SetEventObject( this );
+
+    if (!HandleWindowEvent(erase_event) )
+    {
+        Display *xdisplay = wxGlobalDisplay();
+        Window xwindow = (Window) GetClientAreaWindow();
+        XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() );
+
+        wxRegionIterator upd( m_clearRegion );
+        while (upd)
+        {
+            XFillRectangle( xdisplay, xwindow, g_eraseGC,
+                            upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
+            upd ++;
+        }
+    }
+
+    m_clearRegion.Clear();

 }
 
 }
 

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

 {
 {

-    m_clipPaintRegion = TRUE;
+    //    wxLogDebug("SendPaintEvents: %s (%ld)", GetClassInfo()->GetClassName(), GetId());
+
+    m_clipPaintRegion = true;
+
+    wxPaintEvent paint_event( GetId() );
+    paint_event.SetEventObject( this );
+    HandleWindowEvent( paint_event );
+
+    m_updateRegion.Clear();

 
 

-    //    if (!m_clearRegion.IsEmpty())
+    m_clipPaintRegion = false;
+}
+
+void wxWindowX11::SendNcPaintEvents()
+{
+    wxWindow *window = (wxWindow*) this;
+
+    // All this for drawing the small square between the scrollbars.
+    int width = 0;
+    int height = 0;
+    int x = 0;
+    int y = 0;
+    wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL );
+    if (sb && sb->IsShown())

     {
     {

-        wxWindowDC dc( (wxWindow*)this );
-        dc.SetClippingRegion( m_clearRegion );
-        
-        wxEraseEvent erase_event( GetId(), &dc );
-        erase_event.SetEventObject( this );
-    
-        if (!GetEventHandler()->ProcessEvent(erase_event))
+        height = sb->GetSize().y;
+        y = sb->GetPosition().y;
+
+        sb = window->GetScrollbar( wxVERTICAL );
+        if (sb && sb->IsShown())

         {
         {

-            wxRegionIterator upd( m_clearRegion );
-            while (upd)
-            {
-                XClearArea( wxGlobalDisplay(), (Window) m_mainWidget, 
-                            upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight(), False );
-                upd ++;
-            }
+            width = sb->GetSize().x;
+            x = sb->GetPosition().x;
+
+            Display *xdisplay = wxGlobalDisplay();
+            Window xwindow = (Window) GetMainWindow();
+            Colormap cm = (Colormap) wxTheApp->GetMainColormap( wxGetDisplay() );
+            wxColour colour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
+            colour.CalcPixel( (WXColormap) cm );
+
+            XSetForeground( xdisplay, g_eraseGC, colour.GetPixel() );
+
+            XFillRectangle( xdisplay, xwindow, g_eraseGC, x, y, width, height );

         }
         }

-        m_clearRegion.Clear();

     }
 
     wxNcPaintEvent nc_paint_event( GetId() );
     nc_paint_event.SetEventObject( this );
     }
 
     wxNcPaintEvent nc_paint_event( GetId() );
     nc_paint_event.SetEventObject( this );

-    GetEventHandler()->ProcessEvent( nc_paint_event );
-
-    wxPaintEvent paint_event( GetId() );
-    paint_event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( paint_event );
+    HandleWindowEvent( nc_paint_event );

 
 

-    m_clipPaintRegion = FALSE;
+    m_updateNcArea = false;

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


@@ -1029,7 +1291,7 @@ void wxWindowX11::X11SendPaintEvents()
 // Responds to colour changes: passes event on to children.
 void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // Responds to colour changes: passes event on to children.
 void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

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

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


@@ -1037,85 +1299,134 @@ void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event)
         if ( win->GetParent() )
         {
             wxSysColourChangedEvent event2;
         if ( win->GetParent() )
         {
             wxSysColourChangedEvent event2;

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

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

-void wxWindowX11::OnIdle(wxIdleEvent& WXUNUSED(event))
+// See handler for InFocus case in app.cpp for details.
+wxWindow* g_GettingFocus = NULL;
+
+void wxWindowX11::OnInternalIdle()

 {
 {

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

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

-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate((wxWindow*) this) && IsShownOnScreen())
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+
+    // Set the input focus if couldn't do it before
+    if (m_needsInputFocus)
+    {
+#if 0
+        wxString msg;
+        msg.Printf("Setting focus for %s from OnInternalIdle\n", GetClassInfo()->GetClassName());
+        printf(msg.c_str());
+#endif
+        SetFocus();
+
+        // If it couldn't set the focus now, there's
+        // no point in trying again.
+        m_needsInputFocus = false;
+    }
+    g_GettingFocus = NULL;

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

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

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-bool wxAddWindowToTable(Window w, wxWindow *win)
+static bool DoAddWindowToTable(wxWindowHash *hash, Window w, wxWindow *win)

 {
 {

-    wxWindow *oldItem = NULL;
-    if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
+    if ( !hash->insert(wxWindowHash::value_type(w, win)).second )

     {
     {

-        wxLogDebug("Widget table clash: new widget is %ld, %s",
-                   (long)w, win->GetClassInfo()->GetClassName());
-        return FALSE;
+        wxLogDebug( wxT("Widget table clash: new widget is 0x%08x, %s"),
+                    (unsigned int)w, win->GetClassInfo()->GetClassName());
+        return false;

     }
 
     }
 

-    wxWidgetHashTable->Put((long) w, win);
-
-    wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)",
-               w, win, win->GetClassInfo()->GetClassName());
+    wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"),
+                (unsigned int) w, win, win->GetClassInfo()->GetClassName());

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

-wxWindow *wxGetWindowFromTable(Window w)
+static inline wxWindow *DoGetWindowFromTable(wxWindowHash *hash, Window w)

 {
 {

-    return (wxWindow *)wxWidgetHashTable->Get((long) w);
+    wxWindowHash::iterator i = hash->find(w);
+    return i == hash->end() ? NULL : i->second;

 }
 
 }
 

-void wxDeleteWindowFromTable(Window w)
+static inline void DoDeleteWindowFromTable(wxWindowHash *hash, Window w)

 {
 {

-    wxWidgetHashTable->Delete((long)w);
+    wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x deleted"), (unsigned int) w);
+
+    hash->erase(w);

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

-// add/remove window from the table
+// public wrappers

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// ----------------------------------------------------------------------------
-// X11-specific accessors
-// ----------------------------------------------------------------------------
+bool wxAddWindowToTable(Window w, wxWindow *win)
+{
+    return DoAddWindowToTable(wxWidgetHashTable, w, win);
+}
+
+wxWindow *wxGetWindowFromTable(Window w)
+{
+    return DoGetWindowFromTable(wxWidgetHashTable, w);
+}
+
+void wxDeleteWindowFromTable(Window w)
+{
+    DoDeleteWindowFromTable(wxWidgetHashTable, w);
+}
+
+bool wxAddClientWindowToTable(Window w, wxWindow *win)
+{
+    return DoAddWindowToTable(wxClientWidgetHashTable, w, win);
+}

 
 

-// Get the underlying X window
-WXWindow wxWindowX11::GetXWindow() const
+wxWindow *wxGetClientWindowFromTable(Window w)

 {
 {

-    return GetMainWindow();
+    return DoGetWindowFromTable(wxClientWidgetHashTable, w);

 }
 
 }
 

-// Get the underlying X display
-WXDisplay *wxWindowX11::GetXDisplay() const
+void wxDeleteClientWindowFromTable(Window w)

 {
 {

-    return wxGetDisplay();
+    DoDeleteWindowFromTable(wxClientWidgetHashTable, w);

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// X11-specific accessors
+// ----------------------------------------------------------------------------
+

 WXWindow wxWindowX11::GetMainWindow() const
 {
 WXWindow wxWindowX11::GetMainWindow() const
 {

-    return m_mainWidget;
+    return m_mainWindow;
+}
+
+WXWindow wxWindowX11::GetClientAreaWindow() const
+{
+    return m_clientWindow;

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

-bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, XEvent *xevent)
+bool wxTranslateMouseEvent(wxMouseEvent& wxevent,
+                           wxWindow *win,
+                           Window WXUNUSED(window),
+                           XEvent *xevent)

 {
 {

-    switch (xevent->xany.type)
+    switch (XEventGetType(xevent))

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


@@ -1125,43 +1436,59 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window,
         {
             wxEventType eventType = wxEVT_NULL;
 
         {
             wxEventType eventType = wxEVT_NULL;
 

-            if (xevent->xany.type == EnterNotify)
+            if (XEventGetType(xevent) == EnterNotify)

             {
                 //if (local_event.xcrossing.mode!=NotifyNormal)
                 //  return ; // Ignore grab events
                 eventType = wxEVT_ENTER_WINDOW;
                 //            canvas->GetEventHandler()->OnSetFocus();
             }
             {
                 //if (local_event.xcrossing.mode!=NotifyNormal)
                 //  return ; // Ignore grab events
                 eventType = wxEVT_ENTER_WINDOW;
                 //            canvas->GetEventHandler()->OnSetFocus();
             }

-            else if (xevent->xany.type == LeaveNotify)
+            else if (XEventGetType(xevent) == LeaveNotify)

             {
                 //if (local_event.xcrossingr.mode!=NotifyNormal)
                 //  return ; // Ignore grab events
                 eventType = wxEVT_LEAVE_WINDOW;
                 //            canvas->GetEventHandler()->OnKillFocus();
             }
             {
                 //if (local_event.xcrossingr.mode!=NotifyNormal)
                 //  return ; // Ignore grab events
                 eventType = wxEVT_LEAVE_WINDOW;
                 //            canvas->GetEventHandler()->OnKillFocus();
             }

-            else if (xevent->xany.type == MotionNotify)
+            else if (XEventGetType(xevent) == MotionNotify)

             {
                 eventType = wxEVT_MOTION;
             }
             {
                 eventType = wxEVT_MOTION;
             }

-            else if (xevent->xany.type == ButtonPress)
+            else if (XEventGetType(xevent) == ButtonPress)

             {
             {

-                wxevent.SetTimestamp(xevent->xbutton.time);
+                wxevent.SetTimestamp(XButtonEventGetTime(xevent));

                 int button = 0;
                 int button = 0;

-                if (xevent->xbutton.button == Button1)
+                if (XButtonEventLChanged(xevent))

                 {
                     eventType = wxEVT_LEFT_DOWN;
                     button = 1;
                 }
                 {
                     eventType = wxEVT_LEFT_DOWN;
                     button = 1;
                 }

-                else if (xevent->xbutton.button == Button2)
+                else if (XButtonEventMChanged(xevent))

                 {
                     eventType = wxEVT_MIDDLE_DOWN;
                     button = 2;
                 }
                 {
                     eventType = wxEVT_MIDDLE_DOWN;
                     button = 2;
                 }

-                else if (xevent->xbutton.button == Button3)
+                else if (XButtonEventRChanged(xevent))

                 {
                     eventType = wxEVT_RIGHT_DOWN;
                     button = 3;
                 }
                 {
                     eventType = wxEVT_RIGHT_DOWN;
                     button = 3;
                 }

+                else if ( xevent->xbutton.button == Button4 ||
+                            xevent->xbutton.button == Button5 )
+                {
+                    // this is the same value as used under wxMSW
+                    static const int WHEEL_DELTA = 120;
+
+                    eventType = wxEVT_MOUSEWHEEL;
+                    button = xevent->xbutton.button;
+
+                    wxevent.m_linesPerAction = 3;
+                    wxevent.m_wheelDelta = WHEEL_DELTA;
+
+                    // Button 4 means mousewheel up, 5 means down
+                    wxevent.m_wheelRotation = button == Button4 ? WHEEL_DELTA
+                                                                : -WHEEL_DELTA;
+                }

 
                 // check for a double click
                 // TODO: where can we get this value from?
 
                 // check for a double click
                 // TODO: where can we get this value from?


@@ -1188,59 +1515,59 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window,
                     win->SetLastClick(button, ts);
                 }
             }
                     win->SetLastClick(button, ts);
                 }
             }

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

             {
             {

-                if (xevent->xbutton.button == Button1)
+                if (XButtonEventLChanged(xevent))

                 {
                     eventType = wxEVT_LEFT_UP;
                 }
                 {
                     eventType = wxEVT_LEFT_UP;
                 }

-                else if (xevent->xbutton.button == Button2)
+                else if (XButtonEventMChanged(xevent))

                 {
                     eventType = wxEVT_MIDDLE_UP;
                 }
                 {
                     eventType = wxEVT_MIDDLE_UP;
                 }

-                else if (xevent->xbutton.button == Button3)
+                else if (XButtonEventRChanged(xevent))

                 {
                     eventType = wxEVT_RIGHT_UP;
                 }
                 {
                     eventType = wxEVT_RIGHT_UP;
                 }

-                else return FALSE;
+                else return false;

             }
             else
             {
             }
             else
             {

-                return FALSE;
+                return false;

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

-            wxevent.m_x = xevent->xbutton.x;
-            wxevent.m_y = xevent->xbutton.y;
+            wxevent.m_x = XButtonEventGetX(xevent);
+            wxevent.m_y = XButtonEventGetY(xevent);

 
             wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
 
             wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)

-                || (event_left_is_down (xevent)
+                || (XButtonEventLIsDown(xevent)

                 && (eventType != wxEVT_LEFT_UP)));
             wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)
                 && (eventType != wxEVT_LEFT_UP)));
             wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)

-                || (event_middle_is_down (xevent)
+                || (XButtonEventMIsDown(xevent)

                 && (eventType != wxEVT_MIDDLE_UP)));
             wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)
                 && (eventType != wxEVT_MIDDLE_UP)));
             wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)

-                || (event_right_is_down (xevent)
+                || (XButtonEventRIsDown (xevent)

                 && (eventType != wxEVT_RIGHT_UP)));
 
                 && (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 = XButtonEventShiftIsDown(xevent);
+            wxevent.m_controlDown = XButtonEventCtrlIsDown(xevent);
+            wxevent.m_altDown = XButtonEventAltIsDown(xevent);
+            wxevent.m_metaDown = XButtonEventMetaIsDown(xevent);

 
             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, Window WXUNUSED(win), XEvent *xevent)
+bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent, bool isAscii)

 {
 {

-    switch (xevent->xany.type)
+    switch (XEventGetType(xevent))

     {
     case KeyPress:
     case KeyRelease:
     {
     case KeyPress:
     case KeyRelease:


@@ -1250,132 +1577,61 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win
             KeySym keySym;
             (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
             int id = wxCharCodeXToWX (keySym);
             KeySym keySym;
             (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
             int id = wxCharCodeXToWX (keySym);

+            // id may be WXK_xxx code - these are outside ASCII range, so we
+            // can't just use toupper() on id.
+            // Only change this if we want the raw key that was pressed,
+            // and don't change it if we want an ASCII value.
+            if (!isAscii && (id >= 'a' && id <= 'z'))
+            {
+                id = id + 'A' - 'a';
+            }

 
 

-            if (xevent->xkey.state & ShiftMask)
-                wxevent.m_shiftDown = TRUE;
-            if (xevent->xkey.state & ControlMask)
-                wxevent.m_controlDown = TRUE;
-            if (xevent->xkey.state & Mod3Mask)
-                wxevent.m_altDown = TRUE;
-            if (xevent->xkey.state & Mod1Mask)
-                wxevent.m_metaDown = TRUE;
+            wxevent.m_shiftDown = XKeyEventShiftIsDown(xevent);
+            wxevent.m_controlDown = XKeyEventCtrlIsDown(xevent);
+            wxevent.m_altDown = XKeyEventAltIsDown(xevent);
+            wxevent.m_metaDown = XKeyEventMetaIsDown(xevent);

             wxevent.SetEventObject(win);
             wxevent.m_keyCode = id;
             wxevent.SetEventObject(win);
             wxevent.m_keyCode = id;

-            wxevent.SetTimestamp(xevent->xkey.time);
+            wxevent.SetTimestamp(XKeyEventGetTime(xevent));

 
 

-            wxevent.m_x = xevent->xbutton.x;
-            wxevent.m_y = xevent->xbutton.y;
+            wxevent.m_x = XKeyEventGetX(xevent);
+            wxevent.m_y = XKeyEventGetY(xevent);

 
 

-            if (id > -1)
-                return TRUE;
-            else
-                return FALSE;
-            break;
+            return id > -1;

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

-    return FALSE;
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 // Colour stuff
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // Colour stuff
 // ----------------------------------------------------------------------------
 

-#if 0
-
-#define YAllocColor XAllocColor
-XColor g_itemColors[5];
-int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
-{
-    int result;
-    static XmColorProc colorProc;
-
-    result = wxNO_COLORS;
-
-    if (back)
-    {
-        g_itemColors[0].red = (((long) back->Red ()) << 8);
-        g_itemColors[0].green = (((long) back->Green ()) << 8);
-        g_itemColors[0].blue = (((long) back->Blue ()) << 8);
-        g_itemColors[0].flags = DoRed | DoGreen | DoBlue;
-        if (colorProc == (XmColorProc) NULL)
-        {
-            // Get a ptr to the actual function
-            colorProc = XmSetColorCalculation ((XmColorProc) NULL);
-            // And set it back to motif.
-            XmSetColorCalculation (colorProc);
-        }
-        (*colorProc) (&g_itemColors[wxBACK_INDEX],
-            &g_itemColors[wxFORE_INDEX],
-            &g_itemColors[wxSELE_INDEX],
-            &g_itemColors[wxTOPS_INDEX],
-            &g_itemColors[wxBOTS_INDEX]);
-        result = wxBACK_COLORS;
-    }
-    if (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].flags = DoRed | DoGreen | DoBlue;
-        if (result == wxNO_COLORS)
-            result = wxFORE_COLORS;
-    }
-
-    Display *dpy = display;
-    Colormap cmap = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dpy);
-
-    if (back)
-    {
-        /* 5 Colours to allocate */
-        for (int i = 0; i < 5; i++)
-            if (!YAllocColor (dpy, cmap, &g_itemColors[i]))
-                result = wxNO_COLORS;
-    }
-    else if (fore)
-    {
-        /* Only 1 colour to allocate */
-        if (!YAllocColor (dpy, cmap, &g_itemColors[wxFORE_INDEX]))
-            result = wxNO_COLORS;
-    }
-
-    return (result);
-
-}
-#endif
-

 bool wxWindowX11::SetBackgroundColour(const wxColour& col)
 {
     wxWindowBase::SetBackgroundColour(col);
 
 bool wxWindowX11::SetBackgroundColour(const wxColour& col)
 {
     wxWindowBase::SetBackgroundColour(col);
 

-    if (!GetMainWindow())
-        return FALSE;
-

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

-    wxColour colour( col );
-    colour.CalcPixel( (WXColormap) cm );
-    
-    XSetWindowAttributes attrib;
-    attrib.background_pixel = colour.GetPixel();
+    m_backgroundColour.CalcPixel( (WXColormap) cm );

 
 

-    XChangeWindowAttributes(wxGlobalDisplay(),
-        (Window) GetMainWindow(),
-        CWBackPixel,
-        & attrib);
+    // We don't set the background colour as we paint
+    // the background ourselves.
+    // XSetWindowBackground( xdisplay, (Window) m_clientWindow, m_backgroundColour.GetPixel() );

 
 

-    return TRUE;
+    return true;

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

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

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


@@ -1385,7 +1641,7 @@ bool wxWindowX11::SetForegroundColour(const wxColour& col)
 wxWindow *wxGetActiveWindow()
 {
     // TODO
 wxWindow *wxGetActiveWindow()
 {
     // TODO

-    wxFAIL_MSG("Not implemented");
+    wxFAIL_MSG(wxT("Not implemented"));

     return NULL;
 }
 
     return NULL;
 }
 


@@ -1400,24 +1656,61 @@ 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.
-wxPoint wxGetMousePosition()
+void wxGetMouseState(int& rootX, int& rootY, unsigned& maskReturn)

 {
 {

+#if wxUSE_NANOX
+    /* TODO */
+    rootX = rootY = 0;
+    maskReturn = 0;
+#else

     Display *display = wxGlobalDisplay();
     Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
     Window rootReturn, childReturn;
     Display *display = wxGlobalDisplay();
     Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
     Window rootReturn, childReturn;

-    int rootX, rootY, winX, winY;
-    unsigned int maskReturn;
+    int winX, winY;

 
     XQueryPointer (display,
 
     XQueryPointer (display,

-                  rootWindow,
-                  &rootReturn,
+                   rootWindow,
+                   &rootReturn,

                    &childReturn,
                    &rootX, &rootY, &winX, &winY, &maskReturn);
                    &childReturn,
                    &rootX, &rootY, &winX, &winY, &maskReturn);

-    return wxPoint(rootX, rootY);
+#endif
+}
+
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
+{
+    int x, y;
+    unsigned mask;
+
+    wxGetMouseState(x, y, mask);
+    return wxPoint(x, y);
+}
+
+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+    int x, y;
+    unsigned mask;
+
+    wxGetMouseState(x, y, mask);
+
+    ms.SetX(x);
+    ms.SetY(y);
+
+    ms.SetLeftDown(mask & Button1Mask);
+    ms.SetMiddleDown(mask & Button2Mask);
+    ms.SetRightDown(mask & Button3Mask);
+
+    ms.SetControlDown(mask & ControlMask);
+    ms.SetShiftDown(mask & ShiftMask);
+    ms.SetAltDown(mask & Mod3Mask);
+    ms.SetMetaDown(mask & Mod1Mask);
+
+    return ms;

 }
 
 
 }
 
 


@@ -1427,3 +1720,42 @@ wxPoint wxGetMousePosition()
 
 int wxNoOptimize::ms_count = 0;
 
 
 int wxNoOptimize::ms_count = 0;
 

+
+// ----------------------------------------------------------------------------
+// wxDCModule
+// ----------------------------------------------------------------------------
+
+class wxWinModule : public wxModule
+{
+public:
+    wxWinModule()
+    {
+        // we must be cleaned up before the display is closed
+        AddDependency(wxClassInfo::FindClass(_T("wxX11DisplayModule")));
+    }
+
+    virtual bool OnInit();
+    virtual void OnExit();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxWinModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule)
+
+bool wxWinModule::OnInit()
+{
+    Display *xdisplay = wxGlobalDisplay();
+    int xscreen = DefaultScreen( xdisplay );
+    Window xroot = RootWindow( xdisplay, xscreen );
+    g_eraseGC = XCreateGC( xdisplay, xroot, 0, NULL );
+    XSetFillStyle( xdisplay, g_eraseGC, FillSolid );
+
+    return true;
+}
+
+void wxWinModule::OnExit()
+{
+    Display *xdisplay = wxGlobalDisplay();
+    XFreeGC( xdisplay, g_eraseGC );
+}