supporting promised file urls for transfer, see #14281

[wxWidgets.git] / src / common / framecmn.cpp

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index fc61d4e9ae6c74746ee904e6fab8d02eb95bab7c..b303b53a366942bb8715c1acf13fddfec971bfb6 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -119,8 +119,10 @@ wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString(), 0 /*flags*/, \
 wxPROPERTY_FLAGS( WindowStyle, wxFrameStyle, long, SetWindowStyleFlag, \
                  GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
                  wxT("Helpstring"), wxT("group")) // style
 wxPROPERTY_FLAGS( WindowStyle, wxFrameStyle, long, SetWindowStyleFlag, \
                  GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
                  wxT("Helpstring"), wxT("group")) // style

+#if wxUSE_MENUS

 wxPROPERTY( MenuBar, wxMenuBar *, SetMenuBar, GetMenuBar, wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("Helpstring"), wxT("group"))
 wxPROPERTY( MenuBar, wxMenuBar *, SetMenuBar, GetMenuBar, wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("Helpstring"), wxT("group"))

+#endif

 wxEND_PROPERTIES_TABLE()
 
 wxEMPTY_HANDLERS_TABLE(wxFrame)
 wxEND_PROPERTIES_TABLE()
 
 wxEMPTY_HANDLERS_TABLE(wxFrame)


@@ -251,8 +253,7 @@ bool wxFrameBase::ProcessCommand(int id)
 
 bool wxFrameBase::ProcessCommand(wxMenuItem *item)
 {
 
 bool wxFrameBase::ProcessCommand(wxMenuItem *item)
 {

-    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, item->GetId());
-    commandEvent.SetEventObject(this);
+    wxCHECK_MSG( item, false, wxS("Menu item can't be NULL") );

 
     if (!item->IsEnabled())
         return true;
 
     if (!item->IsEnabled())
         return true;


@@ -260,19 +261,23 @@ bool wxFrameBase::ProcessCommand(wxMenuItem *item)
     if ((item->GetKind() == wxITEM_RADIO) && item->IsChecked() )
         return true;
 
     if ((item->GetKind() == wxITEM_RADIO) && item->IsChecked() )
         return true;
 

+    int checked;

     if (item->IsCheckable())
     {
         item->Toggle();
 
         // use the new value
     if (item->IsCheckable())
     {
         item->Toggle();
 
         // use the new value

-        commandEvent.SetInt(item->IsChecked());
+        checked = item->IsChecked();

     }
     else // Uncheckable item.
     {
     }
     else // Uncheckable item.
     {

-        commandEvent.SetInt(-1);
+        checked = -1;

     }
 
     }
 

-    return HandleWindowEvent(commandEvent);
+    wxMenu* const menu = item->GetMenu();
+    wxCHECK_MSG( menu, false, wxS("Menu item should be attached to a menu") );
+
+    return menu->SendEvent(item->GetId(), checked);

 }
 
 #endif // wxUSE_MENUS
 }
 
 #endif // wxUSE_MENUS