#include "wx/accel.h"
#endif // wxUSE_ACCEL
-#include <gdk/gdk.h>
+#include "wx/gtk/private.h"
+
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
+
+// FIXME: is this right? somehow I don't think so (VZ)
+#ifdef __WXGTK20__
+ #include <glib-object.h>
+
+ #define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o))
+ #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o))
+ #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
+
+ #define ACCEL_OBJECT GObject
+ #define ACCEL_OBJECTS(a) (a)->acceleratables
+ #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj)
+#else // GTK+ 1.x
+ #define ACCEL_OBJECT GtkObject
+ #define ACCEL_OBJECTS(a) (a)->attach_objects
+ #define ACCEL_OBJ_CAST(obj) GTK_OBJECT(obj)
+#endif
//-----------------------------------------------------------------------------
// idle system
extern void wxapp_install_idle_handler();
extern bool g_isIdle;
-#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL
-static wxString GetHotKey( const wxMenuItem& item );
+#if GTK_CHECK_VERSION(1, 2, 0) && wxUSE_ACCEL
+ static wxString GetHotKey( const wxMenuItem& item );
#endif
//-----------------------------------------------------------------------------
// substitute for missing GtkPixmapMenuItem
//-----------------------------------------------------------------------------
+// FIXME: I can't make this compile with GTK+ 2.0, disabling for now (VZ)
+#ifndef __WXGTK20__
+ #define USE_MENU_BITMAPS
+#endif
+
+#ifdef USE_MENU_BITMAPS
+
#define GTK_TYPE_PIXMAP_MENU_ITEM (gtk_pixmap_menu_item_get_type ())
#define GTK_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItem))
#define GTK_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItemClass))
void gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
GtkWidget *pixmap);
+#endif // USE_MENU_BITMAPS
+
//-----------------------------------------------------------------------------
// idle system
//-----------------------------------------------------------------------------
{
if (*pc == wxT('&'))
{
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 1)
str << wxT('_');
}
else if (*pc == wxT('/'))
m_menus.DeleteContents( TRUE );
/* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 1)
m_accel = gtk_accel_group_new();
m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
m_menus.DeleteContents( TRUE );
/* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 1)
m_accel = gtk_accel_group_new();
m_factory = gtk_item_factory_new( GTK_TYPE_MENU_BAR, "<main>", m_accel );
m_menubar = gtk_item_factory_get_widget( m_factory, "<main>" );
{
menu->SetInvokingWindow( (wxWindow*) NULL );
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)
wxWindow *top_frame = win;
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
/* support for native hot keys */
- gtk_accel_group_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
+ gtk_accel_group_detach( menu->m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
#endif
wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
{
menu->SetInvokingWindow( win );
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 1)
wxWindow *top_frame = win;
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
/* support for native hot keys */
- GtkObject *obj = GTK_OBJECT(top_frame->m_widget);
- if ( !g_slist_find( menu->m_accel->attach_objects, obj ) )
+ ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
+ if ( !g_slist_find( ACCEL_OBJECTS(menu->m_accel), obj ) )
gtk_accel_group_attach( menu->m_accel, obj );
-#endif
+#endif // GTK+ 1.2.1+
wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
while (node)
void wxMenuBar::SetInvokingWindow( wxWindow *win )
{
m_invokingWindow = win;
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 1)
wxWindow *top_frame = win;
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
/* support for native key accelerators indicated by underscroes */
- GtkObject *obj = GTK_OBJECT(top_frame->m_widget);
- if ( !g_slist_find( m_accel->attach_objects, obj ) )
+ ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
+ if ( !g_slist_find( ACCEL_OBJECTS(m_accel), obj ) )
gtk_accel_group_attach( m_accel, obj );
-#endif
+#endif // GTK+ 1.2.1+
wxMenuList::Node *node = m_menus.GetFirst();
while (node)
void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
{
m_invokingWindow = (wxWindow*) NULL;
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 1)
wxWindow *top_frame = win;
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
/* support for native key accelerators indicated by underscroes */
- gtk_accel_group_detach( m_accel, GTK_OBJECT(top_frame->m_widget) );
-#endif
+ gtk_accel_group_detach( m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
+#endif // GTK+ 1.2.1+
wxMenuList::Node *node = m_menus.GetFirst();
while (node)
menu->SetTitle( str );
/* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 1)
/* local buffer in multibyte form */
wxString buf;
wxString label;
wxString text( menu->GetTitle() );
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)
for ( const wxChar *pc = text.c_str(); *pc; pc++ )
{
if ( *pc == wxT('_') || *pc == wxT('&') )
int id,
const wxString& name,
const wxString& help,
- bool isCheckable,
+ wxItemKind kind,
wxMenu *subMenu)
{
- return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+ return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);
}
wxMenuItem::wxMenuItem(wxMenu *parentMenu,
int id,
const wxString& text,
const wxString& help,
- bool isCheckable,
+ wxItemKind kind,
wxMenu *subMenu)
+ : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
{
- m_id = id;
- m_isCheckable = isCheckable;
- m_isChecked = FALSE;
- m_isEnabled = TRUE;
- m_subMenu = subMenu;
- m_parentMenu = parentMenu;
- m_help = help;
-
m_labelWidget = (GtkWidget *) NULL;
m_menuItem = (GtkWidget *) NULL;
{
if (*pc == wxT('&'))
{
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)
m_text << wxT('_');
}
else if ( *pc == wxT('_') ) // escape underscores
else if (*pc == wxT('/')) /* we have to filter out slashes ... */
{
m_text << wxT('\\'); /* ... and replace them with back slashes */
-#endif
+#endif // GTK+ 1.2.0+
}
else
m_text << *pc;
/* only GTK 1.2 knows about hot keys */
m_hotKey = wxT("");
-#if (GTK_MINOR_VERSION > 0)
+
+#if GTK_CHECK_VERSION(1, 2, 0)
if(*pc == wxT('\t'))
{
pc++;
m_hotKey = pc;
}
-#endif
+#endif // GTK+ 1.2.0+
}
#if wxUSE_ACCEL
return;
wxMenuItemBase::Check( check );
- gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+
+ // GTK+ does it itself for the radio item
+ if ( GetKind() == wxItem_Check )
+ {
+ gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+ }
}
void wxMenuItem::Enable( bool enable )
void wxMenu::Init()
{
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)
m_accel = gtk_accel_group_new();
m_factory = gtk_item_factory_new( GTK_TYPE_MENU, "<main>", m_accel );
m_menu = gtk_item_factory_get_widget( m_factory, "<main>" );
m_owner = (GtkWidget*) NULL;
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)
/* Tearoffs are entries, just like separators. So if we want this
menu to be a tear-off one, we just append a tearoff entry
immediately. */
gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
//GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
}
-#endif
+#endif // GTK+ 1.2.0+
// append the title as the very first entry if we have it
if ( !!m_title )
{
GtkWidget *menuItem;
+#if defined(USE_MENU_BITMAPS) || !GTK_CHECK_VERSION(1, 2, 0)
bool appended = FALSE;
+#endif
+
+#if GTK_CHECK_VERSION(1, 2, 0)
+ // is this a radio item?
+ bool isRadio = FALSE;
+#endif // GTK+ >= 1.2
if ( mitem->IsSeparator() )
{
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)
GtkItemFactoryEntry entry;
entry.path = (char *)"/sep";
entry.callback = (GtkItemFactoryCallback) NULL;
}
else if ( mitem->IsSubMenu() )
{
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)
/* text has "_" instead of "&" after mitem->SetText() */
wxString text( mitem->GetText() );
if ( m_invokingWindow )
wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
}
+#ifdef USE_MENU_BITMAPS
else if (mitem->GetBitmap().Ok()) // An item with bitmap
{
wxString text( mitem->GetText() );
appended = TRUE; // We've done this, don't do it again
}
+#endif // USE_MENU_BITMAPS
else // a normal item
{
-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)
/* text has "_" instead of "&" after mitem->SetText() */
wxString text( mitem->GetText() );
/* local buffer in multibyte form */
char buf[200];
strcpy( buf, "/" );
- strcat( buf, text.mb_str() );
+ strncat( buf, text.mb_str(), WXSIZEOF(buf) - 2 );
+ buf[WXSIZEOF(buf) - 1] = '\0';
GtkItemFactoryEntry entry;
entry.path = buf;
entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
entry.callback_action = 0;
- if ( mitem->IsCheckable() )
- entry.item_type = (char *)"<CheckItem>";
- else
- entry.item_type = (char *)"<Item>";
+
+ wxString pathRadio;
+ const char *item_type;
+ switch ( mitem->GetKind() )
+ {
+ case wxItem_Check:
+ item_type = "<CheckItem>";
+ break;
+
+ case wxItem_Radio:
+ if ( m_pathLastRadio.empty() )
+ {
+ // start of a new radio group
+ item_type = "<RadioItem>";
+ m_pathLastRadio = buf + 1;
+ }
+ else // continue the radio group
+ {
+ pathRadio = m_pathLastRadio;
+ pathRadio.Replace("_", "");
+ pathRadio.Prepend("<main>/");
+ item_type = pathRadio;
+ }
+
+ // remember that this one was a radio item to avoid resetting
+ // m_pathLastRadio below
+ isRadio = TRUE;
+ break;
+
+ default:
+ wxFAIL_MSG( _T("unexpected menu item kind") );
+ // fall through
+
+ case wxItem_Normal:
+ item_type = "<Item>";
+ break;
+ }
+
+ entry.item_type = (char *)item_type; // cast needed for GTK+
entry.accelerator = (gchar*) NULL;
#if wxUSE_ACCEL
(gpointer)this );
}
-#if GTK_MINOR_VERSION == 0
+#if !GTK_CHECK_VERSION(1, 2, 0)
if (!appended)
{
gtk_menu_append( GTK_MENU(m_menu), menuItem );
mitem->SetMenuItem(menuItem);
+#if GTK_CHECK_VERSION(1, 2, 0)
+ if ( !isRadio )
+ {
+ m_pathLastRadio.clear();
+ }
+#endif // GTK+ >= 1.2
+
return TRUE;
}
// helpers
// ----------------------------------------------------------------------------
-#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL
+#if GTK_CHECK_VERSION(1, 2, 0) && wxUSE_ACCEL
static wxString GetHotKey( const wxMenuItem& item )
{
// substitute for missing GtkPixmapMenuItem
//-----------------------------------------------------------------------------
+#ifdef USE_MENU_BITMAPS
+
/*
* Copyright (C) 1998, 1999, 2000 Free Software Foundation
* All rights reserved.
gtk_widget_queue_resize(GTK_WIDGET(menu_item));
}
+#endif // USE_MENU_BITMAPS
projects / wxWidgets.git / blobdiff