Wait() doesn't cancel the thread any longer

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 941df0c8339b52ec27d6162cc1c5918c94edd818..dea54b9e727bbbea0e9c66aca0501ee1f6aa67a5 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -172,7 +172,8 @@ static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
     wxMenuEvent event( wxEVT_MENU_OPEN, -1 );
     event.SetEventObject( menu );
 
-    if (menu->GetEventHandler()->ProcessEvent(event))
+    wxEvtHandler* handler = menu->GetEventHandler();
+    if (handler && handler->ProcessEvent(event))
         return;
 
     wxWindow *win = menu->GetInvokingWindow();
@@ -375,7 +376,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
     buf << wxT('/') << str.c_str();
 
     // local buffer in multibyte form
-    char cbuf[400]; 
+    char cbuf[400];
     strcpy(cbuf, wxGTK_CONV(buf) );
 
     GtkItemFactoryEntry entry;
@@ -386,7 +387,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
     entry.item_type = (char *)"<Branch>";
 
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  // what is 2 ?
-    // in order to get the pointer to the item we need the item text _without_ underscores 
+    // in order to get the pointer to the item we need the item text _without_ underscores
     wxString tmp = wxT("<main>/");
     const wxChar *pc;
     for ( pc = str; *pc != wxT('\0'); pc++ )
@@ -493,10 +494,10 @@ static wxMenu *CopyMenu (wxMenu *menu)
         else
           menucopy->Append (itemid, text, CopyMenu(submenu),
                             menu->GetHelpString(itemid));
-    
+
         node = node->GetNext();
     }
-  
+
     return menucopy;
 }
 
@@ -706,7 +707,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
     if (item->IsCheckable())
     {
         bool isReallyChecked = item->IsChecked(),
-             isInternallyChecked = item->wxMenuItemBase::IsChecked();
+            isInternallyChecked = item->wxMenuItemBase::IsChecked();
 
         // ensure that the internal state is always consistent with what is
         // shown on the screen
@@ -719,11 +720,36 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         {
             return;
         }
+    }
+
 
-        // the user pressed on the menu item: report the event below
+    // Is this menu on a menubar?  (possibly nested)
+    wxFrame* frame = NULL;
+    wxMenu*  pm = menu;
+    while ( pm && !frame )
+    {
+        if ( pm->IsAttached() )
+            frame = pm->GetMenuBar()->GetFrame();
+        pm = pm->GetParent();
     }
 
-    menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
+    if (frame)
+    {
+        // If it is attached then let the frame send the event.
+        // Don't call frame->ProcessCommand(id) because it toggles
+        // checkable items and we've already done that above.
+        wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+        commandEvent.SetEventObject(frame);
+        if (item->IsCheckable())
+            commandEvent.SetInt(item->IsChecked());
+
+        frame->GetEventHandler()->ProcessEvent(commandEvent);
+    }
+    else
+    {
+        // otherwise let the menu have it
+        menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -744,7 +770,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
     event.SetEventObject( menu );
 
-    if (menu->GetEventHandler()->ProcessEvent(event))
+    wxEvtHandler* handler = menu->GetEventHandler();
+    if (handler && handler->ProcessEvent(event))
         return;
 
     wxWindow *win = menu->GetInvokingWindow();
@@ -769,7 +796,8 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
     wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
     event.SetEventObject( menu );
 
-    if (menu->GetEventHandler()->ProcessEvent(event))
+    wxEvtHandler* handler = menu->GetEventHandler();
+    if (handler && handler->ProcessEvent(event))
         return;
 
     wxWindow *win = menu->GetInvokingWindow();
@@ -861,10 +889,10 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
             // "&" is doubled to indicate "&" instead of accelerator
             continue;
         }
-        
+
         label += *pc;
     }
-    
+
     // wxPrintf( L"text %s label %s\n", text.c_str(), label.c_str() );
 
     return label;
@@ -879,7 +907,7 @@ void wxMenuItem::SetText( const wxString& str )
     wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t'));
     if (oldLabel == label1)
         return;
-    
+
     DoSetText(str);
 
     if (m_menuItem)
@@ -898,7 +926,7 @@ void wxMenuItem::SetText( const wxString& str )
             if (m_text[n] != wxT('\\'))
                 tmp += m_text[n];
         }
-        
+
         gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(tmp) );
 #else
         // set new text
@@ -958,9 +986,9 @@ void wxMenuItem::DoSetText( const wxString& str )
         }
         ++pc;
     }
-    
+
     // wxPrintf( L"str %s m_text %s\n", str.c_str(), m_text.c_str() );
-    
+
     m_hotKey = wxT("");
 
     if(*pc == wxT('\t'))
@@ -1096,7 +1124,8 @@ wxMenu::~wxMenu()
 {
    m_items.Clear();
 
-   gtk_widget_destroy( m_menu );
+   if ( GTK_IS_WIDGET( m_menu ))
+       gtk_widget_destroy( m_menu );
 
    gtk_object_unref( GTK_OBJECT(m_factory) );
 }
@@ -1169,16 +1198,36 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         GtkWidget *label = gtk_accel_label_new ( wxGTK_CONV( text ) );
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_container_add (GTK_CONTAINER (menuItem), label);
-        guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
         gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem);
+        guint accel_key;
+        GdkModifierType accel_mods;
+
+        // accelerator for the item, as specified by its label
+        // (ex. Ctrl+O for open)
+        gtk_accelerator_parse(GetHotKey(*mitem).c_str(),
+                              &accel_key, &accel_mods);
+        if (accel_key != GDK_VoidSymbol)
+        {
+            gtk_widget_add_accelerator (menuItem,
+                                        "activate_item",
+                                        gtk_menu_get_accel_group(
+                                            GTK_MENU(m_menu)),
+                                        accel_key, accel_mods,
+                                        GTK_ACCEL_VISIBLE);
+        }
+
+        // accelerator for the underlined char (ex ALT+F for the File menu)
+        accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
         if (accel_key != GDK_VoidSymbol)
         {
             gtk_widget_add_accelerator (menuItem,
                                         "activate_item",
-                                        gtk_menu_ensure_uline_accel_group (GTK_MENU (m_menu)),
+                                        gtk_menu_ensure_uline_accel_group (
+                                            GTK_MENU (m_menu)),
                                         accel_key, 0,
                                         GTK_ACCEL_LOCKED);
         }
+
         gtk_widget_show (label);
 
         mitem->SetLabelWidget(label);
@@ -1190,8 +1239,9 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
                             GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
                             (gpointer)this );
-                            
+
         gtk_menu_append( GTK_MENU(m_menu), menuItem );
+
         gtk_widget_show( menuItem );
 
         appended = TRUE; // We've done this, don't do it again
@@ -1276,7 +1326,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
 
         wxString path( mitem->GetFactoryPath() );
         menuItem = gtk_item_factory_get_widget( m_factory, wxGTK_CONV( path ) );
-        
+
         if (!menuItem)
             wxLogError( wxT("Wrong menu path: %s\n"), path.c_str() );
     }
@@ -1284,7 +1334,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
     if ( !mitem->IsSeparator() )
     {
         wxASSERT_MSG( menuItem, wxT("invalid menuitem") );
-    
+
         gtk_signal_connect( GTK_OBJECT(menuItem), "select",
                             GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
                             (gpointer)this );