if (handler && handler->SafelyProcessEvent(event))
return;
- wxWindow *win = menu->GetInvokingWindow();
- if (win)
- win->HandleWindowEvent( event );
+ wxWindow *win = menu->GetWindow();
+ wxCHECK_RET( win, "event for a menu without associated window?" );
+
+ win->HandleWindowEvent( event );
}
//-----------------------------------------------------------------------------
// wxMenuBar
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
-
void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
{
- m_invokingWindow = NULL;
-
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// Hildon window uses a single menu instead of a menu bar, so wxMenuBar is
// the same as menu in this case
Init(0, NULL, NULL, 0);
}
-static void
-wxMenubarUnsetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL)
+// recursive helpers for wxMenuBar::Attach() and Detach(): they are called to
+// associate the menus with the frame they belong to or dissociate them from it
+namespace
{
- menu->SetInvokingWindow( NULL );
+void
+DetachFromFrame(wxMenu* menu, wxFrame* frame)
+{
// support for native hot keys
if (menu->m_accel)
{
- if (tlw == NULL)
- tlw = GTK_WINDOW(wxGetTopLevelParent(win)->m_widget);
+ // Note that wxGetTopLevelParent() is really needed because this frame
+ // can be an MDI child frame which is a fake frame and not a TLW at all
+ GtkWindow * const tlw = GTK_WINDOW(wxGetTopLevelParent(frame)->m_widget);
if (g_slist_find(menu->m_accel->acceleratables, tlw))
gtk_window_remove_accel_group(tlw, menu->m_accel);
}
{
wxMenuItem *menuitem = node->GetData();
if (menuitem->IsSubMenu())
- wxMenubarUnsetInvokingWindow(menuitem->GetSubMenu(), win, tlw);
+ DetachFromFrame(menuitem->GetSubMenu(), frame);
node = node->GetNext();
}
}
-static void
-wxMenubarSetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL)
+void
+AttachToFrame(wxMenu* menu, wxFrame* frame)
{
- menu->SetInvokingWindow( win );
-
// support for native hot keys
if (menu->m_accel)
{
- if (tlw == NULL)
- tlw = GTK_WINDOW(wxGetTopLevelParent(win)->m_widget);
+ GtkWindow * const tlw = GTK_WINDOW(wxGetTopLevelParent(frame)->m_widget);
if (!g_slist_find(menu->m_accel->acceleratables, tlw))
gtk_window_add_accel_group(tlw, menu->m_accel);
}
{
wxMenuItem *menuitem = node->GetData();
if (menuitem->IsSubMenu())
- wxMenubarSetInvokingWindow(menuitem->GetSubMenu(), win, tlw);
+ AttachToFrame(menuitem->GetSubMenu(), frame);
node = node->GetNext();
}
}
-void wxMenuBar::SetInvokingWindow( wxWindow *win )
-{
- m_invokingWindow = win;
-
- wxMenuList::compatibility_iterator node = m_menus.GetFirst();
- while (node)
- {
- wxMenu *menu = node->GetData();
- wxMenubarSetInvokingWindow( menu, win );
- node = node->GetNext();
- }
-}
+} // anonymous namespace
void wxMenuBar::SetLayoutDirection(wxLayoutDirection dir)
{
{
wxMenuBarBase::Attach(frame);
+ wxMenuList::compatibility_iterator node = m_menus.GetFirst();
+ while (node)
+ {
+ wxMenu *menu = node->GetData();
+ AttachToFrame( menu, frame );
+ node = node->GetNext();
+ }
+
SetLayoutDirection(wxLayout_Default);
}
-void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
+void wxMenuBar::Detach()
{
- m_invokingWindow = NULL;
-
wxMenuList::compatibility_iterator node = m_menus.GetFirst();
while (node)
{
wxMenu *menu = node->GetData();
- wxMenubarUnsetInvokingWindow( menu, win );
+ DetachFromFrame( menu, m_menuBarFrame );
node = node->GetNext();
}
+
+ wxMenuBarBase::Detach();
}
bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
{
- if ( !wxMenuBarBase::Append( menu, title ) )
- return false;
-
- return GtkAppend(menu, title);
+ if (wxMenuBarBase::Append(menu, title))
+ {
+ GtkAppend(menu, title);
+ return true;
+ }
+ return false;
}
-bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
+void wxMenuBar::GtkAppend(wxMenu* menu, const wxString& title, int pos)
{
menu->SetLayoutDirection(GetLayoutDirection());
const wxString str(wxStripMenuCodes(item->GetItemLabel()));
if ( item->IsSubMenu() )
- return GtkAppend(item->GetSubMenu(), str, pos);
+ {
+ GtkAppend(item->GetSubMenu(), str, pos);
+ return;
+ }
menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
else
gtk_menu_shell_insert( GTK_MENU_SHELL(m_menubar), menu->m_owner, pos );
- // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
- // addings menu later on.
- if (m_invokingWindow)
- wxMenubarSetInvokingWindow( menu, m_invokingWindow );
-
- return true;
+ if ( m_menuBarFrame )
+ AttachToFrame( menu, m_menuBarFrame );
}
bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
{
- if ( !wxMenuBarBase::Insert(pos, menu, title) )
- return false;
-
- // TODO
-
- if ( !GtkAppend(menu, title, (int)pos) )
- return false;
-
- return true;
+ if (wxMenuBarBase::Insert(pos, menu, title))
+ {
+ GtkAppend(menu, title, int(pos));
+ return true;
+ }
+ return false;
}
wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
gtk_widget_destroy( menu->m_owner );
menu->m_owner = NULL;
- if (m_invokingWindow)
- wxMenubarUnsetInvokingWindow( menu, m_invokingWindow );
+ DetachFromFrame( menu, m_menuBarFrame );
return menu;
}
static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
{
- if (wxMenuItem::GetLabelText(wxConvertMnemonicsFromGTK(menu->GetTitle())) == wxMenuItem::GetLabelText(menuString))
+ if (wxMenuItem::GetLabelText(menu->GetTitle()) == wxMenuItem::GetLabelText(menuString))
{
int res = menu->FindItem( itemString );
if (res != wxNOT_FOUND)
wxMenu* menu = node->GetData();
- return wxConvertMnemonicsFromGTK(menu->GetTitle());
+ return menu->GetTitle();
}
void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )
menu->SetTitle( str );
if (menu->m_owner)
- gtk_label_set_text_with_mnemonic( GTK_LABEL( GTK_BIN(menu->m_owner)->child), wxGTK_CONV(str) );
+ gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menu->m_owner))), wxGTK_CONV(str));
}
//-----------------------------------------------------------------------------
if (!item->IsEnabled())
return;
- wxMenu* menu = item->GetMenu();
wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item->GetId());
- event.SetEventObject( menu );
-
- wxEvtHandler* handler = menu->GetEventHandler();
- if (handler && handler->SafelyProcessEvent(event))
- return;
-
- wxWindow *win = menu->GetInvokingWindow();
- if (win) win->HandleWindowEvent( event );
+ DoCommonMenuCallbackCode(item->GetMenu(), event);
}
}
if (!item->IsEnabled())
return;
- wxMenu* menu = item->GetMenu();
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
- event.SetEventObject( menu );
-
- wxEvtHandler* handler = menu->GetEventHandler();
- if (handler && handler->SafelyProcessEvent(event))
- return;
-
- wxWindow *win = menu->GetInvokingWindow();
- if (win)
- win->HandleWindowEvent( event );
+ DoCommonMenuCallbackCode(item->GetMenu(), event);
}
}
// wxMenuItem
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-
wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
int id,
const wxString& name,
void wxMenuItem::SetGtkLabel()
{
const wxString text = wxConvertMnemonicsToGTK(m_text.BeforeFirst('\t'));
- GtkLabel* label = GTK_LABEL(GTK_BIN(m_menuItem)->child);
+ GtkLabel* label = GTK_LABEL(gtk_bin_get_child(GTK_BIN(m_menuItem)));
gtk_label_set_text_with_mnemonic(label, wxGTK_CONV_SYS(text));
#if wxUSE_ACCEL
guint accel_key;
if (m_kind == wxITEM_NORMAL)
m_bitmap = bitmap;
else
+ {
wxFAIL_MSG("only normal menu items can have bitmaps");
+ }
}
void wxMenuItem::Check( bool check )
wxCHECK_MSG( IsCheckable(), false,
wxT("can't get state of uncheckable item!") );
- return ((GtkCheckMenuItem*)m_menuItem)->active != 0;
+ return gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(m_menuItem)) != 0;
}
//-----------------------------------------------------------------------------
}
}
-IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
-
void wxMenu::Init()
{
m_popupShown = false;
m_menu = gtk_menu_new();
// NB: keep reference to the menu so that it is not destroyed behind
// our back by GTK+ e.g. when it is removed from menubar:
- g_object_ref(m_menu);
- gtk_object_sink(GTK_OBJECT(m_menu));
+ g_object_ref_sink(m_menu);
m_owner = NULL;
gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff);
}
- m_prevRadio = NULL;
-
// append the title as the very first entry if we have it
if ( !m_title.empty() )
{
wxMenu::~wxMenu()
{
+ // Destroying a menu generates a "hide" signal even if it's not shown
+ // currently, so disconnect it to avoid dummy wxEVT_MENU_CLOSE events
+ // generation.
+ g_signal_handlers_disconnect_by_func(m_menu, (gpointer)menu_hide, this);
+
// see wxMenu::Init
g_object_unref(m_menu);
return wxWindow::GTKGetLayout(m_owner);
}
-bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
+wxString wxMenu::GetTitle() const
+{
+ return wxConvertMnemonicsFromGTK(wxMenuBase::GetTitle());
+}
+
+void wxMenu::GtkAppend(wxMenuItem* mitem, int pos)
{
GtkWidget *menuItem;
- GtkWidget* prevRadio = m_prevRadio;
- m_prevRadio = NULL;
switch (mitem->GetKind())
{
case wxITEM_SEPARATOR:
break;
case wxITEM_RADIO:
{
+ // See if we need to create a new radio group for this item or
+ // add it to an existing one.
+ wxMenuItem* radioGroupItem = NULL;
+
+ const size_t numItems = GetMenuItemCount();
+ const size_t n = pos == -1 ? numItems - 1 : size_t(pos);
+
+ if (n != 0)
+ {
+ wxMenuItem* const itemPrev = FindItemByPosition(n - 1);
+ if ( itemPrev->GetKind() == wxITEM_RADIO )
+ {
+ // Appending an item after an existing radio item puts
+ // it into the same radio group.
+ radioGroupItem = itemPrev;
+ }
+ }
+
+ if (radioGroupItem == NULL && n != numItems - 1)
+ {
+ wxMenuItem* const itemNext = FindItemByPosition(n + 1);
+ if ( itemNext->GetKind() == wxITEM_RADIO )
+ {
+ // Inserting an item before an existing radio item
+ // also puts it into the existing radio group.
+ radioGroupItem = itemNext;
+ }
+ }
+
GSList* group = NULL;
- if (prevRadio)
- group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(prevRadio));
+ if ( radioGroupItem )
+ {
+ group = gtk_radio_menu_item_get_group(
+ GTK_RADIO_MENU_ITEM(radioGroupItem->GetMenuItem())
+ );
+ }
+
menuItem = gtk_radio_menu_item_new_with_label(group, "");
- m_prevRadio = menuItem;
}
break;
default:
gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
gtk_widget_show( mitem->GetSubMenu()->m_menu );
-
- // if adding a submenu to a menu already existing in the menu bar, we
- // must set invoking window to allow processing events from this
- // submenu
- if ( m_invokingWindow )
- wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
}
else
{
mitem);
}
}
-
- return true;
}
wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem)
{
- if (!GtkAppend(mitem))
- return NULL;
-
- return wxMenuBase::DoAppend(mitem);
+ if (wxMenuBase::DoAppend(mitem))
+ {
+ GtkAppend(mitem);
+ return mitem;
+ }
+ return NULL;
}
wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
- if ( !wxMenuBase::DoInsert(pos, item) )
- return NULL;
-
- // TODO
- if ( !GtkAppend(item, (int)pos) )
- return NULL;
-
- return item;
+ if (wxMenuBase::DoInsert(pos, item))
+ {
+ GtkAppend(item, int(pos));
+ return item;
+ }
+ return NULL;
}
wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
return NULL;
GtkWidget * const mitem = item->GetMenuItem();
- if ( m_prevRadio == mitem )
+ if (!gtk_check_version(2,12,0))
+ {
+ // gtk_menu_item_remove_submenu() is deprecated since 2.12, but
+ // gtk_menu_item_set_submenu() can now be used with NULL submenu now so
+ // just do use it.
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);
+ }
+ else // GTK+ < 2.12
{
- // deleting an item starts a new radio group (has to as we shouldn't
- // keep a deleted pointer anyhow)
- m_prevRadio = NULL;
+ // In 2.10 calling gtk_menu_item_set_submenu() with NULL submenu
+ // results in critical GTK+ error messages so use the old function
+ // instead.
+ gtk_menu_item_remove_submenu(GTK_MENU_ITEM(mitem));
}
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);
gtk_widget_destroy(mitem);
item->SetMenuItem(NULL);
projects / wxWidgets.git / blobdiff