X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c04c7a3d0ae9f09bd7219b97799d9b185f1c2bab..ccaa848d6d376072af26c971a212580cf46affc5:/src/dfb/window.cpp diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp index 5fdf3cdc30..a4ad6529e6 100644 --- a/src/dfb/window.cpp +++ b/src/dfb/window.cpp @@ -28,6 +28,7 @@ #ifndef WX_PRECOMP #include "wx/dcclient.h" + #include "wx/nonownedwnd.h" #endif #include "wx/caret.h" @@ -36,8 +37,8 @@ #include "wx/dfb/private.h" #include "wx/private/overlay.h" -#define TRACE_EVENTS _T("events") -#define TRACE_PAINT _T("paint") +#define TRACE_EVENTS "events" +#define TRACE_PAINT "paint" // =========================================================================== // implementation @@ -78,7 +79,6 @@ END_EVENT_TABLE() void wxWindowDFB::Init() { m_isShown = true; - m_frozenness = 0; m_tlw = NULL; m_overlays = NULL; } @@ -93,25 +93,6 @@ wxWindowDFB::~wxWindowDFB() if ( gs_mouseCapture == this ) ReleaseMouse(); -#warning "FIXME: what to do with gs_activeFrame here and elsewhere?" -#if 0 - if (gs_activeFrame == this) - { - gs_activeFrame = NULL; - // activate next frame in Z-order: - if ( m_wnd->prev ) - { - wxWindowDFB *win = (wxWindowDFB*)m_wnd->prev->userData; - win->SetFocus(); - } - else if ( m_wnd->next ) - { - wxWindowDFB *win = (wxWindowDFB*)m_wnd->next->userData; - win->SetFocus(); - } - } -#endif - if ( gs_focusedWindow == this ) DFBKillFocus(); @@ -156,10 +137,10 @@ bool wxWindowDFB::Create(wxWindow *parent, wxIDirectFBSurfacePtr wxWindowDFB::ObtainDfbSurface() const { - wxCHECK_MSG( m_parent, NULL, _T("parentless window?") ); + wxCHECK_MSG( m_parent, NULL, "parentless window?" ); wxIDirectFBSurfacePtr parentSurface(m_parent->GetDfbSurface()); - wxCHECK_MSG( parentSurface, NULL, _T("invalid parent surface") ); + wxCHECK_MSG( parentSurface, NULL, "invalid parent surface" ); wxRect r(GetRect()); AdjustForParentClientOrigin(r.x, r.y, 0); @@ -173,7 +154,7 @@ wxIDirectFBSurfacePtr wxWindowDFB::GetDfbSurface() if ( !m_surface ) { m_surface = ObtainDfbSurface(); - wxASSERT_MSG( m_surface, _T("invalid DirectFB surface") ); + wxASSERT_MSG( m_surface, "invalid DirectFB surface" ); } return m_surface; @@ -212,7 +193,8 @@ void wxWindowDFB::SetFocus() gs_focusedWindow = this; - if ( IsShownOnScreen() ) + if ( IsShownOnScreen() && + (!oldFocusedWindow || oldFocusedWindow->GetTLW() != m_tlw) ) { m_tlw->SetDfbFocus(); } @@ -220,35 +202,15 @@ void wxWindowDFB::SetFocus() // are hidden; when the TLW becomes visible, it will set the focus // to use from wxTLW::Show() - #warning "FIXME: implement in terms of DWET_{GOT,LOST}FOCUS" - #warning "FIXME: keep this or not? not, think multiapp core" -#if 0 - wxWindowDFB *active = wxGetTopLevelParent((wxWindow*)this); - if ( !(m_windowStyle & wxPOPUP_WINDOW) && active != gs_activeFrame ) - { - if ( gs_activeFrame ) - { - wxActivateEvent event(wxEVT_ACTIVATE, false, gs_activeFrame->GetId()); - event.SetEventObject(gs_activeFrame); - gs_activeFrame->GetEventHandler()->ProcessEvent(event); - } - - gs_activeFrame = active; - wxActivateEvent event(wxEVT_ACTIVATE, true, gs_activeFrame->GetId()); - event.SetEventObject(gs_activeFrame); - gs_activeFrame->GetEventHandler()->ProcessEvent(event); - } -#endif - // 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 @@ -261,7 +223,7 @@ void wxWindowDFB::SetFocus() void wxWindowDFB::DFBKillFocus() { wxCHECK_RET( gs_focusedWindow == this, - _T("killing focus on window that doesn't have it") ); + "killing focus on window that doesn't have it" ); gs_focusedWindow = NULL; @@ -278,7 +240,7 @@ void wxWindowDFB::DFBKillFocus() wxFocusEvent event(wxEVT_KILL_FOCUS, GetId()); event.SetEventObject(this); event.SetWindow(gs_toBeFocusedWindow); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); } // ---------------------------------------------------------------------------- @@ -300,43 +262,19 @@ bool wxWindowDFB::Show(bool show) // parent area at the place of this window (if hiding): DoRefreshWindow(); -#warning "FIXME: all of this must be implemented for DFB" -#if 0 - DFB_wmShowWindow(m_wnd, show); - - if (!show && gs_activeFrame == this) - { - // activate next frame in Z-order: - if ( m_wnd->prev ) - { - wxWindowDFB *win = (wxWindowDFB*)m_wnd->prev->userData; - win->SetFocus(); - } - else if ( m_wnd->next ) - { - wxWindowDFB *win = (wxWindowDFB*)m_wnd->next->userData; - win->SetFocus(); - } - else - { - gs_activeFrame = NULL; - } - } -#endif - return true; } // Raise the window to the top of the Z order void wxWindowDFB::Raise() { - wxFAIL_MSG( _T("Raise() not implemented") ); + wxFAIL_MSG( "Raise() not implemented" ); } // Lower the window to the bottom of the Z order void wxWindowDFB::Lower() { - wxFAIL_MSG( _T("Lower() not implemented") ); + wxFAIL_MSG( "Lower() not implemented" ); } void wxWindowDFB::DoCaptureMouse() @@ -399,7 +337,7 @@ void wxWindowDFB::WarpPointer(int x, int y) if ( y >= h ) y = h-1; wxIDirectFBDisplayLayerPtr layer(wxIDirectFB::Get()->GetDisplayLayer()); - wxCHECK_RET( layer, _T("no display layer") ); + wxCHECK_RET( layer, "no display layer" ); layer->WarpCursor(x, y); } @@ -411,7 +349,7 @@ bool wxWindowDFB::Reparent(wxWindowBase *parent) return false; #warning "implement this" - wxFAIL_MSG( _T("reparenting not yet implemented") ); + wxFAIL_MSG( "reparenting not yet implemented" ); return true; } @@ -435,7 +373,7 @@ void wxWindowDFB::DoGetPosition(int *x, int *y) const static wxPoint GetScreenPosOfClientOrigin(const wxWindowDFB *win) { - wxCHECK_MSG( win, wxPoint(0, 0), _T("no window provided") ); + wxCHECK_MSG( win, wxPoint(0, 0), "no window provided" ); wxPoint pt(win->GetPosition() + win->GetClientAreaOrigin()); @@ -587,7 +525,7 @@ void wxWindowDFB::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); } } @@ -626,14 +564,6 @@ void wxWindowDFB::GetTextExtent(const wxString& string, // painting // --------------------------------------------------------------------------- -void wxWindowDFB::Clear() -{ - wxClientDC dc((wxWindow *)this); - wxBrush brush(GetBackgroundColour(), wxSOLID); - dc.SetBackground(brush); - dc.Clear(); -} - void wxWindowDFB::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect) { if ( !IsShown() || IsFrozen() ) @@ -673,7 +603,7 @@ void wxWindowDFB::DoRefreshWindow() void wxWindowDFB::DoRefreshRect(const wxRect& rect) { wxWindow *parent = GetParent(); - wxCHECK_RET( parent, _T("no parent") ); + wxCHECK_RET( parent, "no parent" ); // don't overlap outside of the window (NB: 'rect' is in window coords): wxRect r(rect); @@ -682,7 +612,7 @@ void wxWindowDFB::DoRefreshRect(const wxRect& rect) return; wxLogTrace(TRACE_PAINT, - _T("%p ('%s'): refresh rect [%i,%i,%i,%i]"), + "%p ('%s'): refresh rect [%i,%i,%i,%i]", this, GetName().c_str(), rect.x, rect.y, rect.GetRight(), rect.GetBottom()); @@ -707,28 +637,18 @@ void wxWindowDFB::Update() GetParent()->Update(); } -void wxWindowDFB::Freeze() -{ - m_frozenness++; -} - -void wxWindowDFB::Thaw() +void wxWindowDFB::DoThaw() { - wxASSERT_MSG( IsFrozen(), _T("Thaw() without matching Freeze()") ); - - if ( --m_frozenness == 0 ) - { - if ( IsShown() ) - DoRefreshWindow(); - } + if ( IsShown() ) + DoRefreshWindow(); } void wxWindowDFB::PaintWindow(const wxRect& rect) { - wxCHECK_RET( !IsFrozen() && IsShown(), _T("shouldn't be called") ); + wxCHECK_RET( !IsFrozen() && IsShown(), "shouldn't be called" ); wxLogTrace(TRACE_PAINT, - _T("%p ('%s'): painting region [%i,%i,%i,%i]"), + "%p ('%s'): painting region [%i,%i,%i,%i]", this, GetName().c_str(), rect.x, rect.y, rect.GetRight(), rect.GetBottom()); @@ -736,13 +656,14 @@ void wxWindowDFB::PaintWindow(const wxRect& rect) // FIXME_DFB: don't waste time rendering the area if it's fully covered // by some children, go directly to rendering the children + // (unless some child has HasTransparentBackground()=true!) // NB: unconditionally send wxEraseEvent, because our implementation of // wxWindow::Refresh() ignores the eraseBack argument wxWindowDC dc((wxWindow*)this); wxEraseEvent eventEr(m_windowId, &dc); eventEr.SetEventObject(this); - GetEventHandler()->ProcessEvent(eventEr); + HandleWindowEvent(eventEr); wxRect clientRect(GetClientRect()); @@ -751,11 +672,11 @@ void wxWindowDFB::PaintWindow(const wxRect& rect) { wxNcPaintEvent eventNc(GetId()); eventNc.SetEventObject(this); - GetEventHandler()->ProcessEvent(eventNc); + HandleWindowEvent(eventNc); } else { - wxLogTrace(TRACE_PAINT, _T("%p ('%s'): not sending wxNcPaintEvent"), + wxLogTrace(TRACE_PAINT, "%p ('%s'): not sending wxNcPaintEvent", this, GetName().c_str()); } @@ -764,11 +685,11 @@ void wxWindowDFB::PaintWindow(const wxRect& rect) { wxPaintEvent eventPt(GetId()); eventPt.SetEventObject(this); - GetEventHandler()->ProcessEvent(eventPt); + HandleWindowEvent(eventPt); } else { - wxLogTrace(TRACE_PAINT, _T("%p ('%s'): not sending wxPaintEvent"), + wxLogTrace(TRACE_PAINT, "%p ('%s'): not sending wxPaintEvent", this, GetName().c_str()); } @@ -819,7 +740,9 @@ void wxWindowDFB::PaintOverlays(const wxRect& rect) for ( wxDfbOverlaysList::const_iterator i = m_overlays->begin(); i != m_overlays->end(); ++i ) { - wxOverlayImpl *overlay = *i; + // FIXME: the cast is necessary for STL build where the iterator + // (incorrectly) returns void* and not wxOverlayImpl* + wxOverlayImpl *overlay = (wxOverlayImpl*) *i; wxRect orectOrig(overlay->GetRect()); wxRect orect(orectOrig); @@ -851,7 +774,7 @@ void wxWindowDFB::AddOverlay(wxOverlayImpl *overlay) void wxWindowDFB::RemoveOverlay(wxOverlayImpl *overlay) { - wxCHECK_RET( m_overlays, _T("no overlays to remove") ); + wxCHECK_RET( m_overlays, "no overlays to remove" ); m_overlays->Remove(overlay); @@ -1016,7 +939,7 @@ static long GetTranslatedKeyCode(DFBInputDeviceKeyIdentifier key_id) case DIKI_KEYDEF_END: case DIKI_NUMBER_OF_KEYS: - wxFAIL_MSG( _T("invalid key_id value") ); + wxFAIL_MSG( "invalid key_id value" ); return 0; } @@ -1064,8 +987,8 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_) const DFBWindowEvent& e = event_; wxLogTrace(TRACE_EVENTS, - _T("handling key %s event for window %p ('%s')"), - e.type == DWET_KEYUP ? _T("up") : _T("down"), + "handling key %s event for window %p ('%s')", + e.type == DWET_KEYUP ? "up" : "down", this, GetName().c_str()); // fill in wxKeyEvent fields: @@ -1092,7 +1015,7 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_) if ( e.type == DWET_KEYUP ) { event.SetEventType(wxEVT_KEY_UP); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); } else { @@ -1100,7 +1023,7 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_) event.SetEventType(wxEVT_KEY_DOWN); - if ( GetEventHandler()->ProcessEvent(event) ) + if ( HandleWindowEvent(event) ) return; // only send wxEVT_CHAR event if not processed yet: @@ -1108,7 +1031,7 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_) if ( event.m_keyCode != 0 ) { event.SetEventType(wxEVT_CHAR); - if ( GetEventHandler()->ProcessEvent(event) ) + if ( HandleWindowEvent(event) ) return; } @@ -1123,7 +1046,7 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_) // Ctrl-TAB changes the (parent) window, i.e. switch notebook page: navEvent.SetWindowChange(event.m_controlDown); navEvent.SetCurrentFocus(wxStaticCast(this, wxWindow)); - GetParent()->GetEventHandler()->ProcessEvent(navEvent); + GetParent()->HandleWindowEvent(navEvent); } } } @@ -1134,7 +1057,7 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_) void wxWindowDFB::OnInternalIdle() { - if (wxUpdateUIEvent::CanUpdate(this)) + if (wxUpdateUIEvent::CanUpdate(this) && IsShown()) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } @@ -1146,8 +1069,8 @@ wxWindow* wxFindWindowAtPointer(wxPoint& pt) return wxFindWindowAtPoint(pt = wxGetMousePosition()); } -wxWindow* wxFindWindowAtPoint(const wxPoint& pt) +wxWindow* wxFindWindowAtPoint(const wxPoint& WXUNUSED(pt)) { - wxFAIL_MSG( _T("wxFindWindowAtPoint not implemented") ); + wxFAIL_MSG( "wxFindWindowAtPoint not implemented" ); return NULL; }