"make depend" finally seems to work (thanks to Kristján Jónsson)

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 9465c44a378a383f53706f05cd390a58e4f4d2a6..d01b340ad2fe35917bd47762db890d8b58107f2e 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/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();
 
@@ -193,11 +188,13 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
   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;
 
@@ -446,8 +443,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;
 }