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