Merge in from trunk r64802 - r68625

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

diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp
index 2470e530ba6d6bd99c3fa50c28255766b7a16d31..06d9619065829f111624b5b7ad1acaa45ac34b02 100644 (file)
--- a/src/dfb/window.cpp
+++ b/src/dfb/window.cpp
@@ -72,6 +72,15 @@ IMPLEMENT_ABSTRACT_CLASS(wxWindowDFB, wxWindowBase)
 BEGIN_EVENT_TABLE(wxWindowDFB, wxWindowBase)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxWindowDFB, wxWindowBase)
 END_EVENT_TABLE()
 

+//-----------------------------------------------------------------------------
+// global functions
+//-----------------------------------------------------------------------------
+
+wxWindow *wxGetActiveWindow()
+{
+    return wxWindow::FindFocus();
+}
+

 // ----------------------------------------------------------------------------
 // constructors and such
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constructors and such
 // ----------------------------------------------------------------------------


@@ -79,7 +88,6 @@ END_EVENT_TABLE()
 void wxWindowDFB::Init()
 {
     m_isShown = true;
 void wxWindowDFB::Init()
 {
     m_isShown = true;

-    m_frozenness = 0;

     m_tlw = NULL;
     m_overlays = NULL;
 }
     m_tlw = NULL;
     m_overlays = NULL;
 }


@@ -89,8 +97,6 @@ wxWindowDFB::~wxWindowDFB()
 {
     SendDestroyEvent();
 
 {
     SendDestroyEvent();
 

-    m_isBeingDeleted = true;
-

     if ( gs_mouseCapture == this )
         ReleaseMouse();
 
     if ( gs_mouseCapture == this )
         ReleaseMouse();
 


@@ -206,12 +212,12 @@ void wxWindowDFB::SetFocus()
     // notify the parent keeping track of focus for the kbd navigation
     // purposes that we got it
     wxChildFocusEvent eventFocus((wxWindow*)this);
     // 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);
 
     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
 
 #if wxUSE_CARET
     // caret needs to be informed about focus change


@@ -241,7 +247,7 @@ void wxWindowDFB::DFBKillFocus()
     wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
     event.SetEventObject(this);
     event.SetWindow(gs_toBeFocusedWindow);
     wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
     event.SetEventObject(this);
     event.SetWindow(gs_toBeFocusedWindow);

-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);

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


@@ -317,7 +323,7 @@ bool wxWindowDFB::SetCursor(const wxCursor& cursor)
 
 #warning "implement this"
 #if 0
 
 #warning "implement this"
 #if 0

-    if ( m_cursor.Ok() )
+    if ( m_cursor.IsOk() )

         DFB_wmSetWindowCursor(m_wnd, *m_cursor.GetDFBCursor());
     else
         DFB_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetDFBCursor());
         DFB_wmSetWindowCursor(m_wnd, *m_cursor.GetDFBCursor());
     else
         DFB_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetDFBCursor());


@@ -526,7 +532,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);
         wxSize newSize(width, height);
         wxSizeEvent event(newSize, GetId());
         event.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);

     }
 }
 
     }
 }
 


@@ -551,10 +557,11 @@ int wxWindowDFB::GetCharWidth() const
     return dc.GetCharWidth();
 }
 
     return dc.GetCharWidth();
 }
 

