Changed the focus-window event handling back

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 163b00a160bcd53898ace9095e5e70f9d6f7af60..591382e1879e6eb060c3db0d720a32892ce68d84 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -31,20 +31,17 @@ void wxFrame::DoMenuUpdates()
 {
   wxMenuBar* bar = GetMenuBar();
 
 {
   wxMenuBar* bar = GetMenuBar();
 

-  // Process events starting with the window with the focus, if any.
-  wxWindow* focusWin = wxFindFocusDescendant(this);
-

   if ( bar != NULL ) {
     int nCount = bar->GetMenuCount();
     for (int n = 0; n < nCount; n++)
   if ( bar != NULL ) {
     int nCount = bar->GetMenuCount();
     for (int n = 0; n < nCount; n++)

-      DoMenuUpdates(bar->GetMenu(n), focusWin);
+      DoMenuUpdates(bar->GetMenu(n), (wxWindow*) NULL);

   }
 }
 
 // update a menu and all submenus recursively
   }
 }
 
 // update a menu and all submenus recursively

-void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin)
+void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin))

 {
 {

-  wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();
+  wxEvtHandler* evtHandler = GetEventHandler();

   wxNode* node = menu->GetItems().First();
   while (node)
   {
   wxNode* node = menu->GetItems().First();
   while (node)
   {


@@ -66,7 +63,7 @@ void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin)
       }
 
       if (item->GetSubMenu())
       }
 
       if (item->GetSubMenu())

-        DoMenuUpdates(item->GetSubMenu(), focusWin);
+        DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);

     }
     node = node->Next();
   }
     }
     node = node->Next();
   }

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 77034f80a42b2f67c67577b7818e4750f988903b..793ef3787b7b24cb7353328980a363680e52e4e9 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -149,28 +149,6 @@ bool wxToolBarBase::OnLeftClick(int toolIndex, bool toggleDown)
     event.SetEventObject(this);
     event.SetExtraLong((long) toggleDown);
 
     event.SetEventObject(this);
     event.SetExtraLong((long) toggleDown);
 

-    // First try sending the command to a window that has the focus, within a frame that
-    // also contains this toolbar.
-    wxFrame* frame = (wxFrame*) NULL;
-    wxWindow* win = this;
-    wxWindow* focusWin = (wxWindow*) NULL;
-
-    while (win)
-    {
-        if (win->IsKindOf(CLASSINFO(wxFrame)))
-        {
-            frame = (wxFrame*) win;
-            break;
-        }
-        else
-            win = win->GetParent();
-    }
-    if (frame)
-        focusWin = wxFindFocusDescendant(frame);
-
-    if (focusWin && focusWin->GetEventHandler()->ProcessEvent(event))
-        return TRUE;
-

     // Send events to this toolbar instead (and thence up the window hierarchy)
     GetEventHandler()->ProcessEvent(event);
 
     // Send events to this toolbar instead (and thence up the window hierarchy)
     GetEventHandler()->ProcessEvent(event);
 


@@ -757,27 +735,7 @@ void wxToolBarBase::OnIdle(wxIdleEvent& event)
 // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
 void wxToolBarBase::DoToolbarUpdates()
 {
 // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
 void wxToolBarBase::DoToolbarUpdates()
 {

-    // First try sending the command to a window that has the focus, within a frame that
-    // also contains this toolbar.
-    wxFrame* frame = (wxFrame*) NULL;
-    wxWindow* win = this;
-    wxWindow* focusWin = (wxWindow*) NULL;
-
-    while (win)
-    {
-        if (win->IsKindOf(CLASSINFO(wxFrame)))
-        {
-            frame = (wxFrame*) win;
-            break;
-        }
-        else
-            win = win->GetParent();
-    }
-    if (frame)
-        focusWin = wxFindFocusDescendant(frame);
-
-
-    wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler() ;
+    wxEvtHandler* evtHandler = GetEventHandler() ;

 
     wxNode* node = GetTools().First();
     while (node)
 
     wxNode* node = GetTools().First();
     while (node)

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index a21759384760a106f2a00800b56e3a3dab034aae..c018c5b1637979b8f07d53bef6296fe7cd5d804e 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -655,10 +655,7 @@ void wxFrame::Command( int id )
         bar->Check(id,!bar->Checked(id)) ;
     }
 
         bar->Check(id,!bar->Checked(id)) ;
     }
 

-    // Process events starting with the window with the focus, if any.
-    wxWindow* focusWin = wxFindFocusDescendant(this);
-
-    wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();
+    wxEvtHandler* evtHandler = GetEventHandler();

 
     evtHandler->ProcessEvent(commandEvent);
 }
 
     evtHandler->ProcessEvent(commandEvent);
 }

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 3523a06f3ba1a8b391124a36878f304cbb7cbbf3..7f7d9cbc8b20df49a486f3d6312a7d7ea5139cc5 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -169,28 +169,6 @@ bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown )
     event.SetInt( toolIndex );
     event.SetExtraLong((long) toggleDown);
 
     event.SetInt( toolIndex );
     event.SetExtraLong((long) toggleDown);
 

