X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..76ed8f8d9c2b826d77d70b41c046decbde23da35:/src/gtk1/menu.cpp

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index a0c5707d0a..577e5fa2a4 100644
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -2,15 +2,14 @@
 // Name:        menu.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifdef __GNUG__
 #pragma implementation "menu.h"
+#pragma implementation "menuitem.h"
 #endif
 
 #include "wx/menu.h"
@@ -31,13 +30,9 @@ wxMenuBar::wxMenuBar()
 
   m_menus.DeleteContents( TRUE );
 
-  m_widget = gtk_handle_box_new();
-
   m_menubar = gtk_menu_bar_new();
-
-  gtk_container_add( GTK_CONTAINER(m_widget), m_menubar );
-
-  gtk_widget_show( m_menubar );
+  
+  m_widget = GTK_WIDGET(m_menubar);
 
   PostCreation();
 
@@ -150,7 +145,7 @@ bool wxMenuBar::Enabled( int id ) const
 }
 
 //-----------------------------------------------------------------------------
-// wxMenu
+// "activate"
 //-----------------------------------------------------------------------------
 
 static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
@@ -161,7 +156,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 
   if (!menu->IsEnabled(id)) return;
 
-  wxCommandEvent event( wxEVENT_TYPE_MENU_COMMAND, id );
+  wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
   event.SetEventObject( menu );
   event.SetInt(id );
   
@@ -177,6 +172,40 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
   if (win) win->GetEventHandler()->ProcessEvent( event );
 }
 
+//-----------------------------------------------------------------------------
+// "select"
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
+{
+  int id = menu->FindMenuIdByMenuItem(widget);
+
+  wxASSERT( id != -1 ); // should find it!
+
+  if (!menu->IsEnabled(id)) return;
+
+  wxCommandEvent event( wxEVT_MENU_HIGHLIGHT, id );
+  event.SetEventObject( menu );
+  event.SetInt(id );
+  
+/* wxMSW doesn't call callback here either
+  if (menu->m_callback)
+  {
+     (void) (*(menu->m_callback)) (*menu, event);
+     return;
+  }
+*/
+
+  if (menu->GetEventHandler()->ProcessEvent(event)) return;
+
+  wxWindow *win = menu->GetInvokingWindow();
+  if (win) win->GetEventHandler()->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// wxMenu
+//-----------------------------------------------------------------------------
+
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
 
 wxMenuItem::wxMenuItem()
@@ -202,7 +231,7 @@ void wxMenuItem::SetText(const wxString& str)
 
 void wxMenuItem::Check( bool check )
 {
-  wxCHECK_RET( IsCheckable(), _("Can't check uncheckable item!") )
+  wxCHECK_RET( IsCheckable(), "Can't check uncheckable item!" )
 
   m_isChecked = check;
   gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
@@ -233,8 +262,11 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
   m_items.DeleteContents( TRUE );
   m_invokingWindow = (wxWindow *) NULL;
   m_menu = gtk_menu_new();  // Do not show!
+  
   m_callback = func;
   m_eventHandler = this;
+  m_clientData = (void*) NULL;
+  
   if (m_title.IsNull()) m_title = "";
   if (m_title != "")
   {
@@ -283,6 +315,10 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
                       GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
                       (gpointer*)this );
 
+  gtk_signal_connect( GTK_OBJECT(menuItem), "select",
+                      GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
+                      (gpointer*)this );
+
   gtk_menu_append( GTK_MENU(m_menu), menuItem );
   gtk_widget_show( menuItem );
   m_items.Append( mitem );
@@ -410,8 +446,10 @@ wxMenuItem *wxMenu::FindItem(int id) const
     node = node->Next();
   }
 
-  wxLogDebug(_("wxMenu::FindItem: item %d not found."), id);
-
+  // Not finding anything here can be correct
+  // when search the entire menu system for
+  // an entry -> no error message.
+  
   return (wxMenuItem *) NULL;
 }