]> git.saurik.com Git - wxWidgets.git/blame - src/gtk1/menu.cpp
added wxEXEC_MAKE_GROUP_LEADER (patch 535422)
[wxWidgets.git] / src / gtk1 / menu.cpp
CommitLineData
c801d85f
KB
1/////////////////////////////////////////////////////////////////////////////
2// Name: menu.cpp
3// Purpose:
4// Author: Robert Roebling
96fd301f 5// Id: $Id$
a81258be 6// Copyright: (c) 1998 Robert Roebling
96fd301f 7// Licence: wxWindows licence
c801d85f
KB
8/////////////////////////////////////////////////////////////////////////////
9
c801d85f
KB
10#ifdef __GNUG__
11#pragma implementation "menu.h"
6ca41e57 12#pragma implementation "menuitem.h"
c801d85f
KB
13#endif
14
96fd301f 15#include "wx/log.h"
30dea054 16#include "wx/intl.h"
06cfab17 17#include "wx/app.h"
37d403aa 18#include "wx/bitmap.h"
3dfac970 19#include "wx/menu.h"
c801d85f 20
974e8d94
VZ
21#if wxUSE_ACCEL
22 #include "wx/accel.h"
23#endif // wxUSE_ACCEL
24
9e691f46
VZ
25#include "wx/gtk/private.h"
26
cc47eed9 27#include <gdk/gdkkeysyms.h>
9e691f46
VZ
28
29// FIXME: is this right? somehow I don't think so (VZ)
30#ifdef __WXGTK20__
31 #include <glib-object.h>
32
33 #define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o))
34 #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o))
35 #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
36
37 #define ACCEL_OBJECT GObject
38 #define ACCEL_OBJECTS(a) (a)->acceleratables
39 #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj)
40#else // GTK+ 1.x
41 #define ACCEL_OBJECT GtkObject
42 #define ACCEL_OBJECTS(a) (a)->attach_objects
43 #define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj)
44#endif
83624f79 45
acfd422a
RR
46//-----------------------------------------------------------------------------
47// idle system
48//-----------------------------------------------------------------------------
49
50extern void wxapp_install_idle_handler();
51extern bool g_isIdle;
52
9e691f46
VZ
53#if GTK_CHECK_VERSION(1, 2, 0) && wxUSE_ACCEL
54 static wxString GetHotKey( const wxMenuItem& item );
717a57c2
VZ
55#endif
56
cc47eed9
RR
57//-----------------------------------------------------------------------------
58// substitute for missing GtkPixmapMenuItem
59//-----------------------------------------------------------------------------
37d403aa 60
9e691f46
VZ
61// FIXME: I can't make this compile with GTK+ 2.0, disabling for now (VZ)
62#ifndef __WXGTK20__
63 #define USE_MENU_BITMAPS
64#endif
65
66#ifdef USE_MENU_BITMAPS
67
cc47eed9
RR
68#define GTK_TYPE_PIXMAP_MENU_ITEM (gtk_pixmap_menu_item_get_type ())
69#define GTK_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItem))
37d403aa 70#define GTK_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItemClass))
cc47eed9 71#define GTK_IS_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP_MENU_ITEM))
37d403aa
JS
72#define GTK_IS_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP_MENU_ITEM))
73//#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PIXMAP_MENU_ITEM))
cc47eed9 74#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_PIXMAP_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj)))
37d403aa
JS
75
76#ifndef GTK_MENU_ITEM_GET_CLASS
77#define GTK_MENU_ITEM_GET_CLASS(obj) (GTK_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj)))
78#endif
79
80typedef struct _GtkPixmapMenuItem GtkPixmapMenuItem;
81typedef struct _GtkPixmapMenuItemClass GtkPixmapMenuItemClass;
82
83struct _GtkPixmapMenuItem
84{
cc47eed9 85 GtkMenuItem menu_item;
37d403aa 86
cc47eed9 87 GtkWidget *pixmap;
37d403aa
JS
88};
89
90struct _GtkPixmapMenuItemClass
91{
cc47eed9 92 GtkMenuItemClass parent_class;
37d403aa 93
cc47eed9
RR
94 guint orig_toggle_size;
95 guint have_pixmap_count;
37d403aa
JS
96};
97
98
cc47eed9
RR
99GtkType gtk_pixmap_menu_item_get_type (void);
100GtkWidget* gtk_pixmap_menu_item_new (void);
101void gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
102 GtkWidget *pixmap);
37d403aa 103
9e691f46
VZ
104#endif // USE_MENU_BITMAPS
105
f6bcfd97
BP
106//-----------------------------------------------------------------------------
107// idle system
108//-----------------------------------------------------------------------------
109
110static wxString wxReplaceUnderscore( const wxString& title )
111{
112 const wxChar *pc;
2368dcda 113
f6bcfd97
BP
114 /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
115 wxString str;
116 for ( pc = title; *pc != wxT('\0'); pc++ )
117 {
118 if (*pc == wxT('&'))
119 {
9e691f46 120#if GTK_CHECK_VERSION(1, 2, 1)
f6bcfd97
BP
121 str << wxT('_');
122 }
123 else if (*pc == wxT('/'))
124 {
125 str << wxT('\\');
126#endif
127 }
128 else
129 {
130#if __WXGTK12__
131 if ( *pc == wxT('_') )
132 {
133 // underscores must be doubled to prevent them from being
134 // interpreted as accelerator character prefix by GTK
135 str << *pc;
136 }
137#endif // GTK+ 1.2
138
139 str << *pc;
140 }
141 }
142 return str;
143}
144
c801d85f
KB
145//-----------------------------------------------------------------------------
146// wxMenuBar
147//-----------------------------------------------------------------------------
148
149IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
150
3502e687
RR
151wxMenuBar::wxMenuBar( long style )
152{
1e133b7d 153 /* the parent window is known after wxFrame::SetMenu() */
23280650 154 m_needParent = FALSE;
ae53c98c 155 m_style = style;
9c884972 156 m_invokingWindow = (wxWindow*) NULL;
23280650 157
4dcaf11a 158 if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
223d09f6 159 !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
4dcaf11a 160 {
223d09f6 161 wxFAIL_MSG( wxT("wxMenuBar creation failed") );
455fadaa 162 return;
4dcaf11a 163 }
3502e687
RR
164
165 m_menus.DeleteContents( TRUE );
166
1e133b7d 167 /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
9e691f46 168#if GTK_CHECK_VERSION(1, 2, 1)
1e133b7d
RR
169 m_accel = gtk_accel_group_new();
170 m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
171 m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
23280650 172#else
3502e687 173 m_menubar = gtk_menu_bar_new();
1e133b7d 174#endif
3502e687
RR
175
176 if (style & wxMB_DOCKABLE)
177 {
178 m_widget = gtk_handle_box_new();
c626a8b7
VZ
179 gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) );
180 gtk_widget_show( GTK_WIDGET(m_menubar) );
3502e687
RR
181 }
182 else
183 {
184 m_widget = GTK_WIDGET(m_menubar);
185 }
186
187 PostCreation();
c4608a8a 188
db434467 189 ApplyWidgetStyle();
3502e687
RR
190}
191
96fd301f 192wxMenuBar::wxMenuBar()
c801d85f 193{
1e133b7d
RR
194 /* the parent window is known after wxFrame::SetMenu() */
195 m_needParent = FALSE;
ae53c98c 196 m_style = 0;
9c884972 197 m_invokingWindow = (wxWindow*) NULL;
23280650 198
4dcaf11a 199 if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
223d09f6 200 !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("menubar") ))
4dcaf11a 201 {
223d09f6 202 wxFAIL_MSG( wxT("wxMenuBar creation failed") );
455fadaa 203 return;
4dcaf11a 204 }
974e8d94 205
83624f79 206 m_menus.DeleteContents( TRUE );
96fd301f 207
1e133b7d 208 /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
9e691f46 209#if GTK_CHECK_VERSION(1, 2, 1)
1e133b7d
RR
210 m_accel = gtk_accel_group_new();
211 m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
212 m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
23280650 213#else
83624f79 214 m_menubar = gtk_menu_bar_new();
1e133b7d 215#endif
8bbe427f 216
828f655f 217 m_widget = GTK_WIDGET(m_menubar);
96fd301f 218
83624f79 219 PostCreation();
c4608a8a 220
db434467 221 ApplyWidgetStyle();
6de97a3b 222}
c801d85f 223
1e133b7d
RR
224wxMenuBar::~wxMenuBar()
225{
d1b15f03 226// gtk_object_unref( GTK_OBJECT(m_factory) ); why not ?
1e133b7d
RR
227}
228
5bd9e519
RR
229static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
230{
231 menu->SetInvokingWindow( (wxWindow*) NULL );
232
9e691f46 233#if GTK_CHECK_VERSION(1, 2, 0)
5bd9e519 234 wxWindow *top_frame = win;
8487f887 235 while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
bd77da97 236 top_frame = top_frame->GetParent();
5bd9e519
RR
237
238 /* support for native hot keys */
9e691f46 239 gtk_accel_group_detach( menu->m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
5bd9e519
RR
240#endif
241
1987af7e 242 wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
5bd9e519
RR
243 while (node)
244 {
1987af7e 245 wxMenuItem *menuitem = node->GetData();
5bd9e519
RR
246 if (menuitem->IsSubMenu())
247 wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win );
1987af7e 248 node = node->GetNext();
5bd9e519
RR
249 }
250}
251
252static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
253{
254 menu->SetInvokingWindow( win );
255
9e691f46 256#if GTK_CHECK_VERSION(1, 2, 1)
5bd9e519 257 wxWindow *top_frame = win;
8487f887 258 while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
bd77da97 259 top_frame = top_frame->GetParent();
5bd9e519
RR
260
261 /* support for native hot keys */
9e691f46
VZ
262 ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
263 if ( !g_slist_find( ACCEL_OBJECTS(menu->m_accel), obj ) )
b4da05a6 264 gtk_accel_group_attach( menu->m_accel, obj );
9e691f46 265#endif // GTK+ 1.2.1+
5bd9e519 266
1987af7e 267 wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
5bd9e519
RR
268 while (node)
269 {
1987af7e 270 wxMenuItem *menuitem = node->GetData();
5bd9e519
RR
271 if (menuitem->IsSubMenu())
272 wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );
1987af7e 273 node = node->GetNext();
5bd9e519
RR
274 }
275}
276
277void wxMenuBar::SetInvokingWindow( wxWindow *win )
278{
9c884972 279 m_invokingWindow = win;
9e691f46 280#if GTK_CHECK_VERSION(1, 2, 1)
5bd9e519 281 wxWindow *top_frame = win;
8487f887 282 while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
bd77da97 283 top_frame = top_frame->GetParent();
5bd9e519
RR
284
285 /* support for native key accelerators indicated by underscroes */
9e691f46
VZ
286 ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
287 if ( !g_slist_find( ACCEL_OBJECTS(m_accel), obj ) )
b4da05a6 288 gtk_accel_group_attach( m_accel, obj );
9e691f46 289#endif // GTK+ 1.2.1+
5bd9e519 290
1987af7e 291 wxMenuList::Node *node = m_menus.GetFirst();
5bd9e519
RR
292 while (node)
293 {
1987af7e 294 wxMenu *menu = node->GetData();
5bd9e519 295 wxMenubarSetInvokingWindow( menu, win );
1987af7e 296 node = node->GetNext();
5bd9e519
RR
297 }
298}
299
300void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
301{
9c884972 302 m_invokingWindow = (wxWindow*) NULL;
9e691f46 303#if GTK_CHECK_VERSION(1, 2, 1)
5bd9e519 304 wxWindow *top_frame = win;
8487f887 305 while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
bd77da97 306 top_frame = top_frame->GetParent();
5bd9e519
RR
307
308 /* support for native key accelerators indicated by underscroes */
9e691f46
VZ
309 gtk_accel_group_detach( m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
310#endif // GTK+ 1.2.1+
5bd9e519 311
1987af7e 312 wxMenuList::Node *node = m_menus.GetFirst();
5bd9e519
RR
313 while (node)
314 {
1987af7e 315 wxMenu *menu = node->GetData();
5bd9e519 316 wxMenubarUnsetInvokingWindow( menu, win );
1987af7e 317 node = node->GetNext();
5bd9e519
RR
318 }
319}
320
3dfac970 321bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
c801d85f 322{
f03ec224
VZ
323 if ( !wxMenuBarBase::Append( menu, title ) )
324 return FALSE;
325
326 return GtkAppend(menu, title);
327}
23280650 328
f03ec224
VZ
329bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
330{
f6bcfd97 331 wxString str( wxReplaceUnderscore( title ) );
1e133b7d
RR
332
333 /* this doesn't have much effect right now */
334 menu->SetTitle( str );
23280650 335
1e133b7d 336 /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
9e691f46 337#if GTK_CHECK_VERSION(1, 2, 1)
1e133b7d
RR
338
339 /* local buffer in multibyte form */
2b2edbed 340 wxString buf;
223d09f6 341 buf << wxT('/') << str.c_str();
c980c992 342
dc6c62a9 343 char *cbuf = new char[buf.Length()+1];
c980c992
GL
344 strcpy(cbuf, buf.mbc_str());
345
1e133b7d 346 GtkItemFactoryEntry entry;
c980c992 347 entry.path = (gchar *)cbuf; // const_cast
1e133b7d
RR
348 entry.accelerator = (gchar*) NULL;
349 entry.callback = (GtkItemFactoryCallback) NULL;
350 entry.callback_action = 0;
90350682 351 entry.item_type = (char *)"<Branch>";
2b2edbed 352
1e133b7d 353 gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
1e133b7d 354 /* in order to get the pointer to the item we need the item text _without_ underscores */
223d09f6 355 wxString tmp = wxT("<main>/");
f6bcfd97 356 const wxChar *pc;
223d09f6 357 for ( pc = str; *pc != wxT('\0'); pc++ )
1e133b7d 358 {
455fadaa
VZ
359 // contrary to the common sense, we must throw out _all_ underscores,
360 // (i.e. "Hello__World" => "HelloWorld" and not "Hello_World" as we
974e8d94 361 // might naively think). IMHO it's a bug in GTK+ (VZ)
223d09f6 362 while (*pc == wxT('_'))
455fadaa 363 pc++;
2b2edbed 364 tmp << *pc;
034be888 365 }
1e133b7d 366 menu->m_owner = gtk_item_factory_get_item( m_factory, tmp.mb_str() );
1e133b7d 367 gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
2b2edbed 368 delete [] cbuf;
1e133b7d 369#else
96fd301f 370
1e133b7d 371 menu->m_owner = gtk_menu_item_new_with_label( str.mb_str() );
2b1c162e
RR
372 gtk_widget_show( menu->m_owner );
373 gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );
96fd301f 374
2b1c162e 375 gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner );
23280650 376
1e133b7d 377#endif
9c884972
RR
378
379 // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
380 // adding menu later on.
381 if (m_invokingWindow)
382 wxMenubarSetInvokingWindow( menu, m_invokingWindow );
3dfac970
VZ
383
384 return TRUE;
385}
386
387bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
388{
389 if ( !wxMenuBarBase::Insert(pos, menu, title) )
390 return FALSE;
391
f03ec224
VZ
392#if __WXGTK12__
393 // GTK+ doesn't have a function to insert a menu using GtkItemFactory (as
394 // of version 1.2.6), so we first append the item and then change its
395 // index
396 if ( !GtkAppend(menu, title) )
397 return FALSE;
398
186baeb2
RR
399 if (pos+1 >= m_menus.GetCount())
400 return TRUE;
401
f03ec224
VZ
402 GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
403 gpointer data = g_list_last(menu_shell->children)->data;
404 menu_shell->children = g_list_remove(menu_shell->children, data);
405 menu_shell->children = g_list_insert(menu_shell->children, data, pos);
406
407 return TRUE;
408#else // GTK < 1.2
409 // this should be easy to do with GTK 1.0 - can use standard functions for
410 // this and don't need any hacks like above, but as I don't have GTK 1.0
411 // any more I can't do it
412 wxFAIL_MSG( wxT("TODO") );
3dfac970
VZ
413
414 return FALSE;
f03ec224 415#endif // GTK 1.2/1.0
3dfac970
VZ
416}
417
418wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
419{
f03ec224
VZ
420 // remove the old item and insert a new one
421 wxMenu *menuOld = Remove(pos);
422 if ( menuOld && !Insert(pos, menu, title) )
423 {
1d62a8b4 424 return (wxMenu*) NULL;
f03ec224 425 }
3dfac970 426
f03ec224
VZ
427 // either Insert() succeeded or Remove() failed and menuOld is NULL
428 return menuOld;
3dfac970
VZ
429}
430
431wxMenu *wxMenuBar::Remove(size_t pos)
432{
f03ec224
VZ
433 wxMenu *menu = wxMenuBarBase::Remove(pos);
434 if ( !menu )
1d62a8b4 435 return (wxMenu*) NULL;
f03ec224 436
589c9fff 437/*
c4608a8a 438 GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
589c9fff 439
1d62a8b4
RR
440 printf( "factory entries before %d\n", (int)g_slist_length(m_factory->items) );
441 printf( "menu shell entries before %d\n", (int)g_list_length( menu_shell->children ) );
589c9fff 442*/
c4608a8a 443
1d62a8b4
RR
444 // unparent calls unref() and that would delete the widget so we raise
445 // the ref count to 2 artificially before invoking unparent.
446 gtk_widget_ref( menu->m_menu );
447 gtk_widget_unparent( menu->m_menu );
c4608a8a 448
1d62a8b4 449 gtk_widget_destroy( menu->m_owner );
c4608a8a 450
589c9fff 451/*
1d62a8b4
RR
452 printf( "factory entries after %d\n", (int)g_slist_length(m_factory->items) );
453 printf( "menu shell entries after %d\n", (int)g_list_length( menu_shell->children ) );
589c9fff 454*/
c4608a8a 455
1d62a8b4 456 return menu;
6de97a3b 457}
96fd301f 458
716b7364 459static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
c801d85f 460{
f6bcfd97 461 if (wxMenuItem::GetLabelFromText(menu->GetTitle()) == wxMenuItem::GetLabelFromText(menuString))
83624f79
RR
462 {
463 int res = menu->FindItem( itemString );
c626a8b7
VZ
464 if (res != wxNOT_FOUND)
465 return res;
83624f79 466 }
c626a8b7 467
1987af7e 468 wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
83624f79
RR
469 while (node)
470 {
1987af7e 471 wxMenuItem *item = node->GetData();
83624f79
RR
472 if (item->IsSubMenu())
473 return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
2b1c162e 474
1987af7e 475 node = node->GetNext();
83624f79
RR
476 }
477
c626a8b7
VZ
478 return wxNOT_FOUND;
479}
480
c801d85f
KB
481int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
482{
1987af7e 483 wxMenuList::Node *node = m_menus.GetFirst();
83624f79
RR
484 while (node)
485 {
1987af7e 486 wxMenu *menu = node->GetData();
83624f79 487 int res = FindMenuItemRecursive( menu, menuString, itemString);
1987af7e
VZ
488 if (res != -1)
489 return res;
490 node = node->GetNext();
83624f79 491 }
1987af7e
VZ
492
493 return wxNOT_FOUND;
6de97a3b 494}
c801d85f 495
c626a8b7 496// Find a wxMenuItem using its id. Recurses down into sub-menus
96fd301f 497static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
716b7364 498{
717a57c2 499 wxMenuItem* result = menu->FindChildItem(id);
716b7364 500
1987af7e 501 wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
c626a8b7 502 while ( node && result == NULL )
83624f79 503 {
1987af7e 504 wxMenuItem *item = node->GetData();
83624f79 505 if (item->IsSubMenu())
c626a8b7 506 {
83624f79 507 result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
c626a8b7 508 }
1987af7e 509 node = node->GetNext();
83624f79 510 }
96fd301f 511
83624f79 512 return result;
6de97a3b 513}
716b7364 514
3dfac970 515wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const
716b7364 516{
83624f79 517 wxMenuItem* result = 0;
1987af7e 518 wxMenuList::Node *node = m_menus.GetFirst();
83624f79
RR
519 while (node && result == 0)
520 {
1987af7e 521 wxMenu *menu = node->GetData();
83624f79 522 result = FindMenuItemByIdRecursive( menu, id );
1987af7e 523 node = node->GetNext();
83624f79 524 }
c626a8b7 525
3dfac970
VZ
526 if ( menuForItem )
527 {
528 *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL;
529 }
c626a8b7 530
3dfac970 531 return result;
bbe0af5b
RR
532}
533
3dfac970 534void wxMenuBar::EnableTop( size_t pos, bool flag )
bbe0af5b 535{
3dfac970 536 wxMenuList::Node *node = m_menus.Item( pos );
c626a8b7 537
223d09f6 538 wxCHECK_RET( node, wxT("menu not found") );
c626a8b7 539
3dfac970 540 wxMenu* menu = node->GetData();
c626a8b7
VZ
541
542 if (menu->m_owner)
543 gtk_widget_set_sensitive( menu->m_owner, flag );
bbe0af5b
RR
544}
545
3dfac970 546wxString wxMenuBar::GetLabelTop( size_t pos ) const
bbe0af5b 547{
3dfac970 548 wxMenuList::Node *node = m_menus.Item( pos );
c626a8b7 549
223d09f6 550 wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") );
c626a8b7 551
3dfac970 552 wxMenu* menu = node->GetData();
c626a8b7 553
f6bcfd97
BP
554 wxString label;
555 wxString text( menu->GetTitle() );
9e691f46 556#if GTK_CHECK_VERSION(1, 2, 0)
f6bcfd97
BP
557 for ( const wxChar *pc = text.c_str(); *pc; pc++ )
558 {
559 if ( *pc == wxT('_') || *pc == wxT('&') )
560 {
561 // '_' is the escape character for GTK+ and '&' is the one for
562 // wxWindows - skip both of them
563 continue;
564 }
565
566 label += *pc;
567 }
568#else // GTK+ 1.0
569 label = text;
570#endif // GTK+ 1.2/1.0
571
572 return label;
bbe0af5b
RR
573}
574
3dfac970 575void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
bbe0af5b 576{
3dfac970 577 wxMenuList::Node *node = m_menus.Item( pos );
c626a8b7 578
223d09f6 579 wxCHECK_RET( node, wxT("menu not found") );
c626a8b7 580
3dfac970 581 wxMenu* menu = node->GetData();
c626a8b7 582
f6bcfd97
BP
583 wxString str( wxReplaceUnderscore( label ) );
584
585 menu->SetTitle( str );
586
587 if (menu->m_owner)
588 {
589 GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
590
591 /* set new text */
592 gtk_label_set( label, str.mb_str());
593
594 /* reparse key accel */
595 (void)gtk_label_parse_uline (GTK_LABEL(label), str.mb_str() );
596 gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
597 }
598
bbe0af5b
RR
599}
600
c801d85f 601//-----------------------------------------------------------------------------
cf7a7e13 602// "activate"
c801d85f
KB
603//-----------------------------------------------------------------------------
604
6de97a3b 605static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
c801d85f 606{
1e6feb95
VZ
607 if (g_isIdle)
608 wxapp_install_idle_handler();
c4608a8a 609
83624f79 610 int id = menu->FindMenuIdByMenuItem(widget);
96fd301f 611
83624f79 612 /* should find it for normal (not popup) menu */
1e6feb95
VZ
613 wxASSERT_MSG( (id != -1) || (menu->GetInvokingWindow() != NULL),
614 _T("menu item not found in gtk_menu_clicked_callback") );
96fd301f 615
c626a8b7
VZ
616 if (!menu->IsEnabled(id))
617 return;
96fd301f 618
717a57c2 619 wxMenuItem* item = menu->FindChildItem( id );
223d09f6 620 wxCHECK_RET( item, wxT("error in menu item callback") );
c626a8b7
VZ
621
622 if (item->IsCheckable())
2d17d68f 623 {
705dd80a
VZ
624 bool isReallyChecked = item->IsChecked(),
625 isInternallyChecked = item->wxMenuItemBase::IsChecked();
626
627 // ensure that the internal state is always consistent with what is
628 // shown on the screen
629 item->wxMenuItemBase::Check(isReallyChecked);
630
631 // we must not report the events for the radio button going up nor the
632 // events resulting from the calls to wxMenuItem::Check()
633 if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) ||
634 (isInternallyChecked == isReallyChecked) )
2d17d68f 635 {
2d17d68f 636 return;
c626a8b7 637 }
705dd80a
VZ
638
639 // the user pressed on the menu item: report the event below
2d17d68f
RR
640 }
641
705dd80a 642 menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
cf7a7e13
RR
643}
644
645//-----------------------------------------------------------------------------
646// "select"
647//-----------------------------------------------------------------------------
648
649static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
650{
acfd422a
RR
651 if (g_isIdle) wxapp_install_idle_handler();
652
83624f79
RR
653 int id = menu->FindMenuIdByMenuItem(widget);
654
655 wxASSERT( id != -1 ); // should find it!
cf7a7e13 656
c626a8b7
VZ
657 if (!menu->IsEnabled(id))
658 return;
cf7a7e13 659
342b6a2f 660 wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
83624f79 661 event.SetEventObject( menu );
cf7a7e13 662
c626a8b7
VZ
663 if (menu->GetEventHandler()->ProcessEvent(event))
664 return;
6de97a3b 665
83624f79
RR
666 wxWindow *win = menu->GetInvokingWindow();
667 if (win) win->GetEventHandler()->ProcessEvent( event );
6de97a3b 668}
c801d85f 669
cd743a6f
RR
670//-----------------------------------------------------------------------------
671// "deselect"
672//-----------------------------------------------------------------------------
673
674static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
675{
acfd422a
RR
676 if (g_isIdle) wxapp_install_idle_handler();
677
cd743a6f
RR
678 int id = menu->FindMenuIdByMenuItem(widget);
679
680 wxASSERT( id != -1 ); // should find it!
681
c626a8b7
VZ
682 if (!menu->IsEnabled(id))
683 return;
cd743a6f
RR
684
685 wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
686 event.SetEventObject( menu );
687
c626a8b7
VZ
688 if (menu->GetEventHandler()->ProcessEvent(event))
689 return;
cd743a6f
RR
690
691 wxWindow *win = menu->GetInvokingWindow();
c626a8b7
VZ
692 if (win)
693 win->GetEventHandler()->ProcessEvent( event );
cd743a6f
RR
694}
695
cf7a7e13 696//-----------------------------------------------------------------------------
db1b4961 697// wxMenuItem
cf7a7e13
RR
698//-----------------------------------------------------------------------------
699
7dbf5360 700IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
974e8d94
VZ
701
702wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
703 int id,
704 const wxString& name,
705 const wxString& help,
d65c269b 706 wxItemKind kind,
974e8d94
VZ
707 wxMenu *subMenu)
708{
d65c269b 709 return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);
974e8d94 710}
96fd301f 711
974e8d94
VZ
712wxMenuItem::wxMenuItem(wxMenu *parentMenu,
713 int id,
714 const wxString& text,
715 const wxString& help,
d65c269b 716 wxItemKind kind,
974e8d94 717 wxMenu *subMenu)
d65c269b 718 : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
2368dcda 719{
092f7536 720 Init(text);
2368dcda
VZ
721}
722
723wxMenuItem::wxMenuItem(wxMenu *parentMenu,
724 int id,
725 const wxString& text,
726 const wxString& help,
727 bool isCheckable,
728 wxMenu *subMenu)
729 : wxMenuItemBase(parentMenu, id, text, help,
730 isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
731{
092f7536 732 Init(text);
2368dcda
VZ
733}
734
092f7536 735void wxMenuItem::Init(const wxString& text)
c801d85f 736{
37d403aa 737 m_labelWidget = (GtkWidget *) NULL;
83624f79 738 m_menuItem = (GtkWidget *) NULL;
974e8d94 739
092f7536 740 DoSetText(text);
6de97a3b 741}
c801d85f 742
d1b15f03
RR
743wxMenuItem::~wxMenuItem()
744{
745 // don't delete menu items, the menus take care of that
746}
747
717a57c2 748// return the menu item text without any menu accels
3b59cdbf
VZ
749/* static */
750wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
717a57c2
VZ
751{
752 wxString label;
2368dcda 753
3b59cdbf 754 for ( const wxChar *pc = text.c_str(); *pc; pc++ )
717a57c2 755 {
d76419bd 756 if ( *pc == wxT('_') )
717a57c2 757 {
d76419bd
RR
758 // wxGTK escapes "xxx_xxx" to "xxx__xxx"
759 pc++;
760 label += *pc;
761 continue;
762 }
2368dcda 763
d76419bd
RR
764 if ( *pc == wxT('&') )
765 {
766 // wxMSW escapes &
717a57c2
VZ
767 continue;
768 }
769
770 label += *pc;
771 }
717a57c2
VZ
772
773 return label;
774}
775
776void wxMenuItem::SetText( const wxString& str )
777{
778 DoSetText(str);
354aa1e3
RR
779
780 if (m_menuItem)
781 {
37d403aa
JS
782 GtkLabel *label;
783 if (m_labelWidget)
784 label = (GtkLabel*) m_labelWidget;
785 else
786 label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
717a57c2
VZ
787
788 /* set new text */
354aa1e3 789 gtk_label_set( label, m_text.mb_str());
717a57c2
VZ
790
791 /* reparse key accel */
1987af7e 792 (void)gtk_label_parse_uline (GTK_LABEL(label), m_text.mb_str() );
354aa1e3
RR
793 gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
794 }
795}
796
c626a8b7 797// it's valid for this function to be called even if m_menuItem == NULL
974e8d94 798void wxMenuItem::DoSetText( const wxString& str )
716b7364 799{
ab46dc18 800 /* '\t' is the deliminator indicating a hot key */
974e8d94 801 m_text.Empty();
ab46dc18 802 const wxChar *pc = str;
223d09f6 803 for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ )
83624f79 804 {
223d09f6 805 if (*pc == wxT('&'))
23280650 806 {
9e691f46 807#if GTK_CHECK_VERSION(1, 2, 0)
223d09f6 808 m_text << wxT('_');
572d7461 809 }
223d09f6 810 else if ( *pc == wxT('_') ) // escape underscores
572d7461 811 {
223d09f6 812 m_text << wxT("__");
572d7461 813 }
223d09f6 814 else if (*pc == wxT('/')) /* we have to filter out slashes ... */
23280650 815 {
223d09f6 816 m_text << wxT('\\'); /* ... and replace them with back slashes */
9e691f46 817#endif // GTK+ 1.2.0+
034be888 818 }
d38ceae8 819 else
354aa1e3 820 m_text << *pc;
83624f79 821 }
23280650 822
837904f2 823 /* only GTK 1.2 knows about hot keys */
223d09f6 824 m_hotKey = wxT("");
9e691f46
VZ
825
826#if GTK_CHECK_VERSION(1, 2, 0)
223d09f6 827 if(*pc == wxT('\t'))
d7dbc98a
KB
828 {
829 pc++;
830 m_hotKey = pc;
831 }
9e691f46 832#endif // GTK+ 1.2.0+
716b7364
RR
833}
834
717a57c2
VZ
835#if wxUSE_ACCEL
836
837wxAcceleratorEntry *wxMenuItem::GetAccel() const
838{
1987af7e 839 if ( !GetHotKey() )
717a57c2
VZ
840 {
841 // nothing
842 return (wxAcceleratorEntry *)NULL;
843 }
844
845 // as wxGetAccelFromString() looks for TAB, insert a dummy one here
846 wxString label;
1987af7e 847 label << wxT('\t') << GetHotKey();
717a57c2
VZ
848
849 return wxGetAccelFromString(label);
850}
851
852#endif // wxUSE_ACCEL
853
96fd301f 854void wxMenuItem::Check( bool check )
716b7364 855{
223d09f6 856 wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
db1b4961 857
974e8d94
VZ
858 if (check == m_isChecked)
859 return;
2d17d68f 860
974e8d94 861 wxMenuItemBase::Check( check );
0472ece7 862
24bcaec3 863 switch ( GetKind() )
0472ece7 864 {
24bcaec3
VZ
865 case wxITEM_CHECK:
866 case wxITEM_RADIO:
867 gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
868 break;
869
870 default:
871 wxFAIL_MSG( _T("can't check this item") );
0472ece7 872 }
716b7364
RR
873}
874
8bbe427f
VZ
875void wxMenuItem::Enable( bool enable )
876{
223d09f6 877 wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
db1b4961 878
83624f79 879 gtk_widget_set_sensitive( m_menuItem, enable );
974e8d94 880 wxMenuItemBase::Enable( enable );
a9c96bcc
RR
881}
882
96fd301f 883bool wxMenuItem::IsChecked() const
716b7364 884{
223d09f6 885 wxCHECK_MSG( m_menuItem, FALSE, wxT("invalid menu item") );
db1b4961 886
974e8d94
VZ
887 wxCHECK_MSG( IsCheckable(), FALSE,
888 wxT("can't get state of uncheckable item!") );
96fd301f 889
974e8d94 890 return ((GtkCheckMenuItem*)m_menuItem)->active != 0;
716b7364
RR
891}
892
354aa1e3
RR
893wxString wxMenuItem::GetFactoryPath() const
894{
d76419bd
RR
895 /* in order to get the pointer to the item we need the item text
896 _without_ underscores */
354aa1e3 897 wxString path( wxT("<main>/") );
717a57c2 898
d76419bd
RR
899 for ( const wxChar *pc = m_text.c_str(); *pc; pc++ )
900 {
901 if ( *pc == wxT('_') || *pc == wxT('&') )
902 {
903 // remove '_' and '&' unconditionally
904 continue;
905 }
2368dcda 906
d76419bd
RR
907 path += *pc;
908 }
2368dcda 909
354aa1e3
RR
910 return path;
911}
912
db1b4961 913//-----------------------------------------------------------------------------
83624f79 914// wxMenu
db1b4961
RR
915//-----------------------------------------------------------------------------
916
c801d85f
KB
917IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
918
717a57c2 919void wxMenu::Init()
c801d85f 920{
9e691f46 921#if GTK_CHECK_VERSION(1, 2, 0)
034be888
RR
922 m_accel = gtk_accel_group_new();
923 m_factory = gtk_item_factory_new( GTK_TYPE_MENU, "<main>", m_accel );
924 m_menu = gtk_item_factory_get_widget( m_factory, "<main>" );
23280650 925#else
83624f79 926 m_menu = gtk_menu_new(); // Do not show!
034be888 927#endif
8bbe427f 928
2b1c162e 929 m_owner = (GtkWidget*) NULL;
2b2edbed 930
9e691f46 931#if GTK_CHECK_VERSION(1, 2, 0)
2b2edbed
KB
932 /* Tearoffs are entries, just like separators. So if we want this
933 menu to be a tear-off one, we just append a tearoff entry
934 immediately. */
935 if(m_style & wxMENU_TEAROFF)
936 {
937 GtkItemFactoryEntry entry;
90350682 938 entry.path = (char *)"/tearoff";
2b2edbed
KB
939 entry.callback = (GtkItemFactoryCallback) NULL;
940 entry.callback_action = 0;
90350682 941 entry.item_type = (char *)"<Tearoff>";
2b2edbed
KB
942 entry.accelerator = (gchar*) NULL;
943 gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
23280650 944 //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
2b2edbed 945 }
9e691f46 946#endif // GTK+ 1.2.0+
c801d85f 947
717a57c2
VZ
948 // append the title as the very first entry if we have it
949 if ( !!m_title )
d1b15f03 950 {
717a57c2
VZ
951 Append(-2, m_title);
952 AppendSeparator();
d1b15f03 953 }
717a57c2 954}
15a2076a 955
717a57c2
VZ
956wxMenu::~wxMenu()
957{
a583e623 958 m_items.Clear();
f03ec224 959
d1b15f03 960 gtk_widget_destroy( m_menu );
974e8d94 961
d1b15f03 962 gtk_object_unref( GTK_OBJECT(m_factory) );
c2dd8380
GL
963}
964
32db328c 965bool wxMenu::GtkAppend(wxMenuItem *mitem)
c2dd8380 966{
717a57c2 967 GtkWidget *menuItem;
96fd301f 968
9e691f46 969#if defined(USE_MENU_BITMAPS) || !GTK_CHECK_VERSION(1, 2, 0)
37d403aa 970 bool appended = FALSE;
9e691f46 971#endif
37d403aa 972
d65c269b 973#if GTK_CHECK_VERSION(1, 2, 0)
24bcaec3
VZ
974 // does this item terminate the current radio group?
975 bool endOfRadioGroup = TRUE;
d65c269b
VZ
976#endif // GTK+ >= 1.2
977
717a57c2
VZ
978 if ( mitem->IsSeparator() )
979 {
9e691f46 980#if GTK_CHECK_VERSION(1, 2, 0)
717a57c2 981 GtkItemFactoryEntry entry;
90350682 982 entry.path = (char *)"/sep";
717a57c2
VZ
983 entry.callback = (GtkItemFactoryCallback) NULL;
984 entry.callback_action = 0;
90350682 985 entry.item_type = (char *)"<Separator>";
717a57c2
VZ
986 entry.accelerator = (gchar*) NULL;
987
988 gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
989
990 /* this will be wrong for more than one separator. do we care? */
991 menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
24bcaec3
VZ
992
993 // we might have a separator inside a radio group
994 endOfRadioGroup = FALSE;
717a57c2
VZ
995#else // GTK+ 1.0
996 menuItem = gtk_menu_item_new();
997#endif // GTK 1.2/1.0
998 }
999 else if ( mitem->IsSubMenu() )
837904f2 1000 {
9e691f46 1001#if GTK_CHECK_VERSION(1, 2, 0)
717a57c2
VZ
1002 /* text has "_" instead of "&" after mitem->SetText() */
1003 wxString text( mitem->GetText() );
974e8d94 1004
717a57c2
VZ
1005 /* local buffer in multibyte form */
1006 char buf[200];
1007 strcpy( buf, "/" );
1008 strcat( buf, text.mb_str() );
50592885 1009
717a57c2
VZ
1010 GtkItemFactoryEntry entry;
1011 entry.path = buf;
1012 entry.callback = (GtkItemFactoryCallback) 0;
1013 entry.callback_action = 0;
90350682 1014 entry.item_type = (char *)"<Branch>";
a583e623 1015 entry.accelerator = (gchar*) NULL;
50592885 1016
717a57c2 1017 gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
50592885 1018
717a57c2 1019 wxString path( mitem->GetFactoryPath() );
1987af7e 1020 menuItem = gtk_item_factory_get_item( m_factory, path.mb_str() );
717a57c2 1021#else // GTK+ 1.0
1987af7e 1022 menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str());
717a57c2 1023#endif // GTK 1.2/1.0
50592885 1024
1987af7e 1025 gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
e7200790
VZ
1026
1027 // if adding a submenu to a menu already existing in the menu bar, we
1028 // must set invoking window to allow processing events from this
1029 // submenu
1030 if ( m_invokingWindow )
1031 wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
837904f2 1032 }
9e691f46 1033#ifdef USE_MENU_BITMAPS
37d403aa
JS
1034 else if (mitem->GetBitmap().Ok()) // An item with bitmap
1035 {
cc47eed9
RR
1036 wxString text( mitem->GetText() );
1037 const wxBitmap *bitmap = &mitem->GetBitmap();
2368dcda 1038
cc47eed9
RR
1039 menuItem = gtk_pixmap_menu_item_new ();
1040 GtkWidget *label = gtk_accel_label_new (text.mb_str());
1041 gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
1042 gtk_container_add (GTK_CONTAINER (menuItem), label);
1043 guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), text.mb_str() );
1044 gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem);
1045 if (accel_key != GDK_VoidSymbol)
1046 {
1047 gtk_widget_add_accelerator (menuItem,
1048 "activate_item",
1049 gtk_menu_ensure_uline_accel_group (GTK_MENU (m_menu)),
1050 accel_key, 0,
1051 GTK_ACCEL_LOCKED);
1052 }
1053 gtk_widget_show (label);
37d403aa 1054
cc47eed9 1055 mitem->SetLabelWidget(label);
37d403aa 1056
cc47eed9
RR
1057 GtkWidget* pixmap = gtk_pixmap_new( bitmap->GetPixmap(), bitmap->GetMask() ? bitmap->GetMask()->GetBitmap() : (GdkBitmap* )NULL);
1058 gtk_widget_show(pixmap);
1059 gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), pixmap);
37d403aa
JS
1060
1061 gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
1062 GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
1063 (gpointer)this );
1064 gtk_menu_append( GTK_MENU(m_menu), menuItem );
1065 gtk_widget_show( menuItem );
1066
37d403aa
JS
1067 appended = TRUE; // We've done this, don't do it again
1068 }
9e691f46 1069#endif // USE_MENU_BITMAPS
717a57c2
VZ
1070 else // a normal item
1071 {
9e691f46 1072#if GTK_CHECK_VERSION(1, 2, 0)
717a57c2
VZ
1073 /* text has "_" instead of "&" after mitem->SetText() */
1074 wxString text( mitem->GetText() );
1075
1076 /* local buffer in multibyte form */
1077 char buf[200];
1078 strcpy( buf, "/" );
d65c269b
VZ
1079 strncat( buf, text.mb_str(), WXSIZEOF(buf) - 2 );
1080 buf[WXSIZEOF(buf) - 1] = '\0';
717a57c2
VZ
1081
1082 GtkItemFactoryEntry entry;
1083 entry.path = buf;
1084 entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
1085 entry.callback_action = 0;
d65c269b
VZ
1086
1087 wxString pathRadio;
1088 const char *item_type;
1089 switch ( mitem->GetKind() )
1090 {
546bfbea 1091 case wxITEM_CHECK:
d65c269b
VZ
1092 item_type = "<CheckItem>";
1093 break;
1094
546bfbea 1095 case wxITEM_RADIO:
d65c269b
VZ
1096 if ( m_pathLastRadio.empty() )
1097 {
1098 // start of a new radio group
1099 item_type = "<RadioItem>";
1100 m_pathLastRadio = buf + 1;
1101 }
1102 else // continue the radio group
1103 {
1104 pathRadio = m_pathLastRadio;
1105 pathRadio.Replace("_", "");
1106 pathRadio.Prepend("<main>/");
1107 item_type = pathRadio;
1108 }
1109
24bcaec3
VZ
1110 // continue the existing radio group, if any
1111 endOfRadioGroup = FALSE;
d65c269b
VZ
1112 break;
1113
1114 default:
1115 wxFAIL_MSG( _T("unexpected menu item kind") );
1116 // fall through
1117
546bfbea 1118 case wxITEM_NORMAL:
d65c269b
VZ
1119 item_type = "<Item>";
1120 break;
1121 }
1122
1123 entry.item_type = (char *)item_type; // cast needed for GTK+
a583e623 1124 entry.accelerator = (gchar*) NULL;
23280650 1125
974e8d94 1126#if wxUSE_ACCEL
717a57c2
VZ
1127 // due to an apparent bug in GTK+, we have to use a static buffer here -
1128 // otherwise GTK+ 1.2.2 manages to override the memory we pass to it
1129 // somehow! (VZ)
3ca6a5f0
BP
1130 static char s_accel[50]; // must be big enougg
1131 wxString tmp( GetHotKey(*mitem) );
1132 strncpy(s_accel, tmp.mb_str(), WXSIZEOF(s_accel));
717a57c2
VZ
1133 entry.accelerator = s_accel;
1134#else // !wxUSE_ACCEL
1135 entry.accelerator = (char*) NULL;
1136#endif // wxUSE_ACCEL/!wxUSE_ACCEL
96fd301f 1137
717a57c2 1138 gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
cf7a7e13 1139
717a57c2 1140 wxString path( mitem->GetFactoryPath() );
1987af7e 1141 menuItem = gtk_item_factory_get_widget( m_factory, path.mb_str() );
717a57c2 1142#else // GTK+ 1.0
1987af7e
VZ
1143 menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() )
1144 : gtk_menu_item_new_with_label( mitem->GetText().mb_str() );
034be888 1145
717a57c2
VZ
1146 gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
1147 GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
1148 (gpointer)this );
1149#endif // GTK+ 1.2/1.0
1150 }
23280650 1151
717a57c2
VZ
1152 if ( !mitem->IsSeparator() )
1153 {
1154 gtk_signal_connect( GTK_OBJECT(menuItem), "select",
1155 GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
1156 (gpointer)this );
837904f2 1157
717a57c2
VZ
1158 gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
1159 GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
1160 (gpointer)this );
1161 }
23280650 1162
9e691f46 1163#if !GTK_CHECK_VERSION(1, 2, 0)
37d403aa
JS
1164 if (!appended)
1165 {
1166 gtk_menu_append( GTK_MENU(m_menu), menuItem );
1167 gtk_widget_show( menuItem );
1168 }
717a57c2 1169#endif // GTK+ 1.0
23280650 1170
837904f2 1171 mitem->SetMenuItem(menuItem);
837904f2 1172
d65c269b 1173#if GTK_CHECK_VERSION(1, 2, 0)
24bcaec3 1174 if ( endOfRadioGroup )
d65c269b
VZ
1175 {
1176 m_pathLastRadio.clear();
1177 }
1178#endif // GTK+ >= 1.2
1179
32db328c 1180 return TRUE;
6de97a3b 1181}
c801d85f 1182
32db328c 1183bool wxMenu::DoAppend(wxMenuItem *mitem)
828f655f 1184{
32db328c 1185 return GtkAppend(mitem) && wxMenuBase::DoAppend(mitem);
c33c4050
RR
1186}
1187
717a57c2 1188bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
c33c4050 1189{
717a57c2
VZ
1190 if ( !wxMenuBase::DoInsert(pos, item) )
1191 return FALSE;
c626a8b7 1192
32db328c
VZ
1193#ifdef __WXGTK12__
1194 // GTK+ doesn't have a function to insert a menu using GtkItemFactory (as
1195 // of version 1.2.6), so we first append the item and then change its
1196 // index
1197 if ( !GtkAppend(item) )
1198 return FALSE;
1199
f6bcfd97
BP
1200 if ( m_style & wxMENU_TEAROFF )
1201 {
1202 // change the position as the first item is the tear-off marker
1203 pos++;
1204 }
1205
32db328c
VZ
1206 GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
1207 gpointer data = g_list_last(menu_shell->children)->data;
1208 menu_shell->children = g_list_remove(menu_shell->children, data);
1209 menu_shell->children = g_list_insert(menu_shell->children, data, pos);
1210
1211 return TRUE;
1212#else // GTK < 1.2
1213 // this should be easy to do...
1214 wxFAIL_MSG( wxT("not implemented") );
c626a8b7 1215
717a57c2 1216 return FALSE;
96fa7876 1217#endif // GTK 1.2/1.0
c33c4050
RR
1218}
1219
717a57c2 1220wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
c33c4050 1221{
717a57c2
VZ
1222 if ( !wxMenuBase::DoRemove(item) )
1223 return (wxMenuItem *)NULL;
c626a8b7 1224
717a57c2
VZ
1225 // TODO: this code doesn't delete the item factory item and this seems
1226 // impossible as of GTK 1.2.6.
1227 gtk_widget_destroy( item->GetMenuItem() );
c626a8b7 1228
717a57c2 1229 return item;
c33c4050
RR
1230}
1231
96fd301f
VZ
1232int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
1233{
83624f79
RR
1234 wxNode *node = m_items.First();
1235 while (node)
1236 {
1237 wxMenuItem *item = (wxMenuItem*)node->Data();
1238 if (item->GetMenuItem() == menuItem)
1239 return item->GetId();
1240 node = node->Next();
1241 }
96fd301f 1242
c626a8b7 1243 return wxNOT_FOUND;
6de97a3b 1244}
c801d85f 1245
717a57c2
VZ
1246// ----------------------------------------------------------------------------
1247// helpers
1248// ----------------------------------------------------------------------------
1249
9e691f46 1250#if GTK_CHECK_VERSION(1, 2, 0) && wxUSE_ACCEL
a070d8ce 1251
717a57c2 1252static wxString GetHotKey( const wxMenuItem& item )
c801d85f 1253{
717a57c2
VZ
1254 wxString hotkey;
1255
1256 wxAcceleratorEntry *accel = item.GetAccel();
1257 if ( accel )
83624f79 1258 {
717a57c2
VZ
1259 int flags = accel->GetFlags();
1260 if ( flags & wxACCEL_ALT )
1261 hotkey += wxT("<alt>");
1262 if ( flags & wxACCEL_CTRL )
1263 hotkey += wxT("<control>");
1264 if ( flags & wxACCEL_SHIFT )
1265 hotkey += wxT("<shift>");
1266
1267 int code = accel->GetKeyCode();
1268 switch ( code )
c626a8b7 1269 {
717a57c2
VZ
1270 case WXK_F1:
1271 case WXK_F2:
1272 case WXK_F3:
1273 case WXK_F4:
1274 case WXK_F5:
1275 case WXK_F6:
1276 case WXK_F7:
1277 case WXK_F8:
1278 case WXK_F9:
1279 case WXK_F10:
1280 case WXK_F11:
1281 case WXK_F12:
1282 hotkey << wxT('F') << code - WXK_F1 + 1;
1283 break;
2368dcda 1284
a070d8ce
VZ
1285 // TODO: we should use gdk_keyval_name() (a.k.a.
1286 // XKeysymToString) here as well as hardcoding the keysym
1287 // names this might be not portable
3ca6a5f0
BP
1288 case WXK_NUMPAD_INSERT:
1289 hotkey << wxT("KP_Insert" );
1290 break;
1291 case WXK_NUMPAD_DELETE:
1292 hotkey << wxT("KP_Delete" );
1293 break;
1294 case WXK_INSERT:
1295 hotkey << wxT("Insert" );
1296 break;
1297 case WXK_DELETE:
1298 hotkey << wxT("Delete" );
1299 break;
96fd301f 1300
a070d8ce
VZ
1301 // if there are any other keys wxGetAccelFromString() may
1302 // return, we should process them here
8bbe427f 1303
717a57c2 1304 default:
a070d8ce 1305 if ( code < 127 )
717a57c2 1306 {
a070d8ce
VZ
1307 gchar *name = gdk_keyval_name((guint)code);
1308 if ( name )
1309 {
1310 hotkey << name;
1311 break;
1312 }
717a57c2 1313 }
c801d85f 1314
717a57c2
VZ
1315 wxFAIL_MSG( wxT("unknown keyboard accel") );
1316 }
c801d85f 1317
717a57c2 1318 delete accel;
631f1bfe 1319 }
717a57c2
VZ
1320
1321 return hotkey;
631f1bfe 1322}
a070d8ce 1323
717a57c2 1324#endif // wxUSE_ACCEL
631f1bfe 1325
37d403aa 1326
cc47eed9
RR
1327//-----------------------------------------------------------------------------
1328// substitute for missing GtkPixmapMenuItem
1329//-----------------------------------------------------------------------------
37d403aa 1330
9e691f46
VZ
1331#ifdef USE_MENU_BITMAPS
1332
37d403aa
JS
1333/*
1334 * Copyright (C) 1998, 1999, 2000 Free Software Foundation
1335 * All rights reserved.
1336 *
1337 * This file is part of the Gnome Library.
1338 *
1339 * The Gnome Library is free software; you can redistribute it and/or
1340 * modify it under the terms of the GNU Library General Public License as
1341 * published by the Free Software Foundation; either version 2 of the
1342 * License, or (at your option) any later version.
1343 *
1344 * The Gnome Library is distributed in the hope that it will be useful,
1345 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1346 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1347 * Library General Public License for more details.
1348 *
1349 * You should have received a copy of the GNU Library General Public
1350 * License along with the Gnome Library; see the file COPYING.LIB. If not,
1351 * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
1352 * Boston, MA 02111-1307, USA.
1353 */
1354/*
1355 @NOTATION@
1356 */
1357
1358/* Author: Dietmar Maurer <dm@vlsivie.tuwien.ac.at> */
1359
37d403aa
JS
1360#include <gtk/gtkaccellabel.h>
1361#include <gtk/gtksignal.h>
1362#include <gtk/gtkmenuitem.h>
1363#include <gtk/gtkmenu.h>
1364#include <gtk/gtkcontainer.h>
1365
90350682
VZ
1366extern "C"
1367{
1368
37d403aa
JS
1369static void gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass);
1370static void gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item);
1371static void gtk_pixmap_menu_item_draw (GtkWidget *widget,
1372 GdkRectangle *area);
1373static gint gtk_pixmap_menu_item_expose (GtkWidget *widget,
1374 GdkEventExpose *event);
1375
1376/* we must override the following functions */
1377
1378static void gtk_pixmap_menu_item_map (GtkWidget *widget);
1379static void gtk_pixmap_menu_item_size_allocate (GtkWidget *widget,
1380 GtkAllocation *allocation);
1381static void gtk_pixmap_menu_item_forall (GtkContainer *container,
1382 gboolean include_internals,
1383 GtkCallback callback,
1384 gpointer callback_data);
1385static void gtk_pixmap_menu_item_size_request (GtkWidget *widget,
1386 GtkRequisition *requisition);
1387static void gtk_pixmap_menu_item_remove (GtkContainer *container,
1388 GtkWidget *child);
1389
1390static void changed_have_pixmap_status (GtkPixmapMenuItem *menu_item);
1391
1392static GtkMenuItemClass *parent_class = NULL;
1393
90350682
VZ
1394}
1395
37d403aa
JS
1396#define BORDER_SPACING 3
1397#define PMAP_WIDTH 20
1398
1399GtkType
1400gtk_pixmap_menu_item_get_type (void)
1401{
1402 static GtkType pixmap_menu_item_type = 0;
1403
1404 if (!pixmap_menu_item_type)
1405 {
1406 GtkTypeInfo pixmap_menu_item_info =
1407 {
90350682 1408 (char *)"GtkPixmapMenuItem",
37d403aa
JS
1409 sizeof (GtkPixmapMenuItem),
1410 sizeof (GtkPixmapMenuItemClass),
1411 (GtkClassInitFunc) gtk_pixmap_menu_item_class_init,
1412 (GtkObjectInitFunc) gtk_pixmap_menu_item_init,
1413 /* reserved_1 */ NULL,
1414 /* reserved_2 */ NULL,
1415 (GtkClassInitFunc) NULL,
1416 };
1417
2368dcda 1418 pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (),
37d403aa
JS
1419 &pixmap_menu_item_info);
1420 }
1421
1422 return pixmap_menu_item_type;
1423}
1424
1425/**
1426 * gtk_pixmap_menu_item_new
1427 *
2368dcda 1428 * Creates a new pixmap menu item. Use gtk_pixmap_menu_item_set_pixmap()
37d403aa
JS
1429 * to set the pixmap wich is displayed at the left side.
1430 *
1431 * Returns:
1432 * &GtkWidget pointer to new menu item
1433 **/
1434
1435GtkWidget*
1436gtk_pixmap_menu_item_new (void)
1437{
1438 return GTK_WIDGET (gtk_type_new (gtk_pixmap_menu_item_get_type ()));
1439}
1440
1441static void
1442gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass)
1443{
1444 GtkObjectClass *object_class;
1445 GtkWidgetClass *widget_class;
1446 GtkMenuItemClass *menu_item_class;
1447 GtkContainerClass *container_class;
1448
1449 object_class = (GtkObjectClass*) klass;
1450 widget_class = (GtkWidgetClass*) klass;
1451 menu_item_class = (GtkMenuItemClass*) klass;
1452 container_class = (GtkContainerClass*) klass;
1453
1454 parent_class = (GtkMenuItemClass*) gtk_type_class (gtk_menu_item_get_type ());
1455
1456 widget_class->draw = gtk_pixmap_menu_item_draw;
1457 widget_class->expose_event = gtk_pixmap_menu_item_expose;
1458 widget_class->map = gtk_pixmap_menu_item_map;
1459 widget_class->size_allocate = gtk_pixmap_menu_item_size_allocate;
1460 widget_class->size_request = gtk_pixmap_menu_item_size_request;
1461
1462 container_class->forall = gtk_pixmap_menu_item_forall;
1463 container_class->remove = gtk_pixmap_menu_item_remove;
1464
1465 klass->orig_toggle_size = menu_item_class->toggle_size;
1466 klass->have_pixmap_count = 0;
1467}
1468
1469static void
1470gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item)
1471{
1472 GtkMenuItem *mi;
1473
1474 mi = GTK_MENU_ITEM (menu_item);
1475
1476 menu_item->pixmap = NULL;
1477}
1478
1479static void
1480gtk_pixmap_menu_item_draw (GtkWidget *widget,
1481 GdkRectangle *area)
1482{
1483 g_return_if_fail (widget != NULL);
1484 g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
1485 g_return_if_fail (area != NULL);
1486
1487 if (GTK_WIDGET_CLASS (parent_class)->draw)
1488 (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
1489
2368dcda 1490 if (GTK_WIDGET_DRAWABLE (widget) &&
37d403aa
JS
1491 GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
1492 gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
1493 }
1494}
1495
1496static gint
1497gtk_pixmap_menu_item_expose (GtkWidget *widget,
1498 GdkEventExpose *event)
1499{
1500 g_return_val_if_fail (widget != NULL, FALSE);
1501 g_return_val_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget), FALSE);
1502 g_return_val_if_fail (event != NULL, FALSE);
1503
1504 if (GTK_WIDGET_CLASS (parent_class)->expose_event)
1505 (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
1506
2368dcda 1507 if (GTK_WIDGET_DRAWABLE (widget) &&
37d403aa
JS
1508 GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
1509 gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
1510 }
1511
1512 return FALSE;
1513}
1514
1515/**
1516 * gtk_pixmap_menu_item_set_pixmap
1517 * @menu_item: Pointer to the pixmap menu item
1518 * @pixmap: Pointer to a pixmap widget
1519 *
1520 * Set the pixmap of the menu item.
1521 *
1522 **/
1523
1524void
1525gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
1526 GtkWidget *pixmap)
1527{
1528 g_return_if_fail (menu_item != NULL);
1529 g_return_if_fail (pixmap != NULL);
1530 g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (menu_item));
1531 g_return_if_fail (GTK_IS_WIDGET (pixmap));
1532 g_return_if_fail (menu_item->pixmap == NULL);
1533
1534 gtk_widget_set_parent (pixmap, GTK_WIDGET (menu_item));
1535 menu_item->pixmap = pixmap;
1536
1537 if (GTK_WIDGET_REALIZED (pixmap->parent) &&
1538 !GTK_WIDGET_REALIZED (pixmap))
1539 gtk_widget_realize (pixmap);
2368dcda
VZ
1540
1541 if (GTK_WIDGET_VISIBLE (pixmap->parent)) {
37d403aa
JS
1542 if (GTK_WIDGET_MAPPED (pixmap->parent) &&
1543 GTK_WIDGET_VISIBLE(pixmap) &&
1544 !GTK_WIDGET_MAPPED (pixmap))
1545 gtk_widget_map (pixmap);
1546 }
1547
1548 changed_have_pixmap_status(menu_item);
2368dcda 1549
37d403aa
JS
1550 if (GTK_WIDGET_VISIBLE (pixmap) && GTK_WIDGET_VISIBLE (menu_item))
1551 gtk_widget_queue_resize (pixmap);
1552}
1553
1554static void
1555gtk_pixmap_menu_item_map (GtkWidget *widget)
1556{
1557 GtkPixmapMenuItem *menu_item;
1558
1559 g_return_if_fail (widget != NULL);
1560 g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
1561
1562 menu_item = GTK_PIXMAP_MENU_ITEM(widget);
1563
1564 GTK_WIDGET_CLASS(parent_class)->map(widget);
1565
1566 if (menu_item->pixmap &&
1567 GTK_WIDGET_VISIBLE (menu_item->pixmap) &&
1568 !GTK_WIDGET_MAPPED (menu_item->pixmap))
1569 gtk_widget_map (menu_item->pixmap);
1570}
1571
1572static void
1573gtk_pixmap_menu_item_size_allocate (GtkWidget *widget,
1574 GtkAllocation *allocation)
1575{
1576 GtkPixmapMenuItem *pmenu_item;
1577
1578 pmenu_item = GTK_PIXMAP_MENU_ITEM(widget);
1579
1580 if (pmenu_item->pixmap && GTK_WIDGET_VISIBLE(pmenu_item))
1581 {
1582 GtkAllocation child_allocation;
1583 int border_width;
1584
1585 border_width = GTK_CONTAINER (widget)->border_width;
1586
1587 child_allocation.width = pmenu_item->pixmap->requisition.width;
1588 child_allocation.height = pmenu_item->pixmap->requisition.height;
1589 child_allocation.x = border_width + BORDER_SPACING;
1590 child_allocation.y = (border_width + BORDER_SPACING
1591 + (((allocation->height - child_allocation.height) - child_allocation.x)
1592 / 2)); /* center pixmaps vertically */
1593 gtk_widget_size_allocate (pmenu_item->pixmap, &child_allocation);
1594 }
1595
1596 if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
1597 GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
1598}
1599
1600static void
1601gtk_pixmap_menu_item_forall (GtkContainer *container,
1602 gboolean include_internals,
1603 GtkCallback callback,
1604 gpointer callback_data)
1605{
1606 GtkPixmapMenuItem *menu_item;
1607
1608 g_return_if_fail (container != NULL);
1609 g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container));
1610 g_return_if_fail (callback != NULL);
1611
1612 menu_item = GTK_PIXMAP_MENU_ITEM (container);
1613
1614 if (menu_item->pixmap)
1615 (* callback) (menu_item->pixmap, callback_data);
1616
1617 GTK_CONTAINER_CLASS(parent_class)->forall(container,include_internals,
1618 callback,callback_data);
1619}
1620
1621static void
1622gtk_pixmap_menu_item_size_request (GtkWidget *widget,
1623 GtkRequisition *requisition)
1624{
1625 GtkPixmapMenuItem *menu_item;
1626 GtkRequisition req = {0, 0};
1627
1628 g_return_if_fail (widget != NULL);
1629 g_return_if_fail (GTK_IS_MENU_ITEM (widget));
1630 g_return_if_fail (requisition != NULL);
1631
1632 GTK_WIDGET_CLASS(parent_class)->size_request(widget,requisition);
1633
1634 menu_item = GTK_PIXMAP_MENU_ITEM (widget);
2368dcda 1635
37d403aa
JS
1636 if (menu_item->pixmap)
1637 gtk_widget_size_request(menu_item->pixmap, &req);
1638
1639 requisition->height = MAX(req.height + GTK_CONTAINER(widget)->border_width + BORDER_SPACING, (unsigned int) requisition->height);
1640 requisition->width += (req.width + GTK_CONTAINER(widget)->border_width + BORDER_SPACING);
1641}
1642
1643static void
1644gtk_pixmap_menu_item_remove (GtkContainer *container,
1645 GtkWidget *child)
1646{
1647 GtkBin *bin;
1648 gboolean widget_was_visible;
1649
1650 g_return_if_fail (container != NULL);
1651 g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container));
1652 g_return_if_fail (child != NULL);
1653 g_return_if_fail (GTK_IS_WIDGET (child));
1654
1655 bin = GTK_BIN (container);
2368dcda 1656 g_return_if_fail ((bin->child == child ||
37d403aa
JS
1657 (GTK_PIXMAP_MENU_ITEM(container)->pixmap == child)));
1658
1659 widget_was_visible = GTK_WIDGET_VISIBLE (child);
2368dcda 1660
37d403aa
JS
1661 gtk_widget_unparent (child);
1662 if (bin->child == child)
2368dcda 1663 bin->child = NULL;
37d403aa
JS
1664 else {
1665 GTK_PIXMAP_MENU_ITEM(container)->pixmap = NULL;
1666 changed_have_pixmap_status(GTK_PIXMAP_MENU_ITEM(container));
1667 }
2368dcda 1668
37d403aa
JS
1669 if (widget_was_visible)
1670 gtk_widget_queue_resize (GTK_WIDGET (container));
1671}
1672
1673
1674/* important to only call this if there was actually a _change_ in pixmap == NULL */
1675static void
1676changed_have_pixmap_status (GtkPixmapMenuItem *menu_item)
1677{
1678 if (menu_item->pixmap != NULL) {
1679 GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count += 1;
1680
1681 if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 1) {
1682 /* Install pixmap toggle size */
1683 GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = MAX(GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size, PMAP_WIDTH);
1684 }
1685 } else {
1686 GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count -= 1;
1687
1688 if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 0) {
1689 /* Install normal toggle size */
2368dcda 1690 GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size;
37d403aa
JS
1691 }
1692 }
1693
1694 /* Note that we actually need to do this for _all_ GtkPixmapMenuItem
1695 whenever the klass->toggle_size changes; but by doing it anytime
1696 this function is called, we get the same effect, just because of
1697 how the preferences option to show pixmaps works. Bogus, broken.
1698 */
2368dcda 1699 if (GTK_WIDGET_VISIBLE(GTK_WIDGET(menu_item)))
37d403aa
JS
1700 gtk_widget_queue_resize(GTK_WIDGET(menu_item));
1701}
1702
9e691f46 1703#endif // USE_MENU_BITMAPS
37d403aa 1704