fix HTML browser setup dialog under MSW and make the 'OK' button default

[wxWidgets.git] / src / gtk / menu.cpp

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 9c28eb232c8167e38cb46d64e9582ac334fdbcfd..c41035bbc6cfdf8c4dd66e3635daaf48f8d69be7 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -22,9 +22,26 @@
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL
 
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL
 

-#include <gdk/gdk.h>
+#include "wx/gtk/private.h"
+

 #include <gdk/gdkkeysyms.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
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -33,14 +50,21 @@
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
 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
 //-----------------------------------------------------------------------------
 
 #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))
 #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))


@@ -77,6 +101,8 @@ GtkWidget* gtk_pixmap_menu_item_new            (void);
 void       gtk_pixmap_menu_item_set_pixmap     (GtkPixmapMenuItem *menu_item,
                                                                    GtkWidget *pixmap);
 
 void       gtk_pixmap_menu_item_set_pixmap     (GtkPixmapMenuItem *menu_item,
                                                                    GtkWidget *pixmap);
 

+#endif // USE_MENU_BITMAPS
+

 //-----------------------------------------------------------------------------
 // idle system
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // idle system
 //-----------------------------------------------------------------------------


@@ -91,7 +117,7 @@ static wxString wxReplaceUnderscore( const wxString& title )
     {
         if (*pc == wxT('&'))
         {
     {
         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('/'))
             str << wxT('_');
         }
         else if (*pc == wxT('/'))


@@ -139,7 +165,7 @@ wxMenuBar::wxMenuBar( long style )
     m_menus.DeleteContents( TRUE );
 
     /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
     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_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>" );


@@ -180,7 +206,7 @@ wxMenuBar::wxMenuBar()
     m_menus.DeleteContents( TRUE );
 
     /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
     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_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>" );


@@ -204,13 +230,13 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
     menu->SetInvokingWindow( (wxWindow*) NULL );
 
 {
     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  */
     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();
 #endif
 
     wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();


@@ -227,16 +253,16 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
     menu->SetInvokingWindow( win );
 
 {
     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  */
     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 );
         gtk_accel_group_attach( menu->m_accel, obj );

-#endif
+#endif // GTK+ 1.2.1+

 
     wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
     while (node)
 
     wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
     while (node)


@@ -251,16 +277,16 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
 void wxMenuBar::SetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = win;
 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 */
     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 );
         gtk_accel_group_attach( m_accel, obj );

-#endif
+#endif // GTK+ 1.2.1+

 
     wxMenuList::Node *node = m_menus.GetFirst();
     while (node)
 
     wxMenuList::Node *node = m_menus.GetFirst();
     while (node)


@@ -274,14 +300,14 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win )
 void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 {
     m_invokingWindow = (wxWindow*) NULL;
 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 */
     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)
 
     wxMenuList::Node *node = m_menus.GetFirst();
     while (node)


@@ -308,7 +334,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
     menu->SetTitle( str );
 
     /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
     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;
 
     /* local buffer in multibyte form */
     wxString buf;


@@ -322,7 +348,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
     entry.accelerator = (gchar*) NULL;
     entry.callback = (GtkItemFactoryCallback) NULL;
     entry.callback_action = 0;
     entry.accelerator = (gchar*) NULL;
     entry.callback = (GtkItemFactoryCallback) NULL;
     entry.callback_action = 0;

-    entry.item_type = "<Branch>";
+    entry.item_type = (char *)"<Branch>";

 
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
     /* in order to get the pointer to the item we need the item text _without_ underscores */
 
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
     /* in order to get the pointer to the item we need the item text _without_ underscores */


@@ -527,7 +553,7 @@ wxString wxMenuBar::GetLabelTop( size_t pos ) const
 
     wxString label;
     wxString text( menu->GetTitle() );
 
     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('&') )
     for ( const wxChar *pc = text.c_str(); *pc; pc++ )
     {
         if ( *pc == wxT('_') || *pc == wxT('&') )


@@ -667,7 +693,7 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
 // wxMenuItem
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)

 
 wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,
 
 wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,


