Added test.xpm generated from horse.png, for compilation.

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 9465c44a378a383f53706f05cd390a58e4f4d2a6..974d8ae066756d88e2a2d05930f2219141bf9e26 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -2,9 +2,8 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -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;