Added support for SCROLL_TOP and _BOTTOM events

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 9465c44a378a383f53706f05cd390a58e4f4d2a6..577e5fa2a436508fc626080fc0afbdbfa4da03a6 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -2,15 +2,14 @@
 // Name:        menu.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        menu.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97

 // Id:          $Id$
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifdef __GNUG__
 #pragma implementation "menu.h"
 #ifdef __GNUG__
 #pragma implementation "menu.h"

+#pragma implementation "menuitem.h"

 #endif
 
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"


@@ -31,13 +30,9 @@ wxMenuBar::wxMenuBar()
 
   m_menus.DeleteContents( TRUE );
 
 
   m_menus.DeleteContents( TRUE );
 

-  m_widget = gtk_handle_box_new();
-

   m_menubar = gtk_menu_bar_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();
 
 
   PostCreation();
 


@@ -193,11 +188,13 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
   event.SetEventObject( menu );
   event.SetInt(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->m_callback)
   {
      (void) (*(menu->m_callback)) (*menu, event);
      return;
   }

+*/

 
   if (menu->GetEventHandler()->ProcessEvent(event)) return;
 
 
   if (menu->GetEventHandler()->ProcessEvent(event)) return;
 


@@ -265,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_items.DeleteContents( TRUE );
   m_invokingWindow = (wxWindow *) NULL;
   m_menu = gtk_menu_new();  // Do not show!

+  

   m_callback = func;
   m_eventHandler = this;
   m_callback = func;
   m_eventHandler = this;

+  m_clientData = (void*) NULL;
+  

   if (m_title.IsNull()) m_title = "";
   if (m_title != "")
   {
   if (m_title.IsNull()) m_title = "";
   if (m_title != "")
   {


@@ -446,8 +446,10 @@ wxMenuItem *wxMenu::FindItem(int id) const
     node = node->Next();
   }
 
     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;
 }
 
   return (wxMenuItem *) NULL;
 }