Added implementations for two cases of wxSystemSettingsNative::GetMetric to

[wxWidgets.git] / src / gtk1 / menu.cpp

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index a44c91e123ea73dc6d3beddc474e5bd16d734bb0..f4c539a1035812e5d54c4e075e61d8a48cc96776 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -729,6 +729,10 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         pm = pm->GetParent();
     }
 
         pm = pm->GetParent();
     }
 

+    // FIXME: why do we have to call wxFrame::GetEventHandler() directly here?
+    //        normally wxMenu::SendEvent() should be enough, if it doesn't work
+    //        in wxGTK then we have a bug in wxMenu::GetInvokingWindow() which
+    //        should be fixed instead of working around it here...

     if (frame)
     {
         // If it is attached then let the frame send the event.
     if (frame)
     {
         // If it is attached then let the frame send the event.


@@ -738,6 +742,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         commandEvent.SetEventObject(frame);
         if (item->IsCheckable())
             commandEvent.SetInt(item->IsChecked());
         commandEvent.SetEventObject(frame);
         if (item->IsCheckable())
             commandEvent.SetInt(item->IsChecked());

+        commandEvent.SetEventObject(menu);

 
         frame->GetEventHandler()->ProcessEvent(commandEvent);
     }
 
         frame->GetEventHandler()->ProcessEvent(commandEvent);
     }