Initial copy of Scintilla 3.21 code

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

diff --git a/src/dfb/toplevel.cpp b/src/dfb/toplevel.cpp
index c8c36de1f16acb34b47c367a6207059f23719d06..8a5ef12fa92229a3a218421206f911fcd432c47d 100644 (file)
--- a/src/dfb/toplevel.cpp
+++ b/src/dfb/toplevel.cpp
@@ -19,7 +19,7 @@
 
 #include "wx/dfb/private.h"
 
-#define TRACE_EVENTS _T("events")
+#define TRACE_EVENTS "events"
 
 // ============================================================================
 // wxTopLevelWindowDFB
@@ -74,7 +74,6 @@ bool wxTopLevelWindowDFB::Create(wxWindow *parent,
 // showing and hiding
 // ----------------------------------------------------------------------------
 
-#warning "FIXME: the rest of this file is almost same as for MGL, merge it"
 bool wxTopLevelWindowDFB::ShowFullScreen(bool show, long style)
 {
     if ( show == m_fsIsShowing )
@@ -179,13 +178,13 @@ void wxTopLevelWindowDFB::HandleFocusEvent(const wxDFBWindowEvent& event_)
     const bool activate = (dfbevent.type == DWET_GOTFOCUS);
 
     wxLogTrace(TRACE_EVENTS,
-               _T("toplevel window %p ('%s') %s focus"),
+               "toplevel window %p ('%s') %s focus",
                this, GetName(),
-               activate ? _T("got") : _T("lost"));
+               activate ? "got" : "lost");
 
     wxActivateEvent event(wxEVT_ACTIVATE, activate, GetId());
     event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);
 
     // if a frame that doesn't have wx focus inside it just got focus, we
     // need to set focus to it (or its child):
@@ -195,11 +194,13 @@ void wxTopLevelWindowDFB::HandleFocusEvent(const wxDFBWindowEvent& event_)
         if ( !focused || focused->GetTLW() != this )
         {
             wxLogTrace(TRACE_EVENTS,
-                       _T("setting wx focus to toplevel window %p ('%s')"),
+                       "setting wx focus to toplevel window %p ('%s')",
                        this, GetName());
 
             if ( CanAcceptFocus() )
                 SetFocus();
+            else
+                wxLogTrace(TRACE_EVENTS, "...which doesn't accept it");
         }
     }
 }