X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d1efe3fec4393cb2a0da2e68e593b8074790e7b..4837b89e3b9ddc02a752d9937e3e1d9f92328851:/src/mgl/window.cpp diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp index b9db7ceb62..3d526a5c99 100644 --- a/src/mgl/window.cpp +++ b/src/mgl/window.cpp @@ -5,7 +5,7 @@ // (based on GTK & MSW implementations) // RCS-ID: $Id$ // Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -16,10 +16,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "window.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -37,7 +33,6 @@ #include "wx/utils.h" #include "wx/app.h" #include "wx/panel.h" - #include "wx/caret.h" #endif #if wxUSE_DRAG_AND_DROP @@ -49,6 +44,7 @@ #include "wx/mgl/private.h" #include "wx/intl.h" #include "wx/dcscreen.h" +#include "wx/caret.h" #include @@ -64,9 +60,9 @@ winmng_t *g_winMng = NULL; MGLDevCtx *g_displayDC = NULL; -// the window that has keyboard focus: +// the window that has keyboard focus: static wxWindowMGL *gs_focusedWindow = NULL; -// the window that is about to be focused after currently focused +// the window that is about to be focused after currently focused // one looses focus: static wxWindow *gs_toBeFocusedWindow = NULL; // the window that is currently under mouse cursor: @@ -81,7 +77,7 @@ static wxWindowMGL *gs_activeFrame = NULL; // constants // --------------------------------------------------------------------------- -// Custom identifiers used to distinguish between various event handlers +// Custom identifiers used to distinguish between various event handlers // and capture handlers passed to MGL_wm enum { @@ -113,23 +109,24 @@ static void wxCaptureScreenshot(bool activeWindowOnly) #endif static int screenshot_num = 0; wxString screenshot; - - do + + do { screenshot.Printf(SCREENSHOT_FILENAME, screenshot_num++); } while ( wxFileExists(screenshot) && screenshot_num < 1000 ); - + wxRect r(0, 0, g_displayDC->sizex(), g_displayDC->sizey()); if ( activeWindowOnly && gs_activeFrame ) { r.Intersect(gs_activeFrame->GetRect()); } - - g_displayDC->savePNGFromDC(screenshot.mb_str(), - r.x, r. y, r.width, r.height); - - wxMessageBox(_("Screenshot captured: ") + wxString(screenshot)); + + g_displayDC->savePNGFromDC(screenshot.mb_str(), + r.x, r. y, r.x+r.width, r.y+r.height); + + wxMessageBox(wxString::Format(_T("Screenshot captured: %s"), + screenshot.c_str())); } // --------------------------------------------------------------------------- @@ -139,7 +136,7 @@ static void wxCaptureScreenshot(bool activeWindowOnly) static void MGLAPI wxWindowPainter(window_t *wnd, MGLDC *dc) { wxWindowMGL *w = (wxWindow*) wnd->userData; - + if ( w && !(w->GetWindowStyle() & wxTRANSPARENT_WINDOW) ) { MGLDevCtx ctx(dc); @@ -152,18 +149,18 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e) wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd); wxPoint orig(win->GetClientAreaOrigin()); wxPoint where; - - MGL_wmCoordGlobalToLocal(win->GetHandle(), + + MGL_wmCoordGlobalToLocal(win->GetHandle(), e->where_x, e->where_y, &where.x, &where.y); for (wxWindowMGL *w = win; w; w = w->GetParent()) { - if ( !w->IsEnabled() ) + if ( !w->IsEnabled() ) return FALSE; if ( w->IsTopLevel() ) break; } - + wxEventType type = wxEVT_NULL; wxMouseEvent event; event.SetEventObject(win); @@ -177,7 +174,7 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e) event.m_leftDown = e->modifiers & EVT_LEFTBUT; event.m_middleDown = e->modifiers & EVT_MIDDLEBUT; event.m_rightDown = e->modifiers & EVT_RIGHTBUT; - + switch (e->what) { case EVT_MOUSEDOWN: @@ -185,24 +182,8 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e) if ( win->AcceptsFocus() && wxWindow::FindFocus() != win ) win->SetFocus(); - if ( e->message & EVT_LEFTBMASK ) - type = wxEVT_LEFT_DOWN; - else if ( e->message & EVT_MIDDLEBMASK ) - type = wxEVT_MIDDLE_DOWN; - else if ( e->message & EVT_RIGHTBMASK ) - type = wxEVT_RIGHT_DOWN; - if ( e->message & EVT_DBLCLICK ) { - // MGL doesn't generate two subsequent single clicks prior - // to a double click, but rather only fires one single click - // followed by one double click. wxWindows expects two single - // clicks, so we have to emulate the second one. - event.SetEventType(type); - win->GetEventHandler()->ProcessEvent(event); - - // And change event type for the real double click event - // that will be generated later in this function: if ( e->message & EVT_LEFTBMASK ) type = wxEVT_LEFT_DCLICK; else if ( e->message & EVT_MIDDLEBMASK ) @@ -210,6 +191,15 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e) else if ( e->message & EVT_RIGHTBMASK ) type = wxEVT_RIGHT_DCLICK; } + else + { + if ( e->message & EVT_LEFTBMASK ) + type = wxEVT_LEFT_DOWN; + else if ( e->message & EVT_MIDDLEBMASK ) + type = wxEVT_MIDDLE_DOWN; + else if ( e->message & EVT_RIGHTBMASK ) + type = wxEVT_RIGHT_DOWN; + } break; @@ -230,8 +220,8 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e) if ( gs_windowUnderMouse ) { wxMouseEvent event2(event); - MGL_wmCoordGlobalToLocal(gs_windowUnderMouse->GetHandle(), - e->where_x, e->where_y, + MGL_wmCoordGlobalToLocal(gs_windowUnderMouse->GetHandle(), + e->where_x, e->where_y, &event2.m_x, &event2.m_y); wxPoint orig(gs_windowUnderMouse->GetClientAreaOrigin()); @@ -252,28 +242,28 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e) } else // gs_mouseCapture { - bool inside = (where.x >= 0 && + bool inside = (where.x >= 0 && where.y >= 0 && where.x < win->GetSize().x && where.y < win->GetSize().y); if ( (inside && gs_windowUnderMouse != win) || (!inside && gs_windowUnderMouse == win) ) { - wxMouseEvent evt(inside ? + wxMouseEvent evt(inside ? wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW); evt.SetEventObject(win); win->GetEventHandler()->ProcessEvent(evt); gs_windowUnderMouse = inside ? win : NULL; } } - + type = wxEVT_MOTION; break; default: break; } - + if ( type == wxEVT_NULL ) { return FALSE; @@ -299,11 +289,11 @@ static long wxScanToKeyCode(event_t *event, bool translate) break; #else #define KEY(mgl_key,wx_key) \ - case mgl_key: key = wx_key; break; + case mgl_key: key = wx_key; break; #endif long key = 0; - + if ( translate ) { switch ( EVT_scanCode(event->message) ) @@ -377,7 +367,7 @@ static long wxScanToKeyCode(event_t *event, bool translate) default: break; } } - + if ( key == 0 ) { switch ( EVT_scanCode(event->message) ) @@ -421,10 +411,10 @@ static long wxScanToKeyCode(event_t *event, bool translate) KEY (KB_esc, WXK_ESCAPE) KEY (KB_backspace, WXK_BACK) KEY (KB_tab, WXK_TAB) - KEY (KB_enter, WXK_RETURN) + KEY (KB_enter, WXK_RETURN) - default: - key = EVT_asciiCode(event->message); + default: + key = EVT_asciiCode(event->message); break; } } @@ -439,22 +429,15 @@ static bool wxHandleSpecialKeys(wxKeyEvent& event) // Add an easy way to capture screenshots: if ( event.m_keyCode == WXK_SNAPSHOT #ifdef __WXDEBUG__ // FIXME_MGL - remove when KB_sysReq works in MGL! - || (event.m_keyCode == WXK_F1 && - event.m_shiftDown && event.m_controlDown) - ) + || (event.m_keyCode == WXK_F1 && + event.m_shiftDown && event.m_controlDown) #endif + ) { wxCaptureScreenshot(event.m_altDown/*only active wnd?*/); return TRUE; } - if ( event.m_keyCode == WXK_F4 && event.m_altDown && - gs_activeFrame != NULL ) - { - gs_activeFrame->Close(); - return TRUE; - } - return FALSE; } @@ -465,9 +448,9 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) if ( !win->IsEnabled() ) return FALSE; wxPoint where; - MGL_wmCoordGlobalToLocal(win->GetHandle(), + MGL_wmCoordGlobalToLocal(win->GetHandle(), e->where_x, e->where_y, &where.x, &where.y); - + wxKeyEvent event; event.SetEventObject(win); event.SetTimestamp(e->when); @@ -492,7 +475,7 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) event.SetEventType(wxEVT_KEY_DOWN); event2 = event; - + ret = win->GetEventHandler()->ProcessEvent(event); // wxMSW doesn't send char events with Alt pressed @@ -504,7 +487,7 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) event2.SetEventType(wxEVT_CHAR); ret = win->GetEventHandler()->ProcessEvent(event2); } - + // Synthetize navigation key event, but do it only if the TAB key // wasn't handled yet: if ( !ret && event.m_keyCode == WXK_TAB && @@ -519,12 +502,12 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) navEvent.SetCurrentFocus(wxStaticCast(win, wxWindow)); ret = win->GetParent()->GetEventHandler()->ProcessEvent(navEvent); } - - // Finally, process special meaning keys that are usually + + // Finally, process special meaning keys that are usually // a responsibility of OS or window manager: if ( !ret ) ret = wxHandleSpecialKeys(event); - + return ret; } } @@ -537,7 +520,6 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) IMPLEMENT_ABSTRACT_CLASS(wxWindowMGL, wxWindowBase) BEGIN_EVENT_TABLE(wxWindowMGL, wxWindowBase) - EVT_IDLE(wxWindowMGL::OnIdle) END_EVENT_TABLE() // =========================================================================== @@ -548,7 +530,7 @@ END_EVENT_TABLE() // constructors and such // ---------------------------------------------------------------------------- -extern wxDisplayModeInfo wxGetDefaultDisplayMode(); +extern wxVideoMode wxGetDefaultDisplayMode(); void wxWindowMGL::Init() { @@ -557,17 +539,12 @@ void wxWindowMGL::Init() if ( !g_winMng ) { if ( !wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode()) ) - wxFatalError(_("Cannot initialize display.")); + wxLogFatalError(_("Cannot initialize display.")); } - // generic: - InitBase(); - // mgl specific: m_wnd = NULL; m_isShown = TRUE; - m_isBeingDeleted = FALSE; - m_isEnabled = TRUE; m_frozen = FALSE; m_paintMGLDC = NULL; m_eraseBackground = -1; @@ -576,6 +553,8 @@ void wxWindowMGL::Init() // Destructor wxWindowMGL::~wxWindowMGL() { + SendDestroyEvent(); + m_isBeingDeleted = TRUE; if ( gs_mouseCapture == this ) @@ -583,29 +562,28 @@ wxWindowMGL::~wxWindowMGL() if (gs_activeFrame == this) { - gs_activeFrame = NULL; - // activate next frame in Z-order: - if ( m_wnd->prev ) - { - wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData; - win->SetFocus(); + gs_activeFrame = NULL; + // activate next frame in Z-order: + if ( m_wnd->prev ) + { + wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData; + win->SetFocus(); + } + else if ( m_wnd->next ) + { + wxWindowMGL *win = (wxWindowMGL*)m_wnd->next->userData; + win->SetFocus(); } } - + if ( gs_focusedWindow == this ) KillFocus(); if ( gs_windowUnderMouse == this ) gs_windowUnderMouse = NULL; - // VS: destroy children first and _then_ detach *this from its parent. - // If we'd do it the other way around, children wouldn't be able - // find their parent frame (see above). DestroyChildren(); - if ( m_parent ) - m_parent->RemoveChild(this); - if ( m_wnd ) MGL_wmDestroyWindow(m_wnd); } @@ -633,11 +611,11 @@ bool wxWindowMGL::Create(wxWindow *parent, AdjustForParentClientOrigin(x, y, 0); w = WidthDefault(size.x); h = HeightDefault(size.y); - + long mgl_style = 0; window_t *wnd_parent = parent ? parent->GetHandle() : NULL; - if ( !(style & wxNO_FULL_REPAINT_ON_RESIZE) ) + if ( style & wxFULL_REPAINT_ON_RESIZE ) { mgl_style |= MGL_WM_FULL_REPAINT_ON_RESIZE; } @@ -657,7 +635,7 @@ bool wxWindowMGL::Create(wxWindow *parent, MGL_wmSetWindowFlags(wnd, mgl_style); MGL_wmShowWindow(wnd, m_isShown); - + SetMGLwindow_t(wnd); return TRUE; @@ -670,7 +648,7 @@ void wxWindowMGL::SetMGLwindow_t(struct window_t *wnd) m_wnd = wnd; if ( !m_wnd ) return; - + m_isShown = m_wnd->visible; MGL_wmSetWindowUserData(m_wnd, (void*) this); @@ -700,9 +678,9 @@ void wxWindowMGL::SetFocus() gs_focusedWindow->KillFocus(); gs_toBeFocusedWindow = NULL; } - + gs_focusedWindow = this; - + MGL_wmCaptureEvents(GetHandle(), EVT_KEYEVT, wxMGL_CAPTURE_KEYB); wxWindowMGL *active = wxGetTopLevelParent(this); @@ -720,7 +698,7 @@ void wxWindowMGL::SetFocus() event.SetEventObject(gs_activeFrame); gs_activeFrame->GetEventHandler()->ProcessEvent(event); } - + wxFocusEvent event(wxEVT_SET_FOCUS, GetId()); event.SetEventObject(this); event.SetWindow((wxWindow*)oldFocusedWindow); @@ -740,7 +718,7 @@ void wxWindowMGL::KillFocus() gs_focusedWindow = NULL; if ( m_isBeingDeleted ) return; - + MGL_wmUncaptureEvents(GetHandle(), wxMGL_CAPTURE_KEYB); #if wxUSE_CARET @@ -760,7 +738,7 @@ void wxWindowMGL::KillFocus() // this wxWindowBase function is implemented here (in platform-specific file) // because it is static and so couldn't be made virtual // ---------------------------------------------------------------------------- -wxWindow *wxWindowBase::FindFocus() +wxWindow *wxWindowBase::DoFindFocus() { return (wxWindow*)gs_focusedWindow; } @@ -771,14 +749,23 @@ bool wxWindowMGL::Show(bool show) return FALSE; MGL_wmShowWindow(m_wnd, show); - + if (!show && gs_activeFrame == this) { - // activate next frame in Z-order: - if ( m_wnd->prev ) - { - wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData; - win->SetFocus(); + // activate next frame in Z-order: + if ( m_wnd->prev ) + { + wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData; + win->SetFocus(); + } + else if ( m_wnd->next ) + { + wxWindowMGL *win = (wxWindowMGL*)m_wnd->next->userData; + win->SetFocus(); + } + else + { + gs_activeFrame = NULL; } } @@ -808,8 +795,8 @@ void wxWindowMGL::DoCaptureMouse() void wxWindowMGL::DoReleaseMouse() { - wxASSERT_MSG( gs_mouseCapture == this, wxT("attempt to release mouse, but this window hasn't captured it") ) - + wxASSERT_MSG( gs_mouseCapture == this, wxT("attempt to release mouse, but this window hasn't captured it") ); + MGL_wmUncaptureEvents(m_wnd, wxMGL_CAPTURE_MOUSE); gs_mouseCapture = NULL; } @@ -837,40 +824,21 @@ bool wxWindowMGL::SetCursor(const wxCursor& cursor) void wxWindowMGL::WarpPointer(int x, int y) { - ClientToScreen(&x, &y); - EVT_setMousePos(x, y); -} + int w, h; + wxDisplaySize(&w, &h); -#if WXWIN_COMPATIBILITY -// If nothing defined for this, try the parent. -// E.g. we may be a button loaded from a resource, with no callback function -// defined. -void wxWindowMGL::OnCommand(wxWindow& win, wxCommandEvent& event) -{ - if ( GetEventHandler()->ProcessEvent(event) ) - return; - if ( m_parent ) - m_parent->GetEventHandler()->OnCommand(win, event); -} -#endif // WXWIN_COMPATIBILITY_2 + ClientToScreen(&x, &y); + if ( x < 0 ) + x = 0; + if ( y < 0 ) + y = 0; + if ( x >= w ) + x = w-1; + if ( y >= h ) + y = h-1; -#if WXWIN_COMPATIBILITY -wxObject* wxWindowMGL::GetChild(int number) const -{ - // Return a pointer to the Nth object in the Panel - wxNode *node = GetChildren().First(); - int n = number; - while (node && n--) - node = node->Next(); - if ( node ) - { - wxObject *obj = (wxObject *)node->Data(); - return(obj); - } - else - return NULL; + EVT_setMousePos(x, y); } -#endif // WXWIN_COMPATIBILITY // Set this window to be the child of 'parent'. bool wxWindowMGL::Reparent(wxWindowBase *parent) @@ -922,18 +890,21 @@ void wxWindowMGL::DragAcceptFiles(bool accept) // Get total size void wxWindowMGL::DoGetSize(int *x, int *y) const { - wxASSERT_MSG( m_wnd, wxT("invalid window") ) - + wxASSERT_MSG( m_wnd, wxT("invalid window") ); + if (x) *x = m_wnd->width; if (y) *y = m_wnd->height; } void wxWindowMGL::DoGetPosition(int *x, int *y) const { - wxASSERT_MSG( m_wnd, wxT("invalid window") ) + wxASSERT_MSG( m_wnd, wxT("invalid window") ); - if (x) *x = m_wnd->x; - if (y) *y = m_wnd->y; + int pX = 0, pY = 0; + AdjustForParentClientOrigin(pX, pY, 0); + + if (x) *x = m_wnd->x - pX; + if (y) *y = m_wnd->y - pY; } void wxWindowMGL::DoScreenToClient(int *x, int *y) const @@ -964,7 +935,33 @@ void wxWindowMGL::DoGetClientSize(int *x, int *y) const void wxWindowMGL::DoMoveWindow(int x, int y, int width, int height) { - MGL_wmSetWindowPosition(GetHandle(), x, y, width, height); + wxRect rcClient(GetClientRect()); + + MGL_wmSetWindowPosition(m_wnd, x, y, width, height); + + // When the origin or a window stays fixed but the height or width + // changes, invalidate the old and new non-client areas + if ( !HasFlag(wxFULL_REPAINT_ON_RESIZE) && + m_wnd->x == x && m_wnd->y == y && + rcClient.Intersect(GetClientRect()) != wxRect(0, 0, width, height) ) + { + wxRegion rgn(0, 0, width, height); + rgn.Subtract(rcClient); + + // This should work I think, but doesn't seem to: + //MGL_wmInvalidateWindowRegion(m_wnd, rgn.GetMGLRegion().rgnPointer()); + + // Use MGL_wmInvalidateWindowRect instead: + for (wxRegionIterator it(rgn); it; it++) + { + rect_t rc; + rc.left = it.GetX(); + rc.top = it.GetY(); + rc.right = rc.left + it.GetW(); + rc.bottom = rc.top + it.GetH(); + MGL_wmInvalidateWindowRect(m_wnd, &rc); + } + } } // set the size of the window: if the dimensions are positive, just use them, @@ -1011,7 +1008,7 @@ void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags) width = currentW; } } - + if ( height == -1 ) { if ( sizeFlags & wxSIZE_AUTO_HEIGHT ) @@ -1030,18 +1027,18 @@ void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags) height = currentH; } } - + int maxWidth = GetMaxWidth(), - minWidth = GetMinWidth(), + minWidth = GetMinWidth(), maxHeight = GetMaxHeight(), minHeight = GetMinHeight(); - + if ( minWidth != -1 && width < minWidth ) width = minWidth; if ( maxWidth != -1 && width > maxWidth ) width = maxWidth; if ( minHeight != -1 && height < minHeight ) height = minHeight; if ( maxHeight != -1 && height > maxHeight ) height = maxHeight; - if ( m_wnd->x != x || m_wnd->y != y || + if ( m_wnd->x != x || m_wnd->y != y || (int)m_wnd->width != width || (int)m_wnd->height != height ) { DoMoveWindow(x, y, width, height); @@ -1086,48 +1083,6 @@ void wxWindowMGL::GetTextExtent(const wxString& string, dc.GetTextExtent(string, x, y, descent, externalLeading, (wxFont*)theFont); } -#if wxUSE_CARET && WXWIN_COMPATIBILITY -// --------------------------------------------------------------------------- -// Caret manipulation -// --------------------------------------------------------------------------- - -void wxWindowMGL::CreateCaret(int w, int h) -{ - SetCaret(new wxCaret(this, w, h)); -} - -void wxWindowMGL::CreateCaret(const wxBitmap *WXUNUSED(bitmap)) -{ - wxFAIL_MSG("not implemented"); -} - -void wxWindowMGL::ShowCaret(bool show) -{ - wxCHECK_RET( m_caret, "no caret to show" ); - - m_caret->Show(show); -} - -void wxWindowMGL::DestroyCaret() -{ - SetCaret(NULL); -} - -void wxWindowMGL::SetCaretPos(int x, int y) -{ - wxCHECK_RET( m_caret, "no caret to move" ); - - m_caret->Move(x, y); -} - -void wxWindowMGL::GetCaretPos(int *x, int *y) const -{ - wxCHECK_RET( m_caret, "no caret to get position of" ); - - m_caret->GetPosition(x, y); -} -#endif // wxUSE_CARET - // --------------------------------------------------------------------------- // painting @@ -1148,7 +1103,7 @@ void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect) m_eraseBackground = eraseBack; else m_eraseBackground |= eraseBack; - + if ( rect ) { rect_t r; @@ -1183,12 +1138,12 @@ void wxWindowMGL::HandlePaint(MGLDevCtx *dc) { if ( m_frozen ) { - // Don't paint anything if the window is frozen. + // Don't paint anything if the window is frozen. m_refreshAfterThaw = TRUE; return; } - -#ifdef __WXDEBUG__ + +#ifdef __WXDEBUG__ // FIXME_MGL -- debugging stuff, to be removed! static int debugPaintEvents = -1; if ( debugPaintEvents == -1 ) @@ -1225,7 +1180,7 @@ void wxWindowMGL::HandlePaint(MGLDevCtx *dc) wxNcPaintEvent eventNc(GetId()); eventNc.SetEventObject(this); GetEventHandler()->ProcessEvent(eventNc); - + wxPaintEvent eventPt(GetId()); eventPt.SetEventObject(this); GetEventHandler()->ProcessEvent(eventPt); @@ -1258,7 +1213,8 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) // idle events processing // --------------------------------------------------------------------------- -void wxWindowMGL::OnIdle(wxIdleEvent& WXUNUSED(event)) +void wxWindowMGL::OnInternalIdle() { - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); }