Fixed module code

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 39204142f1e4910a7278ae0d1c658c8d7a983363..577e5fa2a436508fc626080fc0afbdbfa4da03a6 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/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"


@@ -27,17 +26,13 @@ wxMenuBar::wxMenuBar()
 {
   m_needParent = FALSE; // hmmm
 
 {
   m_needParent = FALSE; // hmmm
 

-  PreCreation( NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+  PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );

 
   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();
 


@@ -150,7 +145,7 @@ bool wxMenuBar::Enabled( int id ) const
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxMenu
+// "activate"

 //-----------------------------------------------------------------------------
 
 static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 //-----------------------------------------------------------------------------
 
 static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )


@@ -161,15 +156,45 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 
   if (!menu->IsEnabled(id)) return;
 
 
   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 );
+  
+  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 );
+}
+
+//-----------------------------------------------------------------------------
+// "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 );
   
   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;
 


@@ -177,6 +202,10 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
   if (win) win->GetEventHandler()->ProcessEvent( event );
 }
 
   if (win) win->GetEventHandler()->ProcessEvent( event );
 }
 

+//-----------------------------------------------------------------------------
+// wxMenu
+//-----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
 
 wxMenuItem::wxMenuItem()
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
 
 wxMenuItem::wxMenuItem()


@@ -185,8 +214,8 @@ wxMenuItem::wxMenuItem()
   m_isCheckMenu = FALSE;
   m_isChecked = FALSE;
   m_isEnabled = TRUE;
   m_isCheckMenu = FALSE;
   m_isChecked = FALSE;
   m_isEnabled = TRUE;

-  m_subMenu = NULL;
-  m_menuItem = NULL;
+  m_subMenu = (wxMenu *) NULL;
+  m_menuItem = (GtkWidget *) NULL;

 }
 
 void wxMenuItem::SetText(const wxString& str)
 }
 
 void wxMenuItem::SetText(const wxString& str)


@@ -202,7 +231,7 @@ void wxMenuItem::SetText(const wxString& str)
 
 void wxMenuItem::Check( bool check )
 {
 
 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 );
 
   m_isChecked = check;
   gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );


@@ -231,10 +260,13 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
 {
   m_title = title;
   m_items.DeleteContents( TRUE );
 {
   m_title = title;
   m_items.DeleteContents( TRUE );

-  m_invokingWindow = NULL;
+  m_invokingWindow = (wxWindow *) NULL;

   m_menu = gtk_menu_new();  // Do not show!
   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 != "")
   {


@@ -243,6 +275,17 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
   }
 }
 
   }
 }
 

+void wxMenu::SetTitle( const wxString& title )
+{
+  // Waiting for something better.
+  m_title = title;
+}
+
+const wxString wxMenu::GetTitle() const
+{
+  return m_title;
+}
+

 void wxMenu::AppendSeparator()
 {
   wxMenuItem *mitem = new wxMenuItem();
 void wxMenu::AppendSeparator()
 {
   wxMenuItem *mitem = new wxMenuItem();


@@ -272,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_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 );
   gtk_menu_append( GTK_MENU(m_menu), menuItem );
   gtk_widget_show( menuItem );
   m_items.Append( mitem );


@@ -399,9 +446,11 @@ wxMenuItem *wxMenu::FindItem(int id) const
     node = node->Next();
   }
 
     node = node->Next();
   }
 

-  wxLogDebug(_("wxMenu::FindItem: item %d not found."), id);
-
-  return NULL;
+  // Not finding anything here can be correct
+  // when search the entire menu system for
+  // an entry -> no error message.
+  
+  return (wxMenuItem *) NULL;

 }
 
 void wxMenu::SetInvokingWindow( wxWindow *win )
 }
 
 void wxMenu::SetInvokingWindow( wxWindow *win )