// forward declare it as it's used by wxMenuBar too when using Hildon
extern "C"
{
- static void gtk_menu_clicked_callback(GtkWidget *widget, wxMenu *menu);
+ static void menuitem_activate(GtkWidget*, wxMenuItem* item);
}
#if wxUSE_ACCEL
-static bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key);
-static wxString GetGtkHotKey( const wxMenuItem& item );
+static void wxGetGtkAccel(const wxMenuItem*, guint*, GdkModifierType*);
#endif
-//-----------------------------------------------------------------------------
-// activate message from GTK
-//-----------------------------------------------------------------------------
-
static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
{
event.SetEventObject( menu );
win->HandleWindowEvent( event );
}
-extern "C" {
-
-static void
-gtk_menu_open_callback(GtkWidget * WXUNUSED(widget), wxMenu *menu)
-{
- wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu);
-
- DoCommonMenuCallbackCode(menu, event);
-}
-
-static void
-gtk_menu_close_callback(GtkWidget * WXUNUSED(widget), wxMenuBar *menubar)
-{
- if ( !menubar->GetMenuCount() )
- {
- // if menubar is empty we can't call GetMenu(0) below
- return;
- }
-
- wxMenuEvent event( wxEVT_MENU_CLOSE, -1, NULL );
-
- DoCommonMenuCallbackCode(menubar->GetMenu(0), event);
-}
-
-}
-
//-----------------------------------------------------------------------------
// wxMenuBar
//-----------------------------------------------------------------------------
ApplyWidgetStyle();
#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+ g_object_ref(m_widget);
+
for (size_t i = 0; i < n; ++i )
Append(menus[i], titles[i]);
-
- // VZ: for some reason connecting to menus "deactivate" doesn't work (we
- // don't get it when the menu is dismissed by clicking outside the
- // toolbar) so we connect to the global one, even if it means that we
- // can't pass the menu which was closed in wxMenuEvent object
- g_signal_connect (m_menubar, "deactivate",
- G_CALLBACK (gtk_menu_close_callback), this);
}
wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)
{
}
-static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
+static void
+wxMenubarUnsetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL)
{
menu->SetInvokingWindow( (wxWindow*) NULL );
- wxWindow *top_frame = win;
- while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
- top_frame = top_frame->GetParent();
-
// support for native hot keys
- if (menu->m_accel && g_slist_find(menu->m_accel->acceleratables, top_frame->m_widget))
- gtk_window_remove_accel_group(GTK_WINDOW(top_frame->m_widget), menu->m_accel);
+ if (menu->m_accel)
+ {
+ if (tlw == NULL)
+ tlw = GTK_WINDOW(wxGetTopLevelParent(win)->m_widget);
+ if (g_slist_find(menu->m_accel->acceleratables, tlw))
+ gtk_window_remove_accel_group(tlw, menu->m_accel);
+ }
wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while (node)
{
wxMenuItem *menuitem = node->GetData();
if (menuitem->IsSubMenu())
- wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win );
+ wxMenubarUnsetInvokingWindow(menuitem->GetSubMenu(), win, tlw);
node = node->GetNext();
}
}
-static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
+static void
+wxMenubarSetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL)
{
menu->SetInvokingWindow( win );
- wxWindow *top_frame = win;
- while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
- top_frame = top_frame->GetParent();
-
// support for native hot keys
- if (menu->m_accel && !g_slist_find(menu->m_accel->acceleratables, top_frame->m_widget))
- gtk_window_add_accel_group(GTK_WINDOW(top_frame->m_widget), menu->m_accel);
+ if (menu->m_accel)
+ {
+ if (tlw == NULL)
+ tlw = GTK_WINDOW(wxGetTopLevelParent(win)->m_widget);
+ if (!g_slist_find(menu->m_accel->acceleratables, tlw))
+ gtk_window_add_accel_group(tlw, menu->m_accel);
+ }
wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
while (node)
{
wxMenuItem *menuitem = node->GetData();
if (menuitem->IsSubMenu())
- wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );
+ wxMenubarSetInvokingWindow(menuitem->GetSubMenu(), win, tlw);
node = node->GetNext();
}
}
void wxMenuBar::SetInvokingWindow( wxWindow *win )
{
m_invokingWindow = win;
- wxWindow *top_frame = win;
- while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
- top_frame = top_frame->GetParent();
wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
{
m_invokingWindow = (wxWindow*) NULL;
- wxWindow *top_frame = win;
- while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
- top_frame = top_frame->GetParent();
wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
g_signal_connect(menu->m_owner, "activate",
- G_CALLBACK(gtk_menu_clicked_callback), menu);
+ G_CALLBACK(menuitem_activate), item);
item->SetMenuItem(menu->m_owner);
}
else
else
gtk_menu_shell_insert( GTK_MENU_SHELL(m_menubar), menu->m_owner, pos );
- g_signal_connect (menu->m_owner, "activate",
- G_CALLBACK (gtk_menu_open_callback),
- menu);
-
// m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
// addings menu later on.
if (m_invokingWindow)
//-----------------------------------------------------------------------------
extern "C" {
-static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
+static void menuitem_activate(GtkWidget*, wxMenuItem* item)
{
- int id = menu->FindMenuIdByMenuItem(widget);
-
- /* should find it for normal (not popup) menu */
- wxASSERT_MSG( (id != -1) || (menu->GetInvokingWindow() != NULL),
- _T("menu item not found in gtk_menu_clicked_callback") );
-
- if (!menu->IsEnabled(id))
+ if (!item->IsEnabled())
return;
- wxMenuItem* item = menu->FindChildItem( id );
- wxCHECK_RET( item, wxT("error in menu item callback") );
-
- if ( item->GetId() == wxGTK_TITLE_ID )
+ int id = item->GetId();
+ if (id == wxGTK_TITLE_ID)
{
// ignore events from the menu title
return;
}
}
-
- // Is this menu on a menubar? (possibly nested)
- wxFrame* frame = NULL;
- if(menu->IsAttached())
- frame = menu->GetMenuBar()->GetFrame();
-
- // FIXME: why do we have to call wxFrame::GetEventHandler() directly here?
- // normally wxMenu::SendEvent() should be enough, if it doesn't work
- // in wxGTK then we have a bug in wxMenu::GetInvokingWindow() which
- // should be fixed instead of working around it here...
- if (frame)
- {
- // If it is attached then let the frame send the event.
- // Don't call frame->ProcessCommand(id) because it toggles
- // checkable items and we've already done that above.
- wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
- commandEvent.SetEventObject(frame);
- if (item->IsCheckable())
- commandEvent.SetInt(item->IsChecked());
-
- frame->HandleWindowEvent(commandEvent);
- }
- else
- {
- // otherwise let the menu have it
- menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
- }
+ wxMenu* menu = item->GetMenu();
+ menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
}
}
//-----------------------------------------------------------------------------
extern "C" {
-static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
+static void menuitem_select(GtkWidget*, wxMenuItem* item)
{
- int id = menu->FindMenuIdByMenuItem(widget);
-
- wxASSERT( id != -1 ); // should find it!
-
- if (!menu->IsEnabled(id))
+ if (!item->IsEnabled())
return;
- wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
+ wxMenu* menu = item->GetMenu();
+ wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item->GetId());
event.SetEventObject( menu );
wxEvtHandler* handler = menu->GetEventHandler();
//-----------------------------------------------------------------------------
extern "C" {
-static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
+static void menuitem_deselect(GtkWidget*, wxMenuItem* item)
{
- int id = menu->FindMenuIdByMenuItem(widget);
-
- wxASSERT( id != -1 ); // should find it!
-
- if (!menu->IsEnabled(id))
+ if (!item->IsEnabled())
return;
+ wxMenu* menu = item->GetMenu();
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
event.SetEventObject( menu );
wxMenu *subMenu)
: wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
{
- Init(text);
+ m_menuItem = NULL;
}
+#if WXWIN_COMPATIBILITY_2_8
wxMenuItem::wxMenuItem(wxMenu *parentMenu,
int id,
const wxString& text,
: wxMenuItemBase(parentMenu, id, text, help,
isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
{
- Init(text);
-}
-
-void wxMenuItem::Init(const wxString& text)
-{
- m_labelWidget = (GtkWidget *) NULL;
- m_menuItem = (GtkWidget *) NULL;
-
- DoSetText(text);
+ m_menuItem = NULL;
}
+#endif
wxMenuItem::~wxMenuItem()
{
// don't delete menu items, the menus take care of that
}
-// return the menu item text without any menu accels
-/* static */
-
-wxString wxMenuItemBase::GetLabelText(const wxString& text)
-{
- // The argument to this function will now always be in wxWidgets standard label
- // format, not GTK+ format, so we do what the other ports do.
-
- return wxStripMenuCodes(text);
-
-#if 0
- wxString label;
-
- for ( const wxChar *pc = text.c_str(); *pc; pc++ )
- {
- if ( *pc == wxT('\t'))
- break;
-
- if ( *pc == wxT('_') )
- {
- // GTK 1.2 escapes "xxx_xxx" to "xxx__xxx"
- pc++;
- label += *pc;
- continue;
- }
-
- if ( *pc == wxT('\\') )
- {
- // GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx"
- pc++;
- label += *pc;
- continue;
- }
-
- if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) )
- {
- // wxMSW escapes "&"
- // "&" is doubled to indicate "&" instead of accelerator
- continue;
- }
-
- label += *pc;
- }
-
- // wxPrintf( wxT("GetLabelText(): text %s label %s\n"), text.c_str(), label.c_str() );
-
- return label;
-#endif
-}
-
-wxString wxMenuItem::GetItemLabel() const
-{
- wxString label = wxConvertMnemonicsFromGTK(m_text);
- if (!m_hotKey.IsEmpty())
- label << "\t" << m_hotKey;
- return label;
-}
-
void wxMenuItem::SetItemLabel( const wxString& str )
{
- // cache some data which must be used later
- bool isstock = wxIsStockID(GetId());
- const char *stockid = NULL;
- if (isstock)
- stockid = wxGetStockGtkID(GetId());
-
- // Some optimization to avoid flicker
- wxString oldLabel = m_text;
- oldLabel = wxStripMenuCodes(oldLabel);
- oldLabel.Replace(wxT("_"), wxT(""));
- wxString label1 = wxStripMenuCodes(str);
-#if wxUSE_ACCEL
- wxString oldhotkey = GetHotKey(); // Store the old hotkey in Ctrl-foo format
- wxCharBuffer oldbuf = wxGTK_CONV_SYS( GetGtkHotKey(*this) ); // and as <control>foo
-#endif // wxUSE_ACCEL
-
- DoSetText(str);
-
#if wxUSE_ACCEL
- if (oldLabel == label1 &&
- oldhotkey == GetHotKey()) // Make sure we can change a hotkey even if the label is unaltered
- return;
-
if (m_menuItem)
{
- GtkLabel *label;
- if (m_labelWidget)
- label = (GtkLabel*) m_labelWidget;
- else
- label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
-
- // stock menu items can have empty labels:
- wxString text = m_text;
- if (text.IsEmpty() && !IsSeparator())
- {
- wxASSERT_MSG(isstock, wxT("A non-stock menu item with an empty label?"));
- text = wxGetStockLabel(GetId());
-
- // need & => _ conversion
- text = GTKProcessMenuItemLabel(text, NULL);
- }
-
- gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV_SYS(text) );
- }
-
- // remove old accelerator from our parent's accelerator group, if present
- guint accel_key;
- GdkModifierType accel_mods;
- if (oldbuf[(size_t)0] != '\0')
- {
- gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods);
- if (accel_key != 0)
- {
- gtk_widget_remove_accelerator(m_menuItem,
- m_parentMenu->m_accel,
- accel_key,
- accel_mods );
- }
- }
- else if (isstock)
- {
- // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
- if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
- gtk_widget_remove_accelerator( m_menuItem,
- m_parentMenu->m_accel,
- accel_key,
- accel_mods );
- }
-
- // add new accelerator to our parent's accelerator group
- wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*this) );
- if (buf[(size_t)0] != '\0')
- {
- gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
- if (accel_key != 0)
+ // remove old accelerator
+ guint accel_key;
+ GdkModifierType accel_mods;
+ wxGetGtkAccel(this, &accel_key, &accel_mods);
+ if (accel_key)
{
- gtk_widget_add_accelerator( m_menuItem,
- "activate",
- m_parentMenu->m_accel,
- accel_key,
- accel_mods,
- GTK_ACCEL_VISIBLE);
+ gtk_widget_remove_accelerator(
+ m_menuItem, m_parentMenu->m_accel, accel_key, accel_mods);
}
}
- else if (isstock)
- {
- // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
- if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
- gtk_widget_remove_accelerator( m_menuItem,
- m_parentMenu->m_accel,
- accel_key,
- accel_mods );
- }
#endif // wxUSE_ACCEL
+ wxMenuItemBase::SetItemLabel(str);
+ if (m_menuItem)
+ SetGtkLabel();
}
-// NOTE: this function is different from the similar functions GTKProcessMnemonics()
-// implemented in control.cpp and from wxMenuItemBase::GetLabelText...
-// so there's no real code duplication
-wxString wxMenuItem::GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey)
+void wxMenuItem::SetGtkLabel()
{
- wxString text;
-
- // '\t' is the deliminator indicating a hot key
- wxString::const_iterator pc = str.begin();
- while ( pc != str.end() && *pc != wxT('\t') )
- {
- if (*pc == wxT('&'))
- {
- wxString::const_iterator next = pc + 1;
- if (next != str.end() && *next == wxT('&'))
- {
- // "&" is doubled to indicate "&" instead of accelerator
- ++pc;
- text << wxT('&');
- }
- else
- {
- text << wxT('_');
- }
- }
- else if ( *pc == wxT('_') ) // escape underscores
- {
- text << wxT("__");
- }
- else
- {
- text << *pc;
- }
- ++pc;
- }
-
- if (hotKey)
+ const wxString text = wxConvertMnemonicsToGTK(m_text.BeforeFirst('\t'));
+ GtkLabel* label = GTK_LABEL(GTK_BIN(m_menuItem)->child);
+ gtk_label_set_text_with_mnemonic(label, wxGTK_CONV_SYS(text));
+#if wxUSE_ACCEL
+ guint accel_key;
+ GdkModifierType accel_mods;
+ wxGetGtkAccel(this, &accel_key, &accel_mods);
+ if (accel_key)
{
- hotKey->Empty();
- if(*pc == wxT('\t'))
- {
- pc++;
- hotKey->assign(pc, str.end());
- }
+ gtk_widget_add_accelerator(
+ m_menuItem, "activate", m_parentMenu->m_accel,
+ accel_key, accel_mods, GTK_ACCEL_VISIBLE);
}
-
- return text;
-}
-
-// it's valid for this function to be called even if m_menuItem == NULL
-void wxMenuItem::DoSetText( const wxString& str )
-{
- m_text.Empty();
- m_text = GTKProcessMenuItemLabel(str, &m_hotKey);
+#endif // wxUSE_ACCEL
}
-#if wxUSE_ACCEL
-
-wxAcceleratorEntry *wxMenuItem::GetAccel() const
+void wxMenuItem::SetBitmap(const wxBitmap& bitmap)
{
- if ( !GetHotKey() )
- {
- // nothing
- return NULL;
- }
-
- // accelerator parsing code looks for them after a TAB, so insert a dummy
- // one here
- wxString label;
- label << wxT('\t') << GetHotKey();
-
- return wxAcceleratorEntry::Create(label);
+ if (m_kind == wxITEM_NORMAL)
+ m_bitmap = bitmap;
+ else
+ wxFAIL_MSG("only normal menu items can have bitmaps");
}
-#endif // wxUSE_ACCEL
-
void wxMenuItem::Check( bool check )
{
wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
// wxMenu
//-----------------------------------------------------------------------------
+extern "C" {
+// "map" from m_menu
+static void menu_map(GtkWidget*, wxMenu* menu)
+{
+ wxMenuEvent event(wxEVT_MENU_OPEN, menu->m_popupShown ? -1 : 0, menu);
+ DoCommonMenuCallbackCode(menu, event);
+}
+
+// "hide" from m_menu
+static void menu_hide(GtkWidget*, wxMenu* menu)
+{
+ wxMenuEvent event(wxEVT_MENU_CLOSE, menu->m_popupShown ? -1 : 0, menu);
+ menu->m_popupShown = false;
+ DoCommonMenuCallbackCode(menu, event);
+}
+}
+
IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
void wxMenu::Init()
{
+ m_popupShown = false;
+
m_accel = gtk_accel_group_new();
m_menu = gtk_menu_new();
// NB: keep reference to the menu so that it is not destroyed behind
Append(wxGTK_TITLE_ID, m_title);
AppendSeparator();
}
+
+ // "show" occurs for sub-menus which are not showing, so use "map" instead
+ g_signal_connect(m_menu, "map", G_CALLBACK(menu_map), this);
+ g_signal_connect(m_menu, "hide", G_CALLBACK(menu_hide), this);
}
wxMenu::~wxMenu()
{
- if ( GTK_IS_WIDGET( m_menu ))
- {
- // see wxMenu::Init
- g_object_unref(m_menu);
- g_object_unref( m_accel );
-
- // if the menu is inserted in another menu at this time, there was
- // one more reference to it:
- if ( m_owner )
- gtk_widget_destroy( m_menu );
- }
+ // see wxMenu::Init
+ g_object_unref(m_menu);
+
+ // if the menu is inserted in another menu at this time, there was
+ // one more reference to it:
+ if (m_owner)
+ gtk_widget_destroy(m_menu);
+
+ g_object_unref(m_accel);
}
void wxMenu::SetLayoutDirection(const wxLayoutDirection dir)
bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
{
GtkWidget *menuItem;
-
- // cache some data used later
- wxString text = mitem->wxMenuItemBase::GetItemLabel();
- int id = mitem->GetId();
- bool isstock = wxIsStockID(id);
- const char *stockid = NULL;
- if (isstock)
- stockid = wxGetStockGtkID(mitem->GetId());
-
- // stock menu items can have an empty label
- if (text.IsEmpty() && !mitem->IsSeparator())
- {
- wxASSERT_MSG(isstock, wxT("A non-stock menu item with an empty label?"));
- text = wxGetStockLabel(id);
-
- // need & => _ conversion
- text = wxMenuItem::GTKProcessMenuItemLabel(text, NULL);
- }
-
- if ( mitem->IsSeparator() )
- {
- menuItem = gtk_separator_menu_item_new();
- m_prevRadio = NULL;
- }
- else if ( mitem->GetBitmap().Ok() ||
- (mitem->GetKind() == wxITEM_NORMAL && isstock) )
- {
- wxBitmap bitmap(mitem->GetBitmap());
-
- menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
-
- GtkWidget *image;
- if ( !bitmap.Ok() )
- {
- // use stock bitmap for this item if available on the assumption
- // that it never hurts to follow GTK+ conventions more closely
- image = stockid ? gtk_image_new_from_stock(stockid, GTK_ICON_SIZE_MENU)
- : NULL;
- }
- else // we have a custom bitmap
- {
- wxASSERT_MSG( mitem->GetKind() == wxITEM_NORMAL,
- _T("only normal menu items can have bitmaps") );
-
- if ( bitmap.HasPixbuf() )
- {
- image = gtk_image_new_from_pixbuf(bitmap.GetPixbuf());
- }
- else
- {
- GdkPixmap *gdk_pixmap = bitmap.GetPixmap();
- GdkBitmap *gdk_bitmap = bitmap.GetMask() ?
- bitmap.GetMask()->GetBitmap() :
- (GdkBitmap*) NULL;
- image = gtk_image_new_from_pixmap( gdk_pixmap, gdk_bitmap );
- }
- }
-
- if ( image )
- {
- gtk_widget_show(image);
-
- gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image );
- }
-
- m_prevRadio = NULL;
- }
- else // a normal item
+ GtkWidget* prevRadio = m_prevRadio;
+ m_prevRadio = NULL;
+ switch (mitem->GetKind())
{
- // NB: 'text' variable has "_" instead of "&" after mitem->SetItemLabel()
- // so don't use it
-
- switch ( mitem->GetKind() )
- {
- case wxITEM_CHECK:
- {
- menuItem = gtk_check_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
- m_prevRadio = NULL;
- break;
- }
-
- case wxITEM_RADIO:
+ case wxITEM_SEPARATOR:
+ menuItem = gtk_separator_menu_item_new();
+ break;
+ case wxITEM_CHECK:
+ menuItem = gtk_check_menu_item_new_with_label("");
+ break;
+ case wxITEM_RADIO:
{
- GSList *group = NULL;
- if ( m_prevRadio == NULL )
- {
- // start of a new radio group
- m_prevRadio = menuItem =
- gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV_SYS( text ) );
- }
- else // continue the radio group
- {
- group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (m_prevRadio));
- m_prevRadio = menuItem =
- gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV_SYS( text ) );
- }
- break;
+ GSList* group = NULL;
+ if (prevRadio)
+ group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(prevRadio));
+ menuItem = gtk_radio_menu_item_new_with_label(group, "");
+ m_prevRadio = menuItem;
}
-
- default:
- wxFAIL_MSG( _T("unexpected menu item kind") );
- // fall through
-
- case wxITEM_NORMAL:
+ break;
+ default:
+ wxFAIL_MSG("unexpected menu item kind");
+ // fall through
+ case wxITEM_NORMAL:
+ const wxBitmap& bitmap = mitem->GetBitmap();
+ const char* stockid;
+ if (bitmap.IsOk())
{
- menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV_SYS( text ) );
- m_prevRadio = NULL;
- break;
+ // always use pixbuf, because pixmap mask does not
+ // work with disabled images in some themes
+ GtkWidget* image = gtk_image_new_from_pixbuf(bitmap.GetPixbuf());
+ menuItem = gtk_image_menu_item_new_with_label("");
+ gtk_widget_show(image);
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), image);
}
- }
-
- }
-
-#if wxUSE_ACCEL
- guint accel_key;
- GdkModifierType accel_mods;
- wxCharBuffer buf = wxGTK_CONV_SYS( GetGtkHotKey(*mitem) );
-
- if (buf[(size_t)0] != '\0')
- {
- gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
- if (accel_key != 0)
- {
- gtk_widget_add_accelerator (menuItem,
- "activate",
- m_accel,
- accel_key,
- accel_mods,
- GTK_ACCEL_VISIBLE);
- }
- }
- else if (isstock)
- {
- // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
- if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
- gtk_widget_add_accelerator( menuItem,
- "activate",
- m_accel,
- accel_key,
- accel_mods,
- GTK_ACCEL_VISIBLE);
+ else if ((stockid = wxGetStockGtkID(mitem->GetId())) != NULL)
+ // use stock bitmap for this item if available on the assumption
+ // that it never hurts to follow GTK+ conventions more closely
+ menuItem = gtk_image_menu_item_new_from_stock(stockid, NULL);
+ else
+ menuItem = gtk_menu_item_new_with_label("");
+ break;
}
-#endif // wxUSE_ACCEL
+ mitem->SetMenuItem(menuItem);
- if (pos == -1)
- gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);
- else
- gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos);
+ gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos);
gtk_widget_show( menuItem );
if ( !mitem->IsSeparator() )
{
- wxASSERT_MSG( menuItem, wxT("invalid menuitem") );
-
+ mitem->SetGtkLabel();
g_signal_connect (menuItem, "select",
- G_CALLBACK (gtk_menu_hilight_callback), this);
+ G_CALLBACK(menuitem_select), mitem);
g_signal_connect (menuItem, "deselect",
- G_CALLBACK (gtk_menu_nolight_callback), this);
+ G_CALLBACK(menuitem_deselect), mitem);
if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK )
{
else
{
g_signal_connect (menuItem, "activate",
- G_CALLBACK (gtk_menu_clicked_callback),
- this);
+ G_CALLBACK(menuitem_activate),
+ mitem);
}
}
- mitem->SetMenuItem(menuItem);
-
- if (ms_locked)
- {
- // This doesn't even exist!
- // gtk_widget_lock_accelerators(mitem->GetMenuItem());
- }
-
return true;
}
m_prevRadio = NULL;
}
- // TODO: this code doesn't delete the item factory item and this seems
- // impossible as of GTK 1.2.6.
- gtk_widget_destroy( mitem );
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);
+ gtk_widget_destroy(mitem);
+ item->SetMenuItem(NULL);
return item;
}
-int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
-{
- wxMenuItemList::compatibility_iterator node = m_items.GetFirst();
- while (node)
- {
- wxMenuItem *item = node->GetData();
- if (item->GetMenuItem() == menuItem)
- return item->GetId();
- node = node->GetNext();
- }
-
- return wxNOT_FOUND;
-}
-
void wxMenu::Attach(wxMenuBarBase *menubar)
{
wxMenuBase::Attach(menubar);
return hotkey;
}
-#endif // wxUSE_ACCEL
-
-// ----------------------------------------------------------------------------
-// Pop-up menu stuff
-// ----------------------------------------------------------------------------
-
-#if wxUSE_MENUS_NATIVE
-
-extern "C" WXDLLIMPEXP_CORE
-void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting )
-{
- *is_waiting = false;
-}
-
-WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win )
+static void
+wxGetGtkAccel(const wxMenuItem* item, guint* accel_key, GdkModifierType* accel_mods)
{
- menu->SetInvokingWindow( win );
-
- wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
- while (node)
+ *accel_key = 0;
+ const wxString string = GetGtkHotKey(*item);
+ if (!string.empty())
+ gtk_accelerator_parse(wxGTK_CONV_SYS(string), accel_key, accel_mods);
+ else
{
- wxMenuItem *menuitem = node->GetData();
- if (menuitem->IsSubMenu())
+ GtkStockItem stock_item;
+ const char* stockid = wxGetStockGtkID(item->GetId());
+ if (stockid && gtk_stock_lookup(stockid, &stock_item))
{
- SetInvokingWindow( menuitem->GetSubMenu(), win );
+ *accel_key = stock_item.keyval;
+ *accel_mods = stock_item.modifier;
}
-
- node = node->GetNext();
- }
-}
-
-extern "C" WXDLLIMPEXP_CORE
-void wxPopupMenuPositionCallback( GtkMenu *menu,
- gint *x, gint *y,
- gboolean * WXUNUSED(whatever),
- gpointer user_data )
-{
- // ensure that the menu appears entirely on screen
- GtkRequisition req;
- gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req);
-
- wxSize sizeScreen = wxGetDisplaySize();
- wxPoint *pos = (wxPoint*)user_data;
-
- gint xmax = sizeScreen.x - req.width,
- ymax = sizeScreen.y - req.height;
-
- *x = pos->x < xmax ? pos->x : xmax;
- *y = pos->y < ymax ? pos->y : ymax;
-}
-
-bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
-{
- wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
-
- wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") );
-
- // NOTE: if you change this code, you need to update
- // the same code in taskbar.cpp as well. This
- // is ugly code duplication, I know.
-
- SetInvokingWindow( menu, this );
-
- menu->UpdateUI();
-
- bool is_waiting = true;
-
- gulong handler = g_signal_connect (menu->m_menu, "hide",
- G_CALLBACK (gtk_pop_hide_callback),
- &is_waiting);
-
- wxPoint pos;
- gpointer userdata;
- GtkMenuPositionFunc posfunc;
- if ( x == -1 && y == -1 )
- {
- // use GTK's default positioning algorithm
- userdata = NULL;
- posfunc = NULL;
- }
- else
- {
- pos = ClientToScreen(wxPoint(x, y));
- userdata = &pos;
- posfunc = wxPopupMenuPositionCallback;
- }
-
- wxMenuEvent eventOpen(wxEVT_MENU_OPEN, -1, menu);
- DoCommonMenuCallbackCode(menu, eventOpen);
-
- gtk_menu_popup(
- GTK_MENU(menu->m_menu),
- (GtkWidget *) NULL, // parent menu shell
- (GtkWidget *) NULL, // parent menu item
- posfunc, // function to position it
- userdata, // client data
- 0, // button used to activate it
- gtk_get_current_event_time()
- );
-
- while (is_waiting)
- {
- gtk_main_iteration();
}
-
- g_signal_handler_disconnect (menu->m_menu, handler);
-
- wxMenuEvent eventClose(wxEVT_MENU_CLOSE, -1, menu);
- DoCommonMenuCallbackCode(menu, eventClose);
-
- return true;
}
-
-#endif // wxUSE_MENUS_NATIVE
-
-#include <gtk/gtk.h>
+#endif // wxUSE_ACCEL
const char *wxGetStockGtkID(wxWindowID id)
{
case wx: \
return gtk;
- #define STOCKITEM_MISSING(wx) \
- case wx: \
- return NULL;
-
- #if GTK_CHECK_VERSION(2,4,0)
- #define STOCKITEM_24(wx,gtk) STOCKITEM(wx,gtk)
+ #if GTK_CHECK_VERSION(2,6,0)
+ #define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk)
#else
- #define STOCKITEM_24(wx,gtk) STOCKITEM_MISSING(wx)
+ #define STOCKITEM_26(wx,gtk)
#endif
- #if GTK_CHECK_VERSION(2,6,0)
- #define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk)
+ #if GTK_CHECK_VERSION(2,8,0)
+ #define STOCKITEM_28(wx,gtk) STOCKITEM(wx,gtk)
#else
- #define STOCKITEM_26(wx,gtk) STOCKITEM_MISSING(wx)
+ #define STOCKITEM_28(wx,gtk)
#endif
#if GTK_CHECK_VERSION(2,10,0)
#define STOCKITEM_210(wx,gtk) STOCKITEM(wx,gtk)
#else
- #define STOCKITEM_210(wx,gtk) STOCKITEM_MISSING(wx)
+ #define STOCKITEM_210(wx,gtk)
#endif
STOCKITEM_26(wxID_ABOUT, GTK_STOCK_ABOUT)
STOCKITEM(wxID_ADD, GTK_STOCK_ADD)
STOCKITEM(wxID_APPLY, GTK_STOCK_APPLY)
+ STOCKITEM(wxID_BACKWARD, GTK_STOCK_GO_BACK)
STOCKITEM(wxID_BOLD, GTK_STOCK_BOLD)
+ STOCKITEM(wxID_BOTTOM, GTK_STOCK_GOTO_BOTTOM)
STOCKITEM(wxID_CANCEL, GTK_STOCK_CANCEL)
+ STOCKITEM(wxID_CDROM, GTK_STOCK_CDROM)
STOCKITEM(wxID_CLEAR, GTK_STOCK_CLEAR)
STOCKITEM(wxID_CLOSE, GTK_STOCK_CLOSE)
+ STOCKITEM(wxID_CONVERT, GTK_STOCK_CONVERT)
STOCKITEM(wxID_COPY, GTK_STOCK_COPY)
STOCKITEM(wxID_CUT, GTK_STOCK_CUT)
STOCKITEM(wxID_DELETE, GTK_STOCK_DELETE)
+ STOCKITEM(wxID_DOWN, GTK_STOCK_GO_DOWN)
STOCKITEM_26(wxID_EDIT, GTK_STOCK_EDIT)
- STOCKITEM(wxID_FIND, GTK_STOCK_FIND)
+ STOCKITEM(wxID_EXECUTE, GTK_STOCK_EXECUTE)
+ STOCKITEM(wxID_EXIT, GTK_STOCK_QUIT)
STOCKITEM_26(wxID_FILE, GTK_STOCK_FILE)
- STOCKITEM(wxID_REPLACE, GTK_STOCK_FIND_AND_REPLACE)
- STOCKITEM(wxID_BACKWARD, GTK_STOCK_GO_BACK)
- STOCKITEM(wxID_DOWN, GTK_STOCK_GO_DOWN)
+ STOCKITEM(wxID_FIND, GTK_STOCK_FIND)
+ STOCKITEM(wxID_FIRST, GTK_STOCK_GOTO_FIRST)
+ STOCKITEM(wxID_FLOPPY, GTK_STOCK_FLOPPY)
STOCKITEM(wxID_FORWARD, GTK_STOCK_GO_FORWARD)
- STOCKITEM(wxID_UP, GTK_STOCK_GO_UP)
+ STOCKITEM(wxID_HARDDISK, GTK_STOCK_HARDDISK)
STOCKITEM(wxID_HELP, GTK_STOCK_HELP)
STOCKITEM(wxID_HOME, GTK_STOCK_HOME)
- STOCKITEM_24(wxID_INDENT, GTK_STOCK_INDENT)
+ STOCKITEM(wxID_INDENT, GTK_STOCK_INDENT)
STOCKITEM(wxID_INDEX, GTK_STOCK_INDEX)
+ STOCKITEM_28(wxID_INFO, GTK_STOCK_INFO)
STOCKITEM(wxID_ITALIC, GTK_STOCK_ITALIC)
+ STOCKITEM(wxID_JUMP_TO, GTK_STOCK_JUMP_TO)
STOCKITEM(wxID_JUSTIFY_CENTER, GTK_STOCK_JUSTIFY_CENTER)
STOCKITEM(wxID_JUSTIFY_FILL, GTK_STOCK_JUSTIFY_FILL)
STOCKITEM(wxID_JUSTIFY_LEFT, GTK_STOCK_JUSTIFY_LEFT)
STOCKITEM(wxID_JUSTIFY_RIGHT, GTK_STOCK_JUSTIFY_RIGHT)
+ STOCKITEM(wxID_LAST, GTK_STOCK_GOTO_LAST)
+ STOCKITEM(wxID_NETWORK, GTK_STOCK_NETWORK)
STOCKITEM(wxID_NEW, GTK_STOCK_NEW)
STOCKITEM(wxID_NO, GTK_STOCK_NO)
STOCKITEM(wxID_OK, GTK_STOCK_OK)
STOCKITEM(wxID_OPEN, GTK_STOCK_OPEN)
STOCKITEM(wxID_PASTE, GTK_STOCK_PASTE)
STOCKITEM(wxID_PREFERENCES, GTK_STOCK_PREFERENCES)
- STOCKITEM(wxID_PRINT, GTK_STOCK_PRINT)
STOCKITEM(wxID_PREVIEW, GTK_STOCK_PRINT_PREVIEW)
+ STOCKITEM(wxID_PRINT, GTK_STOCK_PRINT)
STOCKITEM(wxID_PROPERTIES, GTK_STOCK_PROPERTIES)
- STOCKITEM(wxID_EXIT, GTK_STOCK_QUIT)
STOCKITEM(wxID_REDO, GTK_STOCK_REDO)
STOCKITEM(wxID_REFRESH, GTK_STOCK_REFRESH)
STOCKITEM(wxID_REMOVE, GTK_STOCK_REMOVE)
+ STOCKITEM(wxID_REPLACE, GTK_STOCK_FIND_AND_REPLACE)
STOCKITEM(wxID_REVERT_TO_SAVED, GTK_STOCK_REVERT_TO_SAVED)
STOCKITEM(wxID_SAVE, GTK_STOCK_SAVE)
STOCKITEM(wxID_SAVEAS, GTK_STOCK_SAVE_AS)
STOCKITEM_210(wxID_SELECTALL, GTK_STOCK_SELECT_ALL)
+ STOCKITEM(wxID_SELECT_COLOR, GTK_STOCK_SELECT_COLOR)
+ STOCKITEM(wxID_SELECT_FONT, GTK_STOCK_SELECT_FONT)
+ STOCKITEM(wxID_SORT_ASCENDING, GTK_STOCK_SORT_ASCENDING)
+ STOCKITEM(wxID_SORT_DESCENDING, GTK_STOCK_SORT_DESCENDING)
+ STOCKITEM(wxID_SPELL_CHECK, GTK_STOCK_SPELL_CHECK)
STOCKITEM(wxID_STOP, GTK_STOCK_STOP)
+ STOCKITEM(wxID_STRIKETHROUGH, GTK_STOCK_STRIKETHROUGH)
+ STOCKITEM(wxID_TOP, GTK_STOCK_GOTO_TOP)
STOCKITEM(wxID_UNDELETE, GTK_STOCK_UNDELETE)
STOCKITEM(wxID_UNDERLINE, GTK_STOCK_UNDERLINE)
STOCKITEM(wxID_UNDO, GTK_STOCK_UNDO)
- STOCKITEM_24(wxID_UNINDENT, GTK_STOCK_UNINDENT)
+ STOCKITEM(wxID_UNINDENT, GTK_STOCK_UNINDENT)
+ STOCKITEM(wxID_UP, GTK_STOCK_GO_UP)
STOCKITEM(wxID_YES, GTK_STOCK_YES)
STOCKITEM(wxID_ZOOM_100, GTK_STOCK_ZOOM_100)
STOCKITEM(wxID_ZOOM_FIT, GTK_STOCK_ZOOM_FIT)
STOCKITEM(wxID_ZOOM_OUT, GTK_STOCK_ZOOM_OUT)
default:
- wxFAIL_MSG( _T("invalid stock item ID") );
break;
};
return NULL;
}
-#if wxUSE_ACCEL
-static
-bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
-{
- if (!id)
- return false;
-
- GtkStockItem stock_item;
- if (gtk_stock_lookup (id, &stock_item))
- {
- if (key) *key = stock_item.keyval;
- if (mod) *mod = stock_item.modifier;
-
- // some GTK stock items have zero values for the keyval;
- // it means that they do not have an accelerator...
- if (stock_item.keyval)
- return true;
- }
-
- return false;
-}
-#endif // wxUSE_ACCEL
-
#endif // wxUSE_MENUS
projects / wxWidgets.git / blobdiff