#include "wx/gtk/private.h"
#include "wx/gtk/private/mnemonics.h"
-// FIXME: is this right? somehow I don't think so (VZ)
-
-#define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
-#define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
-//#define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
-
-#define ACCEL_OBJECT GtkWindow
-#define ACCEL_OBJECTS(a) (a)->acceleratables
-#define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
-
// we use normal item but with a special id for the menu title
static const int wxGTK_TITLE_ID = -3;
static wxString GetGtkHotKey( const wxMenuItem& item );
#endif
-//-----------------------------------------------------------------------------
-// activate message from GTK
-//-----------------------------------------------------------------------------
-
static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
{
event.SetEventObject( menu );
wxEvtHandler* handler = menu->GetEventHandler();
- if (handler && handler->ProcessEvent(event))
+ if (handler && handler->SafelyProcessEvent(event))
return;
wxWindow *win = menu->GetInvokingWindow();
if (win)
- win->GetEventHandler()->ProcessEvent( 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);
-}
-
+ win->HandleWindowEvent( event );
}
//-----------------------------------------------------------------------------
void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
{
- m_style = style;
m_invokingWindow = NULL;
#if wxUSE_LIBHILDON
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
- ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
- if ( menu->m_accel && g_slist_find( ACCEL_OBJECTS(menu->m_accel), obj ) )
- gtk_accel_group_detach( menu->m_accel, obj );
+ 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
- ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
- if ( !g_slist_find( ACCEL_OBJECTS(menu->m_accel), obj ) )
- gtk_accel_group_attach( menu->m_accel, obj );
+ 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)
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)
if ( !menu )
return (wxMenu*) NULL;
- gtk_menu_item_remove_submenu( GTK_MENU_ITEM(menu->m_owner) );
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu->m_owner), NULL);
gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner);
gtk_widget_destroy( menu->m_owner );
if (item->IsCheckable())
commandEvent.SetInt(item->IsChecked());
- frame->GetEventHandler()->ProcessEvent(commandEvent);
+ frame->HandleWindowEvent(commandEvent);
}
else
{
event.SetEventObject( menu );
wxEvtHandler* handler = menu->GetEventHandler();
- if (handler && handler->ProcessEvent(event))
+ if (handler && handler->SafelyProcessEvent(event))
return;
wxWindow *win = menu->GetInvokingWindow();
- if (win) win->GetEventHandler()->ProcessEvent( event );
+ if (win) win->HandleWindowEvent( event );
}
}
event.SetEventObject( menu );
wxEvtHandler* handler = menu->GetEventHandler();
- if (handler && handler->ProcessEvent(event))
+ if (handler && handler->SafelyProcessEvent(event))
return;
wxWindow *win = menu->GetInvokingWindow();
if (win)
- win->GetEventHandler()->ProcessEvent( event );
+ win->HandleWindowEvent( event );
}
}
Init(text);
}
+#if WXWIN_COMPATIBILITY_2_8
wxMenuItem::wxMenuItem(wxMenu *parentMenu,
int id,
const wxString& text,
{
Init(text);
}
+#endif
void wxMenuItem::Init(const wxString& text)
{
- m_labelWidget = (GtkWidget *) NULL;
m_menuItem = (GtkWidget *) NULL;
DoSetText(text);
oldLabel.Replace(wxT("_"), wxT(""));
wxString label1 = wxStripMenuCodes(str);
#if wxUSE_ACCEL
- wxString oldhotkey = GetHotKey(); // Store the old hotkey in Ctrl-foo format
+ wxString oldhotkey = m_hotKey; // Store the old hotkey in Ctrl-foo format
wxCharBuffer oldbuf = wxGTK_CONV_SYS( GetGtkHotKey(*this) ); // and as <control>foo
#endif // wxUSE_ACCEL
#if wxUSE_ACCEL
if (oldLabel == label1 &&
- oldhotkey == GetHotKey()) // Make sure we can change a hotkey even if the label is unaltered
+ oldhotkey == m_hotKey) // 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())
text = GTKProcessMenuItemLabel(text, NULL);
}
- gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV_SYS(text) );
+ GtkLabel* label = GTK_LABEL(GTK_BIN(m_menuItem)->child);
+ gtk_label_set_text_with_mnemonic(label, wxGTK_CONV_SYS(text));
}
// remove old accelerator from our parent's accelerator group, if present
hotKey->Empty();
if(*pc == wxT('\t'))
{
- pc++;
+ ++pc;
hotKey->assign(pc, str.end());
}
}
wxAcceleratorEntry *wxMenuItem::GetAccel() const
{
- if ( !GetHotKey() )
+ if (m_hotKey.empty())
{
// nothing
return NULL;
// accelerator parsing code looks for them after a TAB, so insert a dummy
// one here
wxString label;
- label << wxT('\t') << GetHotKey();
+ label << wxT('\t') << m_hotKey;
return wxAcceleratorEntry::Create(label);
}
// 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
// our back by GTK+ e.g. when it is removed from menubar:
- gtk_widget_ref(m_menu);
+ g_object_ref(m_menu);
+ gtk_object_sink(GTK_OBJECT(m_menu));
m_owner = (GtkWidget*) NULL;
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
- gtk_widget_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 );
- }
-
- // This must come after we release GTK resources above. Otherwise, GTK will
- // give warnings/errors when attempting to free accelerator resources from
- // child items that just were destroyed (the m_menu widget can contain
- // references to accelerators in child items. Problem detected when removing
- // a menu from a wxMenuBar, and the removed menu had submenus with accelerators.)
- WX_CLEAR_LIST(wxMenuItemList, m_items);
+ // 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)
if ( mitem->IsSeparator() )
{
menuItem = gtk_separator_menu_item_new();
+ m_prevRadio = NULL;
}
else if ( mitem->GetBitmap().Ok() ||
(mitem->GetKind() == wxITEM_NORMAL && isstock) )
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;
}
#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 )
-{
- menu->SetInvokingWindow( win );
-
- wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
- while (node)
- {
- wxMenuItem *menuitem = node->GetData();
- if (menuitem->IsSubMenu())
- {
- SetInvokingWindow( menuitem->GetSubMenu(), win );
- }
-
- 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>
-
const char *wxGetStockGtkID(wxWindowID id)
{
#define STOCKITEM(wx,gtk) \
projects / wxWidgets.git / blobdiff