// 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
PostCreation();
- ApplyWidgetStyle();
+ GTKApplyWidgetStyle();
#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+ g_object_ref(m_widget);
+
for (size_t i = 0; i < n; ++i )
Append(menus[i], titles[i]);
}
static void
wxMenubarUnsetInvokingWindow(wxMenu* menu, wxWindow* win, GtkWindow* tlw = NULL)
{
- menu->SetInvokingWindow( (wxWindow*) NULL );
+ menu->SetInvokingWindow( NULL );
// support for native hot keys
if (menu->m_accel)
void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
{
- m_invokingWindow = (wxWindow*) NULL;
+ m_invokingWindow = NULL;
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
wxMenu *menuOld = Remove(pos);
if ( menuOld && !Insert(pos, menu, title) )
{
- return (wxMenu*) NULL;
+ return NULL;
}
// either Insert() succeeded or Remove() failed and menuOld is NULL
{
wxMenu *menu = wxMenuBarBase::Remove(pos);
if ( !menu )
- return (wxMenu*) NULL;
+ return NULL;
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu->m_owner), NULL);
gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner);
if ( menuForItem )
{
- *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL;
+ *menuForItem = result ? result->GetMenu() : NULL;
}
return result;
//-----------------------------------------------------------------------------
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 );
// 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);
-}
-
void wxMenuItem::SetItemLabel( const wxString& str )
{
#if wxUSE_ACCEL
}
}
+// "can_activate_accel" from menu item
+extern "C" {
+static gboolean can_activate_accel(GtkWidget*, guint, wxMenu* menu)
+{
+ menu->UpdateUI();
+ // always allow our "activate" handler to be called
+ return true;
+}
+}
+
IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
void wxMenu::Init()
g_object_ref(m_menu);
gtk_object_sink(GTK_OBJECT(m_menu));
- m_owner = (GtkWidget*) NULL;
+ m_owner = NULL;
// Tearoffs are entries, just like separators. So if we want this
// menu to be a tear-off one, we just append a tearoff entry
const char* stockid;
if (bitmap.IsOk())
{
- GtkWidget* image;
- if (bitmap.HasPixbuf())
- image = gtk_image_new_from_pixbuf(bitmap.GetPixbuf());
- else
- {
- GdkPixmap* mask = NULL;
- if (bitmap.GetMask())
- mask = bitmap.GetMask()->GetBitmap();
- image = gtk_image_new_from_pixmap(bitmap.GetPixmap(), mask);
- }
+ // 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);
{
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, "can_activate_accel",
+ G_CALLBACK(can_activate_accel), this);
g_signal_connect (menuItem, "activate",
- G_CALLBACK (gtk_menu_clicked_callback),
- this);
+ G_CALLBACK(menuitem_activate),
+ mitem);
}
}
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);
#define STOCKITEM_26(wx,gtk)
#endif
+ #if GTK_CHECK_VERSION(2,8,0)
+ #define STOCKITEM_28(wx,gtk) STOCKITEM(wx,gtk)
+ #else
+ #define STOCKITEM_28(wx,gtk)
+ #endif
+
#if GTK_CHECK_VERSION(2,10,0)
#define STOCKITEM_210(wx,gtk) STOCKITEM(wx,gtk)
#else
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(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(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)
projects / wxWidgets.git / blobdiff