@@ -764,7 +790,7 @@ void wxMenuItem::DoSetText( const wxString& str )
     {
         if (*pc == wxT('&'))
         {
     {
         if (*pc == wxT('&'))
         {

-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)

             m_text << wxT('_');
         }
         else if ( *pc == wxT('_') )    // escape underscores
             m_text << wxT('_');
         }
         else if ( *pc == wxT('_') )    // escape underscores


@@ -774,7 +800,7 @@ void wxMenuItem::DoSetText( const wxString& str )
         else if (*pc == wxT('/'))      /* we have to filter out slashes ... */
         {
             m_text << wxT('\\');  /* ... and replace them with back slashes */
         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;
         }
         else
             m_text << *pc;


@@ -782,13 +808,14 @@ void wxMenuItem::DoSetText( const wxString& str )
 
     /* only GTK 1.2 knows about hot keys */
     m_hotKey = wxT("");
 
     /* 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;
     }
     if(*pc == wxT('\t'))
     {
        pc++;
        m_hotKey = pc;
     }

-#endif
+#endif // GTK+ 1.2.0+

 }
 
 #if wxUSE_ACCEL
 }
 
 #if wxUSE_ACCEL


@@ -869,7 +896,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 void wxMenu::Init()
 {
 
 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_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>" );


@@ -879,22 +906,22 @@ void wxMenu::Init()
 
     m_owner = (GtkWidget*) NULL;
 
 
     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. */
     if(m_style & wxMENU_TEAROFF)
     {
        GtkItemFactoryEntry entry;
     /* 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. */
     if(m_style & wxMENU_TEAROFF)
     {
        GtkItemFactoryEntry entry;

-       entry.path = "/tearoff";
+       entry.path = (char *)"/tearoff";

        entry.callback = (GtkItemFactoryCallback) NULL;
        entry.callback_action = 0;
        entry.callback = (GtkItemFactoryCallback) NULL;
        entry.callback_action = 0;

-       entry.item_type = "<Tearoff>";
+       entry.item_type = (char *)"<Tearoff>";

        entry.accelerator = (gchar*) NULL;
        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" );
     }
        entry.accelerator = (gchar*) NULL;
        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 )
 
     // append the title as the very first entry if we have it
     if ( !!m_title )


@@ -917,16 +944,18 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
 {
     GtkWidget *menuItem;
 
 {
     GtkWidget *menuItem;
 

+#if defined(USE_MENU_BITMAPS) || !GTK_CHECK_VERSION(1, 2, 0)

     bool appended = FALSE;
     bool appended = FALSE;

+#endif

 
     if ( mitem->IsSeparator() )
     {
 
     if ( mitem->IsSeparator() )
     {

-#if (GTK_MINOR_VERSION > 0)
+#if GTK_CHECK_VERSION(1, 2, 0)

         GtkItemFactoryEntry entry;
         GtkItemFactoryEntry entry;

-        entry.path = "/sep";
+        entry.path = (char *)"/sep";

         entry.callback = (GtkItemFactoryCallback) NULL;
         entry.callback_action = 0;
         entry.callback = (GtkItemFactoryCallback) NULL;
         entry.callback_action = 0;

-        entry.item_type = "<Separator>";
+        entry.item_type = (char *)"<Separator>";

         entry.accelerator = (gchar*) NULL;
 
         gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
         entry.accelerator = (gchar*) NULL;
 
         gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */


@@ -939,7 +968,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
     }
     else if ( mitem->IsSubMenu() )
     {
     }
     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() );
 
         /* text has "_" instead of "&" after mitem->SetText() */
         wxString text( mitem->GetText() );
 


@@ -952,7 +981,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         entry.path = buf;
         entry.callback = (GtkItemFactoryCallback) 0;
         entry.callback_action = 0;
         entry.path = buf;
         entry.callback = (GtkItemFactoryCallback) 0;
         entry.callback_action = 0;

-        entry.item_type = "<Branch>";
+        entry.item_type = (char *)"<Branch>";

         entry.accelerator = (gchar*) NULL;
 
         gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
         entry.accelerator = (gchar*) NULL;
 
         gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */


@@ -971,6 +1000,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         if ( m_invokingWindow )
             wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
     }
         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() );
     else if (mitem->GetBitmap().Ok()) // An item with bitmap
     {
         wxString text( mitem->GetText() );


@@ -1006,9 +1036,10 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
 
         appended = TRUE; // We've done this, don't do it again
     }
 
         appended = TRUE; // We've done this, don't do it again
     }

+#endif // USE_MENU_BITMAPS

     else // a normal item
     {
     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() );
 
         /* text has "_" instead of "&" after mitem->SetText() */
         wxString text( mitem->GetText() );
 


@@ -1022,9 +1053,9 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
         entry.callback_action = 0;
         if ( mitem->IsCheckable() )
         entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
         entry.callback_action = 0;
         if ( mitem->IsCheckable() )

-            entry.item_type = "<CheckItem>";
+            entry.item_type = (char *)"<CheckItem>";

         else
         else

-            entry.item_type = "<Item>";
+            entry.item_type = (char *)"<Item>";

         entry.accelerator = (gchar*) NULL;
 
 #if wxUSE_ACCEL
         entry.accelerator = (gchar*) NULL;
 
 #if wxUSE_ACCEL


@@ -1064,7 +1095,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
                             (gpointer)this );
     }
 
                             (gpointer)this );
     }
 

