X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d163bf87d765aae365ee93742cfb96e1ef5c12d..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/mgl/window.cpp diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp index 70a9ffaf64..ec655b4ebd 100644 --- a/src/mgl/window.cpp +++ b/src/mgl/window.cpp @@ -106,9 +106,9 @@ static wxWindowMGL* wxGetTopLevelParent(wxWindowMGL *win) static void wxCaptureScreenshot(bool activeWindowOnly) { #ifdef __DOS__ - #define SCREENSHOT_FILENAME _T("sshot%03i.png") + #define SCREENSHOT_FILENAME wxT("sshot%03i.png") #else - #define SCREENSHOT_FILENAME _T("screenshot-%03i.png") + #define SCREENSHOT_FILENAME wxT("screenshot-%03i.png") #endif static int screenshot_num = 0; wxString screenshot; @@ -128,7 +128,7 @@ static void wxCaptureScreenshot(bool activeWindowOnly) 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"), + wxMessageBox(wxString::Format(wxT("Screenshot captured: %s"), screenshot.c_str())); } @@ -184,7 +184,7 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e) { case EVT_MOUSEDOWN: // Change focus if the user clicks outside focused window: - if ( win->AcceptsFocus() && wxWindow::FindFocus() != win ) + if ( win->CanAcceptFocus() && wxWindow::FindFocus() != win ) win->SetFocus(); if ( e->message & EVT_DBLCLICK ) @@ -235,12 +235,12 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e) event2.SetEventObject(gs_windowUnderMouse); event2.SetEventType(wxEVT_LEAVE_WINDOW); - gs_windowUnderMouse->GetEventHandler()->ProcessEvent(event2); + gs_windowUnderMouse->HandleWindowEvent(event2); } wxMouseEvent event3(event); event3.SetEventType(wxEVT_ENTER_WINDOW); - win->GetEventHandler()->ProcessEvent(event3); + win->HandleWindowEvent(event3); gs_windowUnderMouse = win; } @@ -257,7 +257,7 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e) wxMouseEvent evt(inside ? wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW); evt.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(evt); + win->HandleWindowEvent(evt); gs_windowUnderMouse = inside ? win : NULL; } } @@ -276,7 +276,7 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e) else { event.SetEventType(type); - return win->GetEventHandler()->ProcessEvent(event); + return win->HandleWindowEvent(event); } } @@ -288,8 +288,8 @@ static long wxScanToKeyCode(event_t *event, bool translate) #ifdef __WXDEBUG__ #define KEY(mgl_key,wx_key) \ case mgl_key: \ - wxLogTrace(_T("keyevents"), \ - _T("key " #mgl_key ", mapped to " #wx_key)); \ + wxLogTrace(wxT("keyevents"), \ + wxT("key " #mgl_key ", mapped to " #wx_key)); \ key = wx_key; \ break; #else @@ -460,7 +460,6 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) event.SetEventObject(win); event.SetTimestamp(e->when); event.m_keyCode = wxScanToKeyCode(e, true); - event.m_scanCode = 0; // not used by wx at all event.m_x = where.x; event.m_y = where.y; event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0; @@ -471,7 +470,7 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) if ( e->what == EVT_KEYUP ) { event.SetEventType(wxEVT_KEY_UP); - return win->GetEventHandler()->ProcessEvent(event); + return win->HandleWindowEvent(event); } else { @@ -481,7 +480,7 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) event.SetEventType(wxEVT_KEY_DOWN); event2 = event; - ret = win->GetEventHandler()->ProcessEvent(event); + ret = win->HandleWindowEvent(event); // wxMSW doesn't send char events with Alt pressed // Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x @@ -490,7 +489,7 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) if ( !ret && event2.m_keyCode != 0 ) { event2.SetEventType(wxEVT_CHAR); - ret = win->GetEventHandler()->ProcessEvent(event2); + ret = win->HandleWindowEvent(event2); } // Synthetize navigation key event, but do it only if the TAB key @@ -505,7 +504,7 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) // Ctrl-TAB changes the (parent) window, i.e. switch notebook page: navEvent.SetWindowChange(event.m_controlDown); navEvent.SetCurrentFocus(wxStaticCast(win, wxWindow)); - ret = win->GetParent()->GetEventHandler()->ProcessEvent(navEvent); + ret = win->HandleWindowEvent(navEvent); } // Finally, process special meaning keys that are usually @@ -544,13 +543,14 @@ void wxWindowMGL::Init() if ( !g_winMng ) { if ( !wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode()) ) + { wxLogFatalError(_("Cannot initialize display.")); + } } // mgl specific: m_wnd = NULL; m_isShown = true; - m_frozen = false; m_paintMGLDC = NULL; m_eraseBackground = -1; } @@ -560,8 +560,6 @@ wxWindowMGL::~wxWindowMGL() { SendDestroyEvent(); - m_isBeingDeleted = true; - if ( gs_mouseCapture == this ) ReleaseMouse(); @@ -661,7 +659,7 @@ void wxWindowMGL::SetMGLwindow_t(struct window_t *wnd) MGL_wmPushWindowEventHandler(m_wnd, wxWindowMouseHandler, EVT_MOUSEEVT, 0); MGL_wmPushWindowEventHandler(m_wnd, wxWindowKeybHandler, EVT_KEYEVT, 0); - if ( m_cursor.Ok() ) + if ( m_cursor.IsOk() ) MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor()); else MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor()); @@ -695,24 +693,24 @@ void wxWindowMGL::SetFocus() { wxActivateEvent event(wxEVT_ACTIVATE, false, gs_activeFrame->GetId()); event.SetEventObject(gs_activeFrame); - gs_activeFrame->GetEventHandler()->ProcessEvent(event); + gs_activeFrame->HandleWindowEvent(event); } gs_activeFrame = active; wxActivateEvent event(wxEVT_ACTIVATE, true, gs_activeFrame->GetId()); event.SetEventObject(gs_activeFrame); - gs_activeFrame->GetEventHandler()->ProcessEvent(event); + gs_activeFrame->HandleWindowEvent(event); } // notify the parent keeping track of focus for the kbd navigation // purposes that we got it wxChildFocusEvent eventFocus((wxWindow*)this); - GetEventHandler()->ProcessEvent(eventFocus); + HandleWindowEvent(eventFocus); wxFocusEvent event(wxEVT_SET_FOCUS, GetId()); event.SetEventObject(this); event.SetWindow((wxWindow*)oldFocusedWindow); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); #if wxUSE_CARET // caret needs to be informed about focus change @@ -741,7 +739,7 @@ void wxWindowMGL::KillFocus() wxFocusEvent event(wxEVT_KILL_FOCUS, GetId()); event.SetEventObject(this); event.SetWindow(gs_toBeFocusedWindow); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); } // ---------------------------------------------------------------------------- @@ -824,7 +822,7 @@ bool wxWindowMGL::SetCursor(const wxCursor& cursor) return false; } - if ( m_cursor.Ok() ) + if ( m_cursor.IsOk() ) MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor()); else MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor()); @@ -1056,7 +1054,7 @@ void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags) wxSize newSize(width, height); wxSizeEvent event(newSize, GetId()); event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); } } @@ -1083,10 +1081,11 @@ int wxWindowMGL::GetCharWidth() const return dc.GetCharWidth(); } -void wxWindowMGL::GetTextExtent(const wxString& string, - int *x, int *y, - int *descent, int *externalLeading, - const wxFont *theFont) const +void wxWindowMGL::DoGetTextExtent(const wxString& string, + int *x, int *y, + int *descent, + int *externalLeading, + const wxFont *theFont) const { wxScreenDC dc; if (!theFont) @@ -1099,14 +1098,6 @@ void wxWindowMGL::GetTextExtent(const wxString& string, // painting // --------------------------------------------------------------------------- -void wxWindowMGL::Clear() -{ - wxClientDC dc((wxWindow *)this); - wxBrush brush(GetBackgroundColour(), wxSOLID); - dc.SetBackground(brush); - dc.Clear(); -} - void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect) { if ( m_eraseBackground == -1 ) @@ -1127,33 +1118,31 @@ void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect) void wxWindowMGL::Update() { - if ( !m_frozen ) + if ( !IsFrozen() ) MGL_wmUpdateDC(g_winMng); } -void wxWindowMGL::Freeze() +void wxWindowMGL::DoFreeze() { - m_frozen = true; m_refreshAfterThaw = false; } -void wxWindowMGL::Thaw() +void wxWindowMGL::DoThaw() { - m_frozen = false; if ( m_refreshAfterThaw ) Refresh(); } void wxWindowMGL::HandlePaint(MGLDevCtx *dc) { - if ( m_frozen ) + if ( IsFrozen() ) { // Don't paint anything if the window is frozen. m_refreshAfterThaw = true; return; } -#ifdef __WXDEBUG__ +#if wxDEBUG_LEVEL >= 2 // FIXME_MGL -- debugging stuff, to be removed! static int debugPaintEvents = -1; if ( debugPaintEvents == -1 ) @@ -1164,7 +1153,7 @@ void wxWindowMGL::HandlePaint(MGLDevCtx *dc) dc->fillRect(-1000,-1000,2000,2000); wxMilliSleep(50); } -#endif +#endif // wxDEBUG_LEVEL >= 2 MGLRegion clip; dc->getClipRegion(clip); @@ -1183,17 +1172,17 @@ void wxWindowMGL::HandlePaint(MGLDevCtx *dc) wxWindowDC dc((wxWindow*)this); wxEraseEvent eventEr(m_windowId, &dc); eventEr.SetEventObject(this); - GetEventHandler()->ProcessEvent(eventEr); + HandleWindowEvent(eventEr); } m_eraseBackground = -1; wxNcPaintEvent eventNc(GetId()); eventNc.SetEventObject(this); - GetEventHandler()->ProcessEvent(eventNc); + HandleWindowEvent(eventNc); wxPaintEvent eventPt(GetId()); eventPt.SetEventObject(this); - GetEventHandler()->ProcessEvent(eventPt); + HandleWindowEvent(eventPt); #if wxUSE_CARET if ( caret ) @@ -1217,14 +1206,3 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) window_t *wnd = MGL_wmGetWindowAtPosition(g_winMng, pt.x, pt.y); return (wxWindow*)wnd->userData; } - - -// --------------------------------------------------------------------------- -// idle events processing -// --------------------------------------------------------------------------- - -void wxWindowMGL::OnInternalIdle() -{ - if (wxUpdateUIEvent::CanUpdate(this)) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); -}