-void wxWindowDFB::GetTextExtent(const wxString& string,
-                             int *x, int *y,
-                             int *descent, int *externalLeading,
-                             const wxFont *theFont) const
+void wxWindowDFB::DoGetTextExtent(const wxString& string,
+                                  int *x, int *y,
+                                  int *descent,
+                                  int *externalLeading,
+                                  const wxFont *theFont) const

 {
     wxWindowDC dc((wxWindow*)this);
     dc.GetTextExtent(string, x, y, descent, externalLeading, (wxFont*)theFont);
 {
     wxWindowDC dc((wxWindow*)this);
     dc.GetTextExtent(string, x, y, descent, externalLeading, (wxFont*)theFont);


@@ -565,14 +572,6 @@ void wxWindowDFB::GetTextExtent(const wxString& string,
 // painting
 // ---------------------------------------------------------------------------
 
 // 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() )
 void wxWindowDFB::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
 {
     if ( !IsShown() || IsFrozen() )


@@ -646,20 +645,10 @@ void wxWindowDFB::Update()
     GetParent()->Update();
 }
 
     GetParent()->Update();
 }
 

-void wxWindowDFB::Freeze()
-{
-    m_frozenness++;
-}
-
-void wxWindowDFB::Thaw()
+void wxWindowDFB::DoThaw()

 {
 {

-    wxASSERT_MSG( IsFrozen(), "Thaw() without matching Freeze()" );
-
-    if ( --m_frozenness == 0 )
-    {
-        if ( IsShown() )
-            DoRefreshWindow();
-    }
+    if ( IsShown() )
+        DoRefreshWindow();

 }
 
 void wxWindowDFB::PaintWindow(const wxRect& rect)
 }
 
 void wxWindowDFB::PaintWindow(const wxRect& rect)


@@ -682,7 +671,7 @@ void wxWindowDFB::PaintWindow(const wxRect& rect)
     wxWindowDC dc((wxWindow*)this);
     wxEraseEvent eventEr(m_windowId, &dc);
     eventEr.SetEventObject(this);
     wxWindowDC dc((wxWindow*)this);
     wxEraseEvent eventEr(m_windowId, &dc);
     eventEr.SetEventObject(this);

-    GetEventHandler()->ProcessEvent(eventEr);
+    HandleWindowEvent(eventEr);

 
     wxRect clientRect(GetClientRect());
 
 
     wxRect clientRect(GetClientRect());
 


@@ -691,7 +680,7 @@ void wxWindowDFB::PaintWindow(const wxRect& rect)
     {
         wxNcPaintEvent eventNc(GetId());
         eventNc.SetEventObject(this);
     {
         wxNcPaintEvent eventNc(GetId());
         eventNc.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(eventNc);
+        HandleWindowEvent(eventNc);

     }
     else
     {
     }
     else
     {


@@ -704,7 +693,7 @@ void wxWindowDFB::PaintWindow(const wxRect& rect)
     {
         wxPaintEvent eventPt(GetId());
         eventPt.SetEventObject(this);
     {
         wxPaintEvent eventPt(GetId());
         eventPt.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(eventPt);
+        HandleWindowEvent(eventPt);

     }
     else
     {
     }
     else
     {


@@ -759,9 +748,7 @@ void wxWindowDFB::PaintOverlays(const wxRect& rect)
     for ( wxDfbOverlaysList::const_iterator i = m_overlays->begin();
           i != m_overlays->end(); ++i )
     {
     for ( wxDfbOverlaysList::const_iterator i = m_overlays->begin();
           i != m_overlays->end(); ++i )
     {

-        // FIXME: the cast is necessary for STL build where the iterator
-        //        (incorrectly) returns void* and not wxOverlayImpl*
-        wxOverlayImpl *overlay = (wxOverlayImpl*) *i;
+        const wxOverlayImpl * const overlay = *i;

 
         wxRect orectOrig(overlay->GetRect());
         wxRect orect(orectOrig);
 
         wxRect orectOrig(overlay->GetRect());
         wxRect orect(orectOrig);


@@ -814,7 +801,7 @@ void wxWindowDFB::RemoveOverlay(wxOverlayImpl *overlay)
 #define KEY(dfb, wx)                                                \
     case dfb:                                                       \
           wxLogTrace(TRACE_EVENTS,                                  \
 #define KEY(dfb, wx)                                                \
     case dfb:                                                       \
           wxLogTrace(TRACE_EVENTS,                                  \

-                     _T("key " #dfb " mapped to " #wx));            \
+                     wxT("key " #dfb " mapped to " #wx));            \

           return wx
 
 // returns translated keycode, i.e. the one for KEYUP/KEYDOWN where 'a'..'z' is
           return wx
 
 // returns translated keycode, i.e. the one for KEYUP/KEYDOWN where 'a'..'z' is


@@ -980,13 +967,11 @@ static long GetUntraslatedKeyCode(DFBInputDeviceKeyIdentifier key_id,
                 return key_symbol;
             else
             {
                 return key_symbol;
             else
             {

-#if wxUSE_WCHAR_T

                 wchar_t chr = key_symbol;
                 wxCharBuffer buf(wxConvUI->cWC2MB(&chr, 1, NULL));
                 if ( buf )
                     return *buf; // may be 0 if failed
                 else
                 wchar_t chr = key_symbol;
                 wxCharBuffer buf(wxConvUI->cWC2MB(&chr, 1, NULL));
                 if ( buf )
                     return *buf; // may be 0 if failed
                 else

-#endif // wxUSE_WCHAR_T

                     return 0;
             }
 #endif
                     return 0;
             }
 #endif


@@ -1016,7 +1001,6 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_)
     event.SetTimestamp(wxDFB_EVENT_TIMESTAMP(e));
     event.m_rawCode = e.key_code;
     event.m_keyCode = GetTranslatedKeyCode(e.key_id);
     event.SetTimestamp(wxDFB_EVENT_TIMESTAMP(e));
     event.m_rawCode = e.key_code;
     event.m_keyCode = GetTranslatedKeyCode(e.key_id);

-    event.m_scanCode = 0; // not used by wx at all

 #if wxUSE_UNICODE
     event.m_uniChar = e.key_symbol;
 #endif
 #if wxUSE_UNICODE
     event.m_uniChar = e.key_symbol;
 #endif


@@ -1034,7 +1018,7 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_)
     if ( e.type == DWET_KEYUP )
     {
         event.SetEventType(wxEVT_KEY_UP);
     if ( e.type == DWET_KEYUP )
     {
         event.SetEventType(wxEVT_KEY_UP);

-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);

     }
     else
     {
     }
     else
     {


@@ -1042,7 +1026,7 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_)
 
         event.SetEventType(wxEVT_KEY_DOWN);
 
 
         event.SetEventType(wxEVT_KEY_DOWN);
 

-        if ( GetEventHandler()->ProcessEvent(event) )
+        if ( HandleWindowEvent(event) )

             return;
 
         // only send wxEVT_CHAR event if not processed yet:
             return;
 
         // only send wxEVT_CHAR event if not processed yet:


@@ -1050,7 +1034,7 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_)
         if ( event.m_keyCode != 0 )
         {
             event.SetEventType(wxEVT_CHAR);
         if ( event.m_keyCode != 0 )
         {
             event.SetEventType(wxEVT_CHAR);

-            if ( GetEventHandler()->ProcessEvent(event) )
+            if ( HandleWindowEvent(event) )

                 return;
         }
 
                 return;
         }
 


@@ -1065,22 +1049,11 @@ 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));
             // 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);

         }
     }
 }
 
         }
     }
 }
 

-// ---------------------------------------------------------------------------
-// idle events processing
-// ---------------------------------------------------------------------------
-
-void wxWindowDFB::OnInternalIdle()
-{
-    if (wxUpdateUIEvent::CanUpdate(this) && IsShown())
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-
-

 // Find the wxWindow at the current mouse position, returning the mouse
 // position.
 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 // Find the wxWindow at the current mouse position, returning the mouse
 // position.
 wxWindow* wxFindWindowAtPointer(wxPoint& pt)


@@ -1088,7 +1061,7 @@ wxWindow* wxFindWindowAtPointer(wxPoint& pt)
     return wxFindWindowAtPoint(pt = wxGetMousePosition());
 }
 
     return wxFindWindowAtPoint(pt = wxGetMousePosition());
 }
 

-wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+wxWindow* wxFindWindowAtPoint(const wxPoint& WXUNUSED(pt))

 {
     wxFAIL_MSG( "wxFindWindowAtPoint not implemented" );
     return NULL;
 {
     wxFAIL_MSG( "wxFindWindowAtPoint not implemented" );
     return NULL;