// 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"
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();
wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
event.SetEventObject( menu );
event.SetInt(id );
-
+
if (menu->m_callback)
{
(void) (*(menu->m_callback)) (*menu, event);
wxCommandEvent event( wxEVT_MENU_HIGHLIGHT, id );
event.SetEventObject( menu );
event.SetInt(id );
-
+
/* wxMSW doesn't call callback here either
if (menu->m_callback)
{
}
//-----------------------------------------------------------------------------
-// wxMenu
+// wxMenuItem
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
m_menuItem = (GtkWidget *) NULL;
}
-void wxMenuItem::SetText(const wxString& str)
+// it's valid for this function to be called even if m_menuItem == NULL
+void wxMenuItem::SetName(const wxString& str)
{
m_text = "";
- for ( const char *pc = str; *pc != '\0'; pc++ ) {
+ for ( const char *pc = str; *pc != '\0'; pc++ )
+ {
if ( *pc == '&' )
pc++; // skip it
m_text << *pc;
}
+
+ if ( m_menuItem )
+ {
+ GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
+
+ gtk_label_set( label, m_text.c_str());
+ }
}
void wxMenuItem::Check( bool check )
{
+ wxCHECK_RET( m_menuItem, "invalid menu item" );
+
wxCHECK_RET( IsCheckable(), "Can't check uncheckable item!" )
m_isChecked = check;
gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
}
-void wxMenuItem::Enable( bool enable )
-{
+void wxMenuItem::Enable( bool enable )
+{
+ wxCHECK_RET( m_menuItem, "invalid menu item" );
+
gtk_widget_set_sensitive( m_menuItem, enable );
- m_isEnabled = enable;
+ m_isEnabled = enable;
}
bool wxMenuItem::IsChecked() const
{
+ wxCHECK_MSG( m_menuItem, FALSE, "invalid menu item" );
+
wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0;
return bIsChecked;
}
+//-----------------------------------------------------------------------------
+// wxMenuItem
+//-----------------------------------------------------------------------------
+
IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
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 != "")
{
const char *text = mitem->GetText();
GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label(text)
: gtk_menu_item_new_with_label(text);
-
+
mitem->SetMenuItem(menuItem);
gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
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;
}