-    // First try sending the command to a window that has the focus, within a frame that
-    // also contains this toolbar.
-    wxFrame* frame = (wxFrame*) NULL;
-    wxWindow* win = this;
-    wxWindow* focusWin = (wxWindow*) NULL;
-
-    while (win)
-    {
-        if (win->IsKindOf(CLASSINFO(wxFrame)))
-        {
-            frame = (wxFrame*) win;
-            break;
-        }
-        else
-            win = win->GetParent();
-    }
-    if (frame)
-        focusWin = wxFindFocusDescendant(frame);
-
-    if (focusWin && focusWin->GetEventHandler()->ProcessEvent(event))
-        return TRUE;
-

     GetEventHandler()->ProcessEvent(event);
 
     return TRUE;
     GetEventHandler()->ProcessEvent(event);
 
     return TRUE;

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index a21759384760a106f2a00800b56e3a3dab034aae..c018c5b1637979b8f07d53bef6296fe7cd5d804e 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -655,10 +655,7 @@ void wxFrame::Command( int id )
         bar->Check(id,!bar->Checked(id)) ;
     }
 
         bar->Check(id,!bar->Checked(id)) ;
     }
 

-    // Process events starting with the window with the focus, if any.
-    wxWindow* focusWin = wxFindFocusDescendant(this);
-
-    wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();
+    wxEvtHandler* evtHandler = GetEventHandler();

 
     evtHandler->ProcessEvent(commandEvent);
 }
 
     evtHandler->ProcessEvent(commandEvent);
 }

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 3523a06f3ba1a8b391124a36878f304cbb7cbbf3..7f7d9cbc8b20df49a486f3d6312a7d7ea5139cc5 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -169,28 +169,6 @@ bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown )
     event.SetInt( toolIndex );
     event.SetExtraLong((long) toggleDown);
 
     event.SetInt( toolIndex );
     event.SetExtraLong((long) toggleDown);
 

-    // First try sending the command to a window that has the focus, within a frame that
-    // also contains this toolbar.
-    wxFrame* frame = (wxFrame*) NULL;
-    wxWindow* win = this;
-    wxWindow* focusWin = (wxWindow*) NULL;
-
-    while (win)
-    {
-        if (win->IsKindOf(CLASSINFO(wxFrame)))
-        {
-            frame = (wxFrame*) win;
-            break;
-        }
-        else
-            win = win->GetParent();
-    }
-    if (frame)
-        focusWin = wxFindFocusDescendant(frame);
-
-    if (focusWin && focusWin->GetEventHandler()->ProcessEvent(event))
-        return TRUE;
-

     GetEventHandler()->ProcessEvent(event);
 
     return TRUE;
     GetEventHandler()->ProcessEvent(event);
 
     return TRUE;

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 2e3f2f78a1f7481cd68f9068c43a5a1a81bea4e7..98682e8b99defa62b39391b4477aae73f1b5cb21 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -869,10 +869,7 @@ void wxFrame::ProcessCommand(int id)
   }
 */
 
   }
 */
 

-  // Process events starting with the window with the focus, if any.
-  wxWindow* focusWin = wxFindFocusDescendant(this);
-
-  wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();
+  wxEvtHandler* evtHandler = GetEventHandler();

 
   evtHandler->ProcessEvent(commandEvent);
 }
 
   evtHandler->ProcessEvent(commandEvent);
 }

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 4cfcc231d62617c3ed3db05836b17f4dbe97fbdc..a96d6d99b677ab84d197dcbfa5030b6288664b25 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -917,10 +917,14 @@ void wxFrame::ProcessCommand(int id)
     bar->Check(id,!bar->Checked(id)) ;
   }
 
     bar->Check(id,!bar->Checked(id)) ;
   }
 

+/*

   // Process events starting with the window with the focus, if any.
   wxWindow* focusWin = wxFindFocusDescendant(this);
 
   wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();
   // Process events starting with the window with the focus, if any.
   wxWindow* focusWin = wxFindFocusDescendant(this);
 
   wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();

+*/
+
+  wxEvtHandler* evtHandler = GetEventHandler();

   evtHandler->ProcessEvent(commandEvent);
 }
 
   evtHandler->ProcessEvent(commandEvent);
 }
 

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 1d685d63149a808ba0f572eae8f63475fef495d5..84e6b7303acd15a6b21815e8e56f72bde9710590 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -191,6 +191,7 @@ MSWOBJS = \
   ..\msw\$D\dib.obj \
   ..\msw\$D\dibutils.obj \
   ..\msw\$D\dirdlg.obj \
   ..\msw\$D\dib.obj \
   ..\msw\$D\dibutils.obj \
   ..\msw\$D\dirdlg.obj \

+  ..\msw\$D\dragimag.obj \

   ..\msw\$D\filedlg.obj \
   ..\msw\$D\font.obj \
   ..\msw\$D\fontdlg.obj \
   ..\msw\$D\filedlg.obj \
   ..\msw\$D\font.obj \
   ..\msw\$D\fontdlg.obj \

diff --git a/src/stubs/frame.cpp b/src/stubs/frame.cpp
index 48ff977bdadc75d5ba9fbfb25a25efe40bac4422..0a15c650aff7e784c60b0e3c5e6dbc4cde816f30 100644 (file)
--- a/src/stubs/frame.cpp
+++ b/src/stubs/frame.cpp
@@ -451,11 +451,7 @@ void wxFrame::ProcessCommand(int id)
   }
 */
 
   }
 */
 

-  // Process events starting with the window with the focus, if any.
-  wxWindow* focusWin = wxFindFocusDescendant(this);
-
-  wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();
-
+  wxEvtHandler* evtHandler = GetEventHandler();

   evtHandler->ProcessEvent(commandEvent);
 }
 
   evtHandler->ProcessEvent(commandEvent);
 }