-#if GTK_MINOR_VERSION == 0
+#if !GTK_CHECK_VERSION(1, 2, 0)

     if (!appended)
     {
         gtk_menu_append( GTK_MENU(m_menu), menuItem );
     if (!appended)
     {
         gtk_menu_append( GTK_MENU(m_menu), menuItem );


@@ -1144,7 +1175,8 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 // helpers
 // ----------------------------------------------------------------------------
 
 // helpers
 // ----------------------------------------------------------------------------
 

-#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL
+#if GTK_CHECK_VERSION(1, 2, 0) && wxUSE_ACCEL
+

 static wxString GetHotKey( const wxMenuItem& item )
 {
     wxString hotkey;
 static wxString GetHotKey( const wxMenuItem& item )
 {
     wxString hotkey;


@@ -1178,7 +1210,9 @@ static wxString GetHotKey( const wxMenuItem& item )
                 hotkey << wxT('F') << code - WXK_F1 + 1;
                 break;
                 
                 hotkey << wxT('F') << code - WXK_F1 + 1;
                 break;
                 

-                // GTK seems to use XStringToKeySym here
+                // TODO: we should use gdk_keyval_name() (a.k.a.
+                //       XKeysymToString) here as well as hardcoding the keysym
+                //       names this might be not portable

             case WXK_NUMPAD_INSERT:
                 hotkey << wxT("KP_Insert" );
                 break;
             case WXK_NUMPAD_INSERT:
                 hotkey << wxT("KP_Insert" );
                 break;


@@ -1192,15 +1226,18 @@ static wxString GetHotKey( const wxMenuItem& item )
                 hotkey << wxT("Delete" );
                 break;
 
                 hotkey << wxT("Delete" );
                 break;
 

-                // if there are any other keys wxGetAccelFromString() may return,
-                // we should process them here
+                // if there are any other keys wxGetAccelFromString() may
+                // return, we should process them here

 
             default:
 
             default:

-                if ( wxIsalnum(code) )
+                if ( code < 127 )

                 {
                 {

-                    hotkey << (wxChar)code;
-
-                    break;
+                    gchar *name = gdk_keyval_name((guint)code);
+                    if ( name )
+                    {
+                        hotkey << name;
+                        break;
+                    }

                 }
 
                 wxFAIL_MSG( wxT("unknown keyboard accel") );
                 }
 
                 wxFAIL_MSG( wxT("unknown keyboard accel") );


@@ -1211,6 +1248,7 @@ static wxString GetHotKey( const wxMenuItem& item )
 
     return hotkey;
 }
 
     return hotkey;
 }

+

 #endif // wxUSE_ACCEL
 
 
 #endif // wxUSE_ACCEL
 
 


@@ -1218,6 +1256,8 @@ static wxString GetHotKey( const wxMenuItem& item )
 // substitute for missing GtkPixmapMenuItem
 //-----------------------------------------------------------------------------
 
 // substitute for missing GtkPixmapMenuItem
 //-----------------------------------------------------------------------------
 

+#ifdef USE_MENU_BITMAPS
+

 /*
  * Copyright (C) 1998, 1999, 2000 Free Software Foundation
  * All rights reserved.
 /*
  * Copyright (C) 1998, 1999, 2000 Free Software Foundation
  * All rights reserved.


@@ -1251,6 +1291,9 @@ static wxString GetHotKey( const wxMenuItem& item )
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkcontainer.h>
 
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkcontainer.h>
 

+extern "C"
+{
+

 static void gtk_pixmap_menu_item_class_init    (GtkPixmapMenuItemClass *klass);
 static void gtk_pixmap_menu_item_init          (GtkPixmapMenuItem      *menu_item);
 static void gtk_pixmap_menu_item_draw          (GtkWidget              *widget,
 static void gtk_pixmap_menu_item_class_init    (GtkPixmapMenuItemClass *klass);
 static void gtk_pixmap_menu_item_init          (GtkPixmapMenuItem      *menu_item);
 static void gtk_pixmap_menu_item_draw          (GtkWidget              *widget,


@@ -1276,6 +1319,8 @@ static void changed_have_pixmap_status         (GtkPixmapMenuItem *menu_item);
 
 static GtkMenuItemClass *parent_class = NULL;
 
 
 static GtkMenuItemClass *parent_class = NULL;
 

+}
+

 #define BORDER_SPACING  3
 #define PMAP_WIDTH 20
 
 #define BORDER_SPACING  3
 #define PMAP_WIDTH 20
 


@@ -1288,7 +1333,7 @@ gtk_pixmap_menu_item_get_type (void)
     {
       GtkTypeInfo pixmap_menu_item_info =
       {
     {
       GtkTypeInfo pixmap_menu_item_info =
       {

-        "GtkPixmapMenuItem",
+        (char *)"GtkPixmapMenuItem",

         sizeof (GtkPixmapMenuItem),
         sizeof (GtkPixmapMenuItemClass),
         (GtkClassInitFunc) gtk_pixmap_menu_item_class_init,
         sizeof (GtkPixmapMenuItem),
         sizeof (GtkPixmapMenuItemClass),
         (GtkClassInitFunc) gtk_pixmap_menu_item_class_init,


@@ -1583,4 +1628,5 @@ changed_have_pixmap_status (GtkPixmapMenuItem *menu_item)
     gtk_widget_queue_resize(GTK_WIDGET(menu_item));
 }
 
     gtk_widget_queue_resize(GTK_WIDGET(menu_item));
 }
 

+#endif // USE_MENU_BITMAPS