#include "gdk/gdk.h"
#include "gtk/gtk.h"
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
//-----------------------------------------------------------------------------
// wxMenuBar
//-----------------------------------------------------------------------------
wxMenuBar::wxMenuBar( long style )
{
- m_needParent = FALSE; // hmmm
+ /* the parent window is known after wxFrame::SetMenu() */
+ m_needParent = FALSE;
+ m_style = style;
- PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+ PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "menu" );
m_menus.DeleteContents( TRUE );
+ /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+ m_accel = gtk_accel_group_new();
+ m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
+ m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
+#else
m_menubar = gtk_menu_bar_new();
+#endif
if (style & wxMB_DOCKABLE)
{
}
PostCreation();
-
- Show( TRUE );
}
wxMenuBar::wxMenuBar()
{
- m_needParent = FALSE; // hmmm
+ /* the parent window is known after wxFrame::SetMenu() */
+ m_needParent = FALSE;
+ m_style = 0;
PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
m_menus.DeleteContents( TRUE );
+ /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+ m_accel = gtk_accel_group_new();
+ m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
+ m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
+#else
m_menubar = gtk_menu_bar_new();
+#endif
m_widget = GTK_WIDGET(m_menubar);
PostCreation();
+}
+
+wxMenuBar::~wxMenuBar()
+{
+ // how to destroy a GtkItemFactory ?
+}
+
+static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
+{
+ menu->SetInvokingWindow( (wxWindow*) NULL );
+
+#if (GTK_MINOR_VERSION > 0)
+ wxWindow *top_frame = win;
+ while (top_frame->GetParent()) top_frame = top_frame->GetParent();
+
+ /* support for native hot keys */
+ gtk_accel_group_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
+
+ wxNode *node = menu->GetItems().First();
+ while (node)
+ {
+ wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+ if (menuitem->IsSubMenu())
+ wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win );
+ node = node->Next();
+ }
+}
+
+static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
+{
+ menu->SetInvokingWindow( win );
+
+#if (GTK_MINOR_VERSION > 0)
+ wxWindow *top_frame = win;
+ while (top_frame->GetParent())
+ top_frame = top_frame->GetParent();
+
+ /* support for native hot keys */
+ gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
+
+ wxNode *node = menu->GetItems().First();
+ while (node)
+ {
+ wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+ if (menuitem->IsSubMenu())
+ wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );
+ node = node->Next();
+ }
+}
+
+void wxMenuBar::SetInvokingWindow( wxWindow *win )
+{
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+ wxWindow *top_frame = win;
+ while (top_frame->GetParent())
+ top_frame = top_frame->GetParent();
+
+ /* support for native key accelerators indicated by underscroes */
+ gtk_accel_group_attach( m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
+
+ wxNode *node = m_menus.First();
+ while (node)
+ {
+ wxMenu *menu = (wxMenu*)node->Data();
+ wxMenubarSetInvokingWindow( menu, win );
+ node = node->Next();
+ }
+}
+
+void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
+{
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+ wxWindow *top_frame = win;
+ while (top_frame->GetParent())
+ top_frame = top_frame->GetParent();
- Show( TRUE );
+ /* support for native key accelerators indicated by underscroes */
+ gtk_accel_group_detach( m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
+
+ wxNode *node = m_menus.First();
+ while (node)
+ {
+ wxMenu *menu = (wxMenu*)node->Data();
+ wxMenubarUnsetInvokingWindow( menu, win );
+ node = node->Next();
+ }
}
void wxMenuBar::Append( wxMenu *menu, const wxString &title )
{
m_menus.Append( menu );
- wxString title2 = title;
- int pos;
- do
+ const wxChar *pc;
+
+ /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
+ wxString str;
+ for ( pc = title; *pc != _T('\0'); pc++ )
{
- pos = title2.First( '&' );
- if (pos != wxNOT_FOUND)
- title2.Remove( pos, 1 );
- } while (pos != wxNOT_FOUND);
+ if (*pc == _T('&'))
+ {
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+ str << _T('_');
+ } else
+ if (*pc == _T('/'))
+ {
+ str << _T('\\');
+#endif
+ }
+ else
+ str << *pc;
+ }
- menu->SetTitle(title2);
+ /* this doesn't have much effect right now */
+ menu->SetTitle( str );
- menu->m_owner = gtk_menu_item_new_with_label( WXSTRINGCAST(title2) );
+ /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+
+ /* local buffer in multibyte form */
+ wxString buf;
+ buf << _T('/') << str.c_str();
+
+ char *cbuf = new char[buf.Length()];
+ strcpy(cbuf, buf.mbc_str());
+
+ GtkItemFactoryEntry entry;
+ entry.path = (gchar *)cbuf; // const_cast
+ entry.accelerator = (gchar*) NULL;
+ entry.callback = (GtkItemFactoryCallback) NULL;
+ entry.callback_action = 0;
+ entry.item_type = "<Branch>";
+
+ gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
+ /* in order to get the pointer to the item we need the item text _without_ underscores */
+ wxString tmp = _T("<main>/");
+ for ( pc = str; *pc != _T('\0'); pc++ )
+ {
+ if (*pc == _T('_')) pc++; /* skip it */
+ tmp << *pc;
+ }
+ menu->m_owner = gtk_item_factory_get_item( m_factory, tmp.mb_str() );
+ gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
+ delete [] cbuf;
+#else
+
+ menu->m_owner = gtk_menu_item_new_with_label( str.mb_str() );
gtk_widget_show( menu->m_owner );
gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner );
+
+#endif
}
static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
return wxNOT_FOUND;
}
-wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem = NULL) const
+wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem ) const
{
if ( menuForItem )
{
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_RET( item, "wxMenuBar::Check: no such item" );
+ wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") );
item->Check(check);
}
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_MSG( item, FALSE, "wxMenuBar::IsChecked: no such item" );
+ wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") );
return item->IsChecked();
}
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_RET( item, "wxMenuBar::Enable: no such item" );
+ wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") );
item->Enable(enable);
}
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_MSG( item, FALSE, "wxMenuBar::IsEnabled: no such item" );
+ wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") );
return item->IsEnabled();
}
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_MSG( item, "", "wxMenuBar::GetLabel: no such item" );
+ wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") );
return item->GetText();
}
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_RET( item, "wxMenuBar::SetLabel: no such item" );
+ wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") );
item->SetText( label );
}
{
wxNode *node = m_menus.Nth( pos );
- wxCHECK_RET( node, "menu not found" );
+ wxCHECK_RET( node, _T("menu not found") );
wxMenu* menu = (wxMenu*)node->Data();
{
wxNode *node = m_menus.Nth( pos );
- wxCHECK_MSG( node, "invalid", "menu not found" );
+ wxCHECK_MSG( node, _T("invalid"), _T("menu not found") );
wxMenu* menu = (wxMenu*)node->Data();
{
wxNode *node = m_menus.Nth( pos );
- wxCHECK_RET( node, "menu not found" );
+ wxCHECK_RET( node, _T("menu not found") );
wxMenu* menu = (wxMenu*)node->Data();
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_RET( item, "wxMenuBar::SetHelpString: no such item" );
+ wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") );
item->SetHelp( helpString );
}
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_MSG( item, "", "wxMenuBar::GetHelpString: no such item" );
+ wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") );
return item->GetHelp();
}
static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
{
+ if (g_isIdle) wxapp_install_idle_handler();
+
int id = menu->FindMenuIdByMenuItem(widget);
/* should find it for normal (not popup) menu */
return;
wxMenuItem* item = menu->FindItem( id );
- wxCHECK_RET( item, "error in menu item callback" );
+ wxCHECK_RET( item, _T("error in menu item callback") );
if (item->IsCheckable())
{
static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
{
+ if (g_isIdle) wxapp_install_idle_handler();
+
int id = menu->FindMenuIdByMenuItem(widget);
wxASSERT( id != -1 ); // should find it!
static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
{
+ if (g_isIdle) wxapp_install_idle_handler();
+
int id = menu->FindMenuIdByMenuItem(widget);
wxASSERT( id != -1 ); // should find it!
// 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++ )
+ /* '\t' is the deliminator indicating a hot key */
+ m_text = _T("");
+ const wxChar *pc = str;
+ for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ )
+ {
+ if (*pc == _T('&'))
+ {
+#if (GTK_MINOR_VERSION > 0)
+ m_text << _T('_');
+ } else
+ if (*pc == _T('/')) /* we have to filter out slashes ... */
+ {
+ m_text << _T('\\'); /* ... and replace them with back slashes */
+#endif
+ }
+ else
+ m_text << *pc;
+ }
+
+ /* only GTK 1.2 knows about hot keys */
+ m_hotKey = _T("");
+#if (GTK_MINOR_VERSION > 0)
+ if(*pc == _T('\t'))
{
- if (*pc == '&') pc++; /* skip it */
- m_text << *pc;
+ pc++;
+ m_hotKey = pc;
}
+#endif
if (m_menuItem)
{
GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
- gtk_label_set( label, m_text.c_str());
+ gtk_label_set( label, m_text.mb_str());
}
}
void wxMenuItem::Check( bool check )
{
- wxCHECK_RET( m_menuItem, "invalid menu item" );
+ wxCHECK_RET( m_menuItem, _T("invalid menu item") );
- wxCHECK_RET( IsCheckable(), "Can't check uncheckable item!" )
+ wxCHECK_RET( IsCheckable(), _T("Can't check uncheckable item!") )
if (check == m_isChecked) return;
void wxMenuItem::Enable( bool enable )
{
- wxCHECK_RET( m_menuItem, "invalid menu item" );
+ wxCHECK_RET( m_menuItem, _T("invalid menu item") );
gtk_widget_set_sensitive( m_menuItem, enable );
m_isEnabled = enable;
bool wxMenuItem::IsChecked() const
{
- wxCHECK_MSG( m_menuItem, FALSE, "invalid menu item" );
+ wxCHECK_MSG( m_menuItem, FALSE, _T("invalid menu item") );
wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
-wxMenu::wxMenu( const wxString& title, const wxFunction func )
+wxMenu::wxMenu( const wxString& title, const wxFunction func, long style )
+{
+ Init(title, func, style);
+}
+
+wxMenu::wxMenu(long style)
+{
+ Init(wxEmptyString, (wxFunction) NULL, style);
+}
+
+void
+wxMenu::Init( const wxString& title, const wxFunction func, long style )
{
m_title = title;
m_items.DeleteContents( TRUE );
m_invokingWindow = (wxWindow *) NULL;
+ m_style = style;
+
+#if (GTK_MINOR_VERSION > 0)
+ m_accel = gtk_accel_group_new();
+ m_factory = gtk_item_factory_new( GTK_TYPE_MENU, "<main>", m_accel );
+ m_menu = gtk_item_factory_get_widget( m_factory, "<main>" );
+#else
m_menu = gtk_menu_new(); // Do not show!
+#endif
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 = _T("");
+ if (m_title != _T(""))
{
Append(-2, m_title);
AppendSeparator();
}
m_owner = (GtkWidget*) NULL;
+
+#if (GTK_MINOR_VERSION > 0)
+ /* Tearoffs are entries, just like separators. So if we want this
+ menu to be a tear-off one, we just append a tearoff entry
+ immediately. */
+ if(m_style & wxMENU_TEAROFF)
+ {
+ GtkItemFactoryEntry entry;
+ entry.path = "/tearoff";
+ entry.callback = (GtkItemFactoryCallback) NULL;
+ entry.callback_action = 0;
+ entry.item_type = "<Tearoff>";
+ entry.accelerator = (gchar*) NULL;
+ gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
+ //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
+ }
+#endif
+}
+
+wxMenu::~wxMenu()
+{
+ /* how do we delete an item-factory ? */
}
void wxMenu::SetTitle( const wxString& title )
wxMenuItem *mitem = new wxMenuItem();
mitem->SetId(ID_SEPARATOR);
+#if (GTK_MINOR_VERSION > 0)
+ GtkItemFactoryEntry entry;
+ entry.path = "/sep";
+ entry.callback = (GtkItemFactoryCallback) NULL;
+ entry.callback_action = 0;
+ entry.item_type = "<Separator>";
+ entry.accelerator = (gchar*) NULL;
+
+ gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
+
+ /* this will be wrong for more than one separator. do we care? */
+ GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
+#else
GtkWidget *menuItem = gtk_menu_item_new();
gtk_menu_append( GTK_MENU(m_menu), menuItem );
gtk_widget_show( menuItem );
+#endif
+
mitem->SetMenuItem(menuItem);
m_items.Append( mitem );
}
+static char* GetHotKey( const wxString &hotkey, char *hotbuf )
+{
+ if (hotkey.IsEmpty()) return (char*) NULL;
+
+ switch (hotkey[0])
+ {
+ case _T('a'): /* Alt */
+ case _T('A'):
+ case _T('m'): /* Meta */
+ case _T('M'):
+ {
+ strcpy( hotbuf, "<alt>" );
+ wxString last = hotkey.Right(1);
+ strcat( hotbuf, last.mb_str() );
+ return hotbuf;
+ }
+ case _T('c'): /* Ctrl */
+ case _T('C'):
+ case _T('s'): /* Strg, yeah man, I'm German */
+ case _T('S'):
+ {
+ strcpy( hotbuf, "<control>" );
+ wxString last = hotkey.Right(1);
+ strcat( hotbuf, last.mb_str() );
+ return hotbuf;
+ }
+ case _T('F'): /* function keys */
+ {
+ strcpy( hotbuf, hotkey.mb_str() );
+ return hotbuf;
+ }
+ default:
+ {
+ }
+ }
+ return (char*) NULL;
+}
+
void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
{
wxMenuItem *mitem = new wxMenuItem();
mitem->SetText(item);
mitem->SetHelp(helpStr);
mitem->SetCheckable(checkable);
- 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);
+#if (GTK_MINOR_VERSION > 0)
+ /* text has "_" instead of "&" after mitem->SetText() */
+ wxString text( mitem->GetText() );
+
+ /* local buffer in multibyte form */
+ char buf[200];
+ strcpy( buf, "/" );
+ strcat( buf, text.mb_str() );
+
+ GtkItemFactoryEntry entry;
+ entry.path = buf;
+ entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
+ entry.callback_action = 0;
+ if (checkable)
+ entry.item_type = "<CheckItem>";
+ else
+ entry.item_type = "<Item>";
+
+ char hotbuf[50];
+ entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf );
+
+ gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
+
+ /* in order to get the pointer to the item we need the item text _without_ underscores */
+ wxString s = _T("<main>/");
+ for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
+ {
+ if (*pc == _T('_')) pc++; /* skip it */
+ s << *pc;
+ }
+
+ GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s.mb_str() );
+
+#else
+
+ GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() )
+ : gtk_menu_item_new_with_label( mitem->GetText().mb_str() );
gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
- (gpointer*)this );
+ (gpointer)this );
+
+ gtk_menu_append( GTK_MENU(m_menu), menuItem );
+ gtk_widget_show( menuItem );
+
+#endif
gtk_signal_connect( GTK_OBJECT(menuItem), "select",
GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
- (gpointer*)this );
+ (gpointer)this );
gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
- (gpointer*)this );
+ (gpointer)this );
+
+ mitem->SetMenuItem(menuItem);
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- gtk_widget_show( menuItem );
m_items.Append( mitem );
}
-void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxString &helpStr )
+void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr )
{
wxMenuItem *mitem = new wxMenuItem();
mitem->SetId(id);
- mitem->SetText(text);
+ mitem->SetText(item);
mitem->SetHelp(helpStr);
- GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText());
- mitem->SetMenuItem(menuItem);
- mitem->SetSubMenu(subMenu);
+#if (GTK_MINOR_VERSION > 0)
+ /* text has "_" instead of "&" after mitem->SetText() */
+ wxString text( mitem->GetText() );
+
+ /* local buffer in multibyte form */
+ char buf[200];
+ strcpy( buf, "/" );
+ strcat( buf, text.mb_str() );
+
+ GtkItemFactoryEntry entry;
+ entry.path = buf;
+ entry.callback = (GtkItemFactoryCallback) 0;
+ entry.callback_action = 0;
+ entry.item_type = "<Branch>";
+
+ gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
+
+ /* in order to get the pointer to the item we need the item text _without_ underscores */
+ wxString s = _T("<main>/");
+ for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
+ {
+ if (*pc == _T('_')) pc++; /* skip it */
+ s << *pc;
+ }
+
+ GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, s.mb_str() );
+
+#else
+
+ GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str());
+
+ gtk_menu_append( GTK_MENU(m_menu), menuItem );
+ gtk_widget_show( menuItem );
+
+#endif
gtk_signal_connect( GTK_OBJECT(menuItem), "select",
GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
(gpointer*)this );
gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
- gtk_menu_append( GTK_MENU(m_menu), menuItem );
- gtk_widget_show( menuItem );
+
+ mitem->SetMenuItem(menuItem);
+ mitem->SetSubMenu(subMenu);
+
m_items.Append( mitem );
}
if (item->IsSeparator())
menuItem = gtk_menu_item_new();
else if (item->IsSubMenu())
- menuItem = gtk_menu_item_new_with_label(item->GetText());
+ menuItem = gtk_menu_item_new_with_label(item->GetText().mbc_str());
else
- menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText())
- : gtk_menu_item_new_with_label(item->GetText());
+ menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText().mbc_str())
+ : gtk_menu_item_new_with_label(item->GetText().mbc_str());
if (!item->IsSeparator())
{
int wxMenu::FindItem( const wxString itemString ) const
{
- wxString s( itemString );
-
- int pos;
- do
+ wxString s = _T("");
+ for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
{
- pos = s.First( '&' );
- if (pos != -1) s.Remove( pos, 1 );
- } while (pos != -1);
+ if (*pc == _T('&'))
+ {
+ pc++; /* skip it */
+#if (GTK_MINOR_VERSION > 0)
+ s << _T('_');
+#endif
+ }
+ s << *pc;
+ }
wxNode *node = m_items.First();
while (node)
{
wxMenuItem *item = FindItem(id);
- wxCHECK_RET( item, "wxMenu::Enable: no such item" );
+ wxCHECK_RET( item, _T("wxMenu::Enable: no such item") );
item->Enable(enable);
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_MSG( item, FALSE, "wxMenu::IsEnabled: no such item" );
+ wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") );
return item->IsEnabled();
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_RET( item, "wxMenu::Check: no such item" );
+ wxCHECK_RET( item, _T("wxMenu::Check: no such item") );
item->Check(enable);
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_MSG( item, FALSE, "wxMenu::IsChecked: no such item" );
+ wxCHECK_MSG( item, FALSE, _T("wxMenu::IsChecked: no such item") );
return item->IsChecked();
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_RET( item, "wxMenu::SetLabel: no such item" );
+ wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") );
item->SetText(label);
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_MSG( item, "", "wxMenu::GetLabel: no such item" );
+ wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") );
return item->GetText();
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_RET( item, "wxMenu::SetHelpString: no such item" );
+ wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") );
item->SetHelp( helpString );
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_MSG( item, "", "wxMenu::GetHelpString: no such item" );
+ wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") );
return item->GetHelp();
}
projects / wxWidgets.git / blobdiff