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