X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..7b28e0ede49ca78e05df6bc6af2d2d8c508f8455:/src/x11/window.cpp diff --git a/src/x11/window.cpp b/src/x11/window.cpp index 8ee15a5f5d..f84025ee9b 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "window.h" #endif @@ -42,6 +42,7 @@ #include "wx/log.h" #include "wx/fontutil.h" #include "wx/univ/renderer.h" +#include "wx/hash.h" #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" @@ -98,19 +99,15 @@ END_EVENT_TABLE() void wxWindowX11::Init() { - // generic initializations first - InitBase(); - // X11-specific m_mainWindow = (WXWindow) 0; m_clientWindow = (WXWindow) 0; m_insertIntoMain = FALSE; m_updateNcArea = FALSE; - + m_winCaptured = FALSE; m_needsInputFocus = FALSE; m_isShown = TRUE; - m_isBeingDeleted = FALSE; m_lastTS = 0; m_lastButton = 0; } @@ -122,7 +119,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, 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") ); CreateBase(parent, id, pos, size, style, wxDefaultValidator, name); @@ -134,20 +131,20 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, Colormap cm = DefaultColormap( xdisplay, xscreen ); m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - m_backgroundColour.CalcPixel( (WXColormap) cm ); - + m_backgroundColour.CalcPixel( (WXColormap) cm ); + 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); @@ -161,7 +158,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, pos2.x = 0; if (pos2.y == -1) pos2.y = 0; - + #if wxUSE_TWO_WINDOWS bool need_two_windows = ((( wxSUNKEN_BORDER | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0); @@ -174,76 +171,76 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, #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, + + 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 = + xattributes.event_mask = ExposureMask | StructureNotifyMask | ColormapChangeMask; - Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, + 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 = +#if !wxUSE_NANOX + xattributes.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | PropertyChangeMask | VisibilityChangeMask ; - if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE )) + if (!HasFlag( wxFULL_REPAINT_ON_RESIZE )) { xattributes_mask |= CWBitGravity; xattributes.bit_gravity = StaticGravity; } #endif - + if (HasFlag( wxSUNKEN_BORDER) || HasFlag( wxRAISED_BORDER)) { 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; @@ -256,28 +253,28 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, if (size2.y <= 0) size2.y = 1; -#if wxUSE_NANOX +#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()); - - xwindow = XCreateWindowWithColor( xdisplay, xwindow, pos2.x, pos2.y, size2.x, size2.y, + + 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 ); - + #else - xwindow = XCreateWindow( xdisplay, xwindow, pos2.x, pos2.y, size2.x, size2.y, + 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 ); - + XMapWindow( xdisplay, xwindow ); } else @@ -287,38 +284,38 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, 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, + + 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 = + xattributes.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | PropertyChangeMask | VisibilityChangeMask ; - if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE )) + 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, + + 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 ); } @@ -340,13 +337,12 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, // Destructor wxWindowX11::~wxWindowX11() { + SendDestroyEvent(); + if (g_captureWindow == this) g_captureWindow = NULL; - + m_isBeingDeleted = TRUE; - - if (m_parent) - m_parent->RemoveChild( this ); DestroyChildren(); @@ -358,7 +354,7 @@ wxWindowX11::~wxWindowX11() XDestroyWindow( wxGlobalDisplay(), xwindow ); m_clientWindow = NULL; } - + // Destroy the window Window xwindow = (Window) m_mainWindow; wxDeleteWindowFromTable( xwindow ); @@ -373,11 +369,11 @@ wxWindowX11::~wxWindowX11() void wxWindowX11::SetFocus() { Window xwindow = (Window) m_clientWindow; - + wxCHECK_RET( xwindow, wxT("invalid window") ); - + wxCHECK_RET( AcceptsFocus(), wxT("set focus on window that doesn't accept the focus") ); - + #if 0 if (GetName() == "scrollBar") { @@ -385,7 +381,7 @@ void wxWindowX11::SetFocus() *crash = 0; } #endif - + if (wxWindowIsVisible(xwindow)) { wxLogTrace( _T("focus"), _T("wxWindowX11::SetFocus: %s"), GetClassInfo()->GetClassName()); @@ -426,7 +422,7 @@ bool wxWindowX11::Enable(bool enable) { if ( !wxWindowBase::Enable(enable) ) return FALSE; - + return TRUE; } @@ -468,21 +464,21 @@ void wxWindowX11::DoCaptureMouse() { if ((g_captureWindow != NULL) && (g_captureWindow != this)) { - wxASSERT_MSG(FALSE, "Trying to capture before mouse released."); + wxASSERT_MSG(FALSE, wxT("Trying to capture before mouse released.")); // Core dump now int *tmp = NULL; (*tmp) = 1; return; } - + if (m_winCaptured) return; Window xwindow = (Window) m_clientWindow; wxCHECK_RET( xwindow, wxT("invalid window") ); - + g_captureWindow = (wxWindow*) this; if (xwindow) @@ -503,7 +499,7 @@ void wxWindowX11::DoCaptureMouse() wxLogDebug(msg); if (res == GrabNotViewable) wxLogDebug( wxT("This is not a viewable window - perhaps not shown yet?") ); - + g_captureWindow = NULL; return; } @@ -515,7 +511,7 @@ void wxWindowX11::DoCaptureMouse() void wxWindowX11::DoReleaseMouse() { g_captureWindow = NULL; - + if ( !m_winCaptured ) return; @@ -525,7 +521,7 @@ void wxWindowX11::DoReleaseMouse() { XUngrabPointer( wxGlobalDisplay(), CurrentTime ); } - + // wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() ); m_winCaptured = FALSE; @@ -553,7 +549,7 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor) Window xwindow = (Window) m_clientWindow; wxCHECK_MSG( xwindow, FALSE, wxT("invalid window") ); - + wxCursor cursorToUse; if (m_cursor.Ok()) cursorToUse = m_cursor; @@ -573,7 +569,7 @@ void wxWindowX11::WarpPointer (int x, int y) Window xwindow = (Window) m_clientWindow; wxCHECK_RET( xwindow, wxT("invalid window") ); - + XWarpPointer( wxGlobalDisplay(), None, xwindow, 0, 0, 0, 0, x, y); } @@ -582,27 +578,27 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) { // No scrolling requested. if ((dx == 0) && (dy == 0)) return; - + if (!m_updateRegion.IsEmpty()) { m_updateRegion.Offset( dx, dy ); - + int cw = 0; int ch = 0; GetSize( &cw, &ch ); // GetClientSize() ?? m_updateRegion.Intersect( 0, 0, cw, ch ); } - + if (!m_clearRegion.IsEmpty()) { m_clearRegion.Offset( dx, dy ); - + int cw = 0; int ch = 0; GetSize( &cw, &ch ); // GetClientSize() ?? m_clearRegion.Intersect( 0, 0, cw, ch ); } - + Window xwindow = (Window) GetClientAreaWindow(); wxCHECK_RET( xwindow, wxT("invalid window") ); @@ -620,7 +616,7 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) { s_x = rect->x; s_y = rect->y; - + cw = rect->width; ch = rect->height; } @@ -630,7 +626,7 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) s_y = 0; GetClientSize( &cw, &ch ); } - + #if wxUSE_TWO_WINDOWS wxPoint offset( 0,0 ); #else @@ -638,10 +634,10 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) s_x += offset.x; s_y += offset.y; #endif - + int w = cw - abs(dx); int h = ch - abs(dy); - + if ((h < 0) || (w < 0)) { Refresh(); @@ -653,17 +649,17 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) 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 ); @@ -671,7 +667,7 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) m_updateRegion.Union( rect ); m_clearRegion.Union( rect ); } - + XFreeGC( xdisplay, xgc ); } @@ -722,13 +718,13 @@ void wxWindowX11::DoGetSize(int *x, int *y) const 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) { *x = attr.width /* + 2*m_borderSize */ ; @@ -745,12 +741,12 @@ void wxWindowX11::DoGetPosition(int *x, int *y) const XWindowAttributes attr; Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr); wxASSERT(status); - + 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()) @@ -798,7 +794,7 @@ void wxWindowX11::DoGetClientSize(int *x, int *y) const XWindowAttributes attr; Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr ); wxASSERT(status); - + if (status) { *x = attr.width ; @@ -810,7 +806,7 @@ void wxWindowX11::DoGetClientSize(int *x, int *y) const void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags) { // wxLogDebug("DoSetSize: %s (%ld) %d, %d %dx%d", GetClassInfo()->GetClassName(), GetId(), x, y, width, height); - + Window xwindow = (Window) m_mainWindow; wxCHECK_RET( xwindow, wxT("invalid window") ); @@ -818,12 +814,12 @@ void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags) 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)) { int yy = 0; @@ -848,24 +844,24 @@ void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags) if (new_h <= 0) new_h = 20; } - + DoMoveWindow( new_x, new_y, new_w, new_h ); } void wxWindowX11::DoSetClientSize(int width, int height) { // wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height); - + Window xwindow = (Window) m_mainWindow; wxCHECK_RET( xwindow, wxT("invalid window") ); XResizeWindow( wxGlobalDisplay(), xwindow, width, height ); - + if (m_mainWindow != m_clientWindow) { xwindow = (Window) m_clientWindow; - + wxWindow *window = (wxWindow*) this; wxRenderer *renderer = window->GetRenderer(); if (renderer) @@ -874,7 +870,7 @@ void wxWindowX11::DoSetClientSize(int width, int height) width -= border.x + border.width; height -= border.y + border.height; } - + XResizeWindow( wxGlobalDisplay(), xwindow, width, height ); } } @@ -898,7 +894,7 @@ void wxWindowX11::DoMoveWindow(int x, int y, int width, int height) if (m_mainWindow != m_clientWindow) { xwindow = (Window) m_clientWindow; - + wxWindow *window = (wxWindow*) this; wxRenderer *renderer = window->GetRenderer(); if (renderer) @@ -914,7 +910,7 @@ void wxWindowX11::DoMoveWindow(int x, int y, int width, int height) x = 0; y = 0; } - + wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL ); if (sb && sb->IsShown()) { @@ -927,11 +923,11 @@ void wxWindowX11::DoMoveWindow(int x, int y, int width, int height) wxSize size = sb->GetSize(); width -= size.x; } - + XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, wxMax(1, width), wxMax(1, height) ); } - -#else + +#else XWindowChanges windowChanges; windowChanges.x = x; @@ -942,7 +938,7 @@ void wxWindowX11::DoMoveWindow(int x, int y, int width, int height) int valueMask = CWX | CWY | CWWidth | CWHeight; XConfigureWindow( wxGlobalDisplay(), xwindow, valueMask, &windowChanges ); - + #endif } @@ -956,7 +952,7 @@ void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, #if !wxUSE_NANOX XSizeHints sizeHints; sizeHints.flags = 0; - + if (minW > -1 && minH > -1) { sizeHints.flags |= PMinSize; @@ -986,7 +982,7 @@ void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int wxWindowX11::GetCharHeight() const { - wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" ); + wxCHECK_MSG( m_font.Ok(), 0, wxT("valid window font needed") ); #if wxUSE_UNICODE // There should be an easier way. @@ -996,7 +992,7 @@ int wxWindowX11::GetCharHeight() const int w,h; pango_layout_get_pixel_size(layout, &w, &h); g_object_unref( G_OBJECT( layout ) ); - + return h; #else WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay()); @@ -1013,7 +1009,7 @@ int wxWindowX11::GetCharHeight() const int wxWindowX11::GetCharWidth() const { - wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" ); + wxCHECK_MSG( m_font.Ok(), 0, wxT("valid window font needed") ); #if wxUSE_UNICODE // There should be an easier way. @@ -1023,7 +1019,7 @@ int wxWindowX11::GetCharWidth() const int w,h; pango_layout_get_pixel_size(layout, &w, &h); g_object_unref( G_OBJECT( layout ) ); - + return w; #else WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay()); @@ -1056,19 +1052,19 @@ void wxWindowX11::GetTextExtent(const wxString& string, #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; - + 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) @@ -1117,7 +1113,7 @@ void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect) { int height,width; GetSize( &width, &height ); - + // Schedule for later Updating in ::Update() or ::OnInternalIdle(). m_clearRegion.Clear(); m_clearRegion.Union( 0, 0, width, height ); @@ -1133,7 +1129,7 @@ void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect) { int height,width; GetSize( &width, &height ); - + // Schedule for later Updating in ::Update() or ::OnInternalIdle(). m_updateRegion.Clear(); m_updateRegion.Union( 0, 0, width, height ); @@ -1148,33 +1144,25 @@ void wxWindowX11::Update() // Send nc paint events. SendNcPaintEvents(); } - + if (!m_updateRegion.IsEmpty()) { // wxLogDebug("wxWindowX11::Update: %s", GetClassInfo()->GetClassName()); // Actually send erase events. SendEraseEvents(); - + // Actually send paint events. SendPaintEvents(); } } -void wxWindowX11::Clear() -{ -// wxClientDC dc((wxWindow*) this); -// wxBrush brush(GetBackgroundColour(), wxSOLID); -// dc.SetBackground(brush); -// dc.Clear(); -} - void wxWindowX11::SendEraseEvents() { if (m_clearRegion.IsEmpty()) return; - + wxClientDC dc( (wxWindow*)this ); dc.SetClippingRegion( m_clearRegion ); - + wxEraseEvent erase_event( GetId(), &dc ); erase_event.SetEventObject( this ); @@ -1183,7 +1171,7 @@ void wxWindowX11::SendEraseEvents() Display *xdisplay = wxGlobalDisplay(); Window xwindow = (Window) GetClientAreaWindow(); XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() ); - + wxRegionIterator upd( m_clearRegion ); while (upd) { @@ -1192,7 +1180,7 @@ void wxWindowX11::SendEraseEvents() upd ++; } } - + m_clearRegion.Clear(); } @@ -1201,13 +1189,13 @@ void wxWindowX11::SendPaintEvents() // wxLogDebug("SendPaintEvents: %s (%ld)", GetClassInfo()->GetClassName(), GetId()); m_clipPaintRegion = TRUE; - + wxPaintEvent paint_event( GetId() ); paint_event.SetEventObject( this ); GetEventHandler()->ProcessEvent( paint_event ); - + m_updateRegion.Clear(); - + m_clipPaintRegion = FALSE; } @@ -1225,7 +1213,7 @@ void wxWindowX11::SendNcPaintEvents() { height = sb->GetSize().y; y = sb->GetPosition().y; - + sb = window->GetScrollbar( wxVERTICAL ); if (sb && sb->IsShown()) { @@ -1237,17 +1225,17 @@ void wxWindowX11::SendNcPaintEvents() 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 ); } } - + wxNcPaintEvent nc_paint_event( GetId() ); nc_paint_event.SetEventObject( this ); GetEventHandler()->ProcessEvent( nc_paint_event ); - + m_updateNcArea = FALSE; } @@ -1258,7 +1246,7 @@ void wxWindowX11::SendNcPaintEvents() // 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 @@ -1281,10 +1269,11 @@ void wxWindowX11::OnInternalIdle() { // Update invalidated regions. Update(); - + // This calls the UI-update mechanism (querying windows for // menu/toolbar/control state information) - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate((wxWindow*) this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); // Set the input focus if couldn't do it before if (m_needsInputFocus) @@ -1295,7 +1284,7 @@ void wxWindowX11::OnInternalIdle() printf(msg.c_str()); #endif SetFocus(); - + // If it couldn't set the focus now, there's // no point in trying again. m_needsInputFocus = FALSE; @@ -1567,11 +1556,11 @@ bool wxWindowX11::SetBackgroundColour(const wxColour& col) Colormap cm = DefaultColormap( xdisplay, xscreen ); m_backgroundColour.CalcPixel( (WXColormap) cm ); - + // We don't set the background colour as we paint // the background ourselves. // XSetWindowBackground( xdisplay, (Window) m_clientWindow, m_backgroundColour.GetPixel() ); - + return TRUE; } @@ -1590,7 +1579,7 @@ bool wxWindowX11::SetForegroundColour(const wxColour& col) wxWindow *wxGetActiveWindow() { // TODO - wxFAIL_MSG("Not implemented"); + wxFAIL_MSG(wxT("Not implemented")); return NULL; } @@ -1661,7 +1650,7 @@ bool wxWinModule::OnInit() Window xroot = RootWindow( xdisplay, xscreen ); g_eraseGC = XCreateGC( xdisplay, xroot, 0, NULL ); XSetFillStyle( xdisplay, g_eraseGC, FillSolid ); - + return TRUE; }