X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a260fe6a435f318c386b2da660fd30a7a2b02ce5..e208b369f0b11a704248fbc1c8483cbc85f60fd1:/src/gtk/menu.cpp diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 860adb822d..aa5e5d9c43 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -20,6 +20,13 @@ #include "gdk/gdk.h" #include "gtk/gtk.h" +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // wxMenuBar //----------------------------------------------------------------------------- @@ -28,13 +35,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow) wxMenuBar::wxMenuBar( long style ) { - m_needParent = FALSE; // hmmm + /* the parent window is known after wxFrame::SetMenu() */ + m_needParent = FALSE; - 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, "
", m_accel ); + m_menubar = gtk_item_factory_get_widget( m_factory, "
" ); +#else m_menubar = gtk_menu_bar_new(); +#endif if (style & wxMB_DOCKABLE) { @@ -54,13 +69,21 @@ wxMenuBar::wxMenuBar( long style ) wxMenuBar::wxMenuBar() { - m_needParent = FALSE; // hmmm + /* the parent window is known after wxFrame::SetMenu() */ + m_needParent = FALSE; 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, "
", m_accel ); + m_menubar = gtk_item_factory_get_widget( m_factory, "
" ); +#else m_menubar = gtk_menu_bar_new(); +#endif m_widget = GTK_WIDGET(m_menubar); @@ -69,29 +92,74 @@ wxMenuBar::wxMenuBar() Show( TRUE ); } +wxMenuBar::~wxMenuBar() +{ + // how to destroy a GtkItemFactory ? +} + void wxMenuBar::Append( wxMenu *menu, const wxString &title ) { m_menus.Append( menu ); - wxString s = ""; - for ( const char *pc = title; *pc != '\0'; pc++ ) + /* GTK 1.2 wants to have "_" instead of "&" for accelerators */ + wxString str; + for ( const wxChar *pc = title; *pc != _T('\0'); pc++ ) { - if (*pc == '&') + if (*pc == _T('&')) { - pc++; /* skip it */ -#if (GTK_MINOR_VERSION > 0) - // s << '_'; not yet +#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) + str << _T('_'); + } else + if (*pc == _T('/')) + { + str << _T('\\'); #endif - } - s << *pc; + } + else + str << *pc; + } + + /* this doesn't have much effect right now */ + menu->SetTitle( str ); + + /* 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 */ + char buf[200]; + strcpy( buf, "/" ); + strcat( buf, str.mb_str() ); + + GtkItemFactoryEntry entry; + entry.path = buf; + entry.accelerator = (gchar*) NULL; + entry.callback = (GtkItemFactoryCallback) NULL; + entry.callback_action = 0; + entry.item_type = ""; + + 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("
/"); + for ( const wxChar *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 ); + +#else - menu->SetTitle(s); - menu->m_owner = gtk_menu_item_new_with_label( WXSTRINGCAST(s) ); + 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 ) @@ -116,7 +184,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString return wxNOT_FOUND; } -wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem = NULL) const +wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem ) const { if ( menuForItem ) { @@ -178,7 +246,7 @@ void wxMenuBar::Check( int id, bool check ) { wxMenuItem* item = FindMenuItemById( id ); - wxCHECK_RET( item, "wxMenuBar::Check: no such item" ); + wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") ); item->Check(check); } @@ -187,7 +255,7 @@ bool wxMenuBar::IsChecked( int id ) const { 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(); } @@ -196,7 +264,7 @@ void wxMenuBar::Enable( int id, bool enable ) { wxMenuItem* item = FindMenuItemById( id ); - wxCHECK_RET( item, "wxMenuBar::Enable: no such item" ); + wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") ); item->Enable(enable); } @@ -205,7 +273,7 @@ bool wxMenuBar::IsEnabled( int id ) const { 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(); } @@ -214,7 +282,7 @@ wxString wxMenuBar::GetLabel( int id ) const { 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(); } @@ -223,7 +291,7 @@ void wxMenuBar::SetLabel( int id, const wxString &label ) { wxMenuItem* item = FindMenuItemById( id ); - wxCHECK_RET( item, "wxMenuBar::SetLabel: no such item" ); + wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") ); item->SetText( label ); } @@ -232,7 +300,7 @@ void wxMenuBar::EnableTop( int pos, bool flag ) { wxNode *node = m_menus.Nth( pos ); - wxCHECK_RET( node, "menu not found" ); + wxCHECK_RET( node, _T("menu not found") ); wxMenu* menu = (wxMenu*)node->Data(); @@ -244,7 +312,7 @@ wxString wxMenuBar::GetLabelTop( int pos ) const { 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(); @@ -255,7 +323,7 @@ void wxMenuBar::SetLabelTop( int pos, const wxString& 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(); @@ -266,7 +334,7 @@ void wxMenuBar::SetHelpString( int id, const wxString& helpString ) { wxMenuItem* item = FindMenuItemById( id ); - wxCHECK_RET( item, "wxMenuBar::SetHelpString: no such item" ); + wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") ); item->SetHelp( helpString ); } @@ -275,7 +343,7 @@ wxString wxMenuBar::GetHelpString( int id ) const { 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(); } @@ -286,6 +354,8 @@ wxString wxMenuBar::GetHelpString( int id ) const 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 */ @@ -295,7 +365,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *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()) { @@ -335,6 +405,8 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) 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! @@ -367,6 +439,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) 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! @@ -404,31 +478,44 @@ wxMenuItem::wxMenuItem() // 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 == '&') + if (*pc == _T('&')) { - pc++; /* skip it */ #if (GTK_MINOR_VERSION > 0) - m_text << '_'; + m_text << _T('_'); + } else + if (*pc == _T('/')) + { + m_text << _T('\\'); #endif } - m_text << *pc; + else + m_text << *pc; } + + /* only GTK 1.2 know about hot keys */ + m_hotKey = _T(""); +#if (GTK_MINOR_VERSION > 0) + 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; @@ -438,7 +525,7 @@ void wxMenuItem::Check( bool check ) 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; @@ -446,7 +533,7 @@ void wxMenuItem::Enable( bool 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! @@ -479,8 +566,8 @@ wxMenu::wxMenu( const wxString& title, const wxFunction 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(); @@ -525,16 +612,18 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool mitem->SetText(item); mitem->SetHelp(helpStr); mitem->SetCheckable(checkable); - const char *text = mitem->GetText(); #if (GTK_MINOR_VERSION > 0) - char buf[100]; + /* text has "_" instead of "&" after mitem->SetText() */ + wxString text( mitem->GetText() ); + + /* local buffer in multibyte form */ + char buf[200]; strcpy( buf, "/" ); - strcat( buf, text ); + strcat( buf, text.mb_str() ); GtkItemFactoryEntry entry; entry.path = buf; - entry.accelerator = (gchar*) NULL; entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback; entry.callback_action = 0; if (checkable) @@ -542,22 +631,57 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool else entry.item_type = ""; + entry.accelerator = (gchar*) NULL; + char hotbuf[50]; + wxString hotkey( mitem->GetHotKey() ); + if (!hotkey.IsEmpty()) + { + switch (hotkey[0]) + { + case _T('a'): /* Alt */ + case _T('A'): + case _T('m'): /* Meta */ + case _T('M'): + { + strcpy( hotbuf, "" ); + wxString last = hotkey.Right(1); + strcat( hotbuf, last.mb_str() ); + entry.accelerator = hotbuf; + break; + } + case _T('c'): /* Ctrl */ + case _T('C'): + case _T('s'): /* Strg, yeah man, I'm German */ + case _T('S'): + { + strcpy( hotbuf, "" ); + wxString last = hotkey.Right(1); + strcat( hotbuf, last.mb_str() ); + entry.accelerator = hotbuf; + break; + } + default: + { + } + } + } + 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 = "
/"; - for ( const char *pc = text; *pc != '\0'; pc++ ) + wxString s = _T("
/"); + for ( const wxChar *pc = text; *pc != _T('\0'); pc++ ) { - if (*pc == '_') pc++; /* skip it */ + if (*pc == _T('_')) pc++; /* skip it */ s << *pc; } - GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s ); + GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, s.mb_str() ); #else - GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label(text) - : gtk_menu_item_new_with_label(text); + 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), @@ -588,7 +712,7 @@ void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxStri mitem->SetText(text); mitem->SetHelp(helpStr); - GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText()); + GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str()); mitem->SetMenuItem(menuItem); mitem->SetSubMenu(subMenu); @@ -615,10 +739,10 @@ void wxMenu::Append( wxMenuItem *item ) 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()) { @@ -645,14 +769,14 @@ void wxMenu::Append( wxMenuItem *item ) int wxMenu::FindItem( const wxString itemString ) const { - wxString s = ""; - for ( const char *pc = itemString; *pc != '\0'; pc++ ) + wxString s = _T(""); + for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ ) { - if (*pc == '&') + if (*pc == _T('&')) { pc++; /* skip it */ #if (GTK_MINOR_VERSION > 0) - s << '_'; + s << _T('_'); #endif } s << *pc; @@ -676,7 +800,7 @@ void wxMenu::Enable( int id, bool enable ) { wxMenuItem *item = FindItem(id); - wxCHECK_RET( item, "wxMenu::Enable: no such item" ); + wxCHECK_RET( item, _T("wxMenu::Enable: no such item") ); item->Enable(enable); } @@ -685,7 +809,7 @@ bool wxMenu::IsEnabled( int id ) const { 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(); } @@ -694,7 +818,7 @@ void wxMenu::Check( int id, bool enable ) { wxMenuItem *item = FindItem(id); - wxCHECK_RET( item, "wxMenu::Check: no such item" ); + wxCHECK_RET( item, _T("wxMenu::Check: no such item") ); item->Check(enable); } @@ -703,7 +827,7 @@ bool wxMenu::IsChecked( int id ) const { 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(); } @@ -712,7 +836,7 @@ void wxMenu::SetLabel( int id, const wxString &label ) { wxMenuItem *item = FindItem(id); - wxCHECK_RET( item, "wxMenu::SetLabel: no such item" ); + wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") ); item->SetText(label); } @@ -721,7 +845,7 @@ wxString wxMenu::GetLabel( int id ) const { 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(); } @@ -730,7 +854,7 @@ void wxMenu::SetHelpString( int id, const wxString& helpString ) { wxMenuItem *item = FindItem(id); - wxCHECK_RET( item, "wxMenu::SetHelpString: no such item" ); + wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") ); item->SetHelp( helpString ); } @@ -739,7 +863,7 @@ wxString wxMenu::GetHelpString( int id ) const { 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(); }