renamed AddSubPage() with pos parameter to InsertSubPage()

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 0c44d0a74d3d88446b7131e363f00e3ee3882c60..0178cad93d5b72cf949268f50624fb599f510aa4 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -7,11 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "menu.h"
-    #pragma implementation "menuitem.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -60,51 +55,6 @@ extern bool g_isIdle;
 static wxString GetGtkHotKey( const wxMenuItem& item );
 #endif
 
 static wxString GetGtkHotKey( const wxMenuItem& item );
 #endif
 

-//-----------------------------------------------------------------------------
-// substitute for missing GtkPixmapMenuItem
-//-----------------------------------------------------------------------------
-
-#ifndef __WXGTK20__
-
-#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_IS_PIXMAP_MENU_ITEM(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP_MENU_ITEM))
-#define GTK_IS_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP_MENU_ITEM))
-//#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PIXMAP_MENU_ITEM))
-#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj)  (GTK_PIXMAP_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj)))
-
-#ifndef GTK_MENU_ITEM_GET_CLASS
-#define GTK_MENU_ITEM_GET_CLASS(obj) (GTK_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj)))
-#endif
-
-typedef struct _GtkPixmapMenuItem       GtkPixmapMenuItem;
-typedef struct _GtkPixmapMenuItemClass  GtkPixmapMenuItemClass;
-
-struct _GtkPixmapMenuItem
-{
-    GtkMenuItem menu_item;
-
-    GtkWidget *pixmap;
-};
-
-struct _GtkPixmapMenuItemClass
-{
-    GtkMenuItemClass parent_class;
-
-    guint orig_toggle_size;
-    guint have_pixmap_count;
-};
-
-extern "C" {
-GtkType    gtk_pixmap_menu_item_get_type       (void);
-GtkWidget* gtk_pixmap_menu_item_new            (void);
-void       gtk_pixmap_menu_item_set_pixmap     (GtkPixmapMenuItem *menu_item,
-                                                GtkWidget *pixmap);
-}
-
-#endif // !__WXGTK20__
-

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


@@ -151,12 +101,11 @@ static wxString wxReplaceUnderscore( const wxString& title )
 // activate message from GTK
 //-----------------------------------------------------------------------------
 
 // activate message from GTK
 //-----------------------------------------------------------------------------
 

-extern "C" {
-static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
+static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle)
+        wxapp_install_idle_handler();

 
 

-    wxMenuEvent event( wxEVT_MENU_OPEN, -1, menu );

     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();


@@ -164,8 +113,32 @@ static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
         return;
 
     wxWindow *win = menu->GetInvokingWindow();
         return;
 
     wxWindow *win = menu->GetInvokingWindow();

-    if (win) win->GetEventHandler()->ProcessEvent( event );
+    if (win)
+        win->GetEventHandler()->ProcessEvent( event );

 }
 }

+
+extern "C" {
+
+static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
+{
+    wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu);
+
+    DoCommonMenuCallbackCode(menu, event);
+}
+
+static void gtk_menu_close_callback( GtkWidget *widget, wxMenuBar *menubar )
+{
+    if ( !menubar->GetMenuCount() )
+    {
+        // if menubar is empty we can't call GetMenu(0) below
+        return;
+    }
+
+    wxMenuEvent event( wxEVT_MENU_CLOSE, -1, NULL );
+
+    DoCommonMenuCallbackCode(menubar->GetMenu(0), event);
+}
+

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -189,9 +162,6 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
     }
 
     m_menubar = gtk_menu_bar_new();
     }
 
     m_menubar = gtk_menu_bar_new();

-#ifndef __WXGTK20__
-    m_accel = gtk_accel_group_new();
-#endif

 
     if (style & wxMB_DOCKABLE)
     {
 
     if (style & wxMB_DOCKABLE)
     {


@@ -210,6 +180,14 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
 
     for (size_t i = 0; i < n; ++i )
         Append(menus[i], titles[i]);
 
     for (size_t i = 0; i < n; ++i )
         Append(menus[i], titles[i]);

+
+    // VZ: for some reason connecting to menus "deactivate" doesn't work (we
+    //     don't get it when the menu is dismissed by clicking outside the
+    //     toolbar) so we connect to the global one, even if it means that we
+    //     can't pass the menu which was closed in wxMenuEvent object
+    g_signal_connect (m_menubar, "deactivate",
+                      G_CALLBACK (gtk_menu_close_callback), this);
+

 }
 
 wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)
 }
 
 wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style)


@@ -239,11 +217,6 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
 
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
 

-#ifndef __WXGTK20__
-    // support for native hot keys
-    gtk_accel_group_detach( menu->m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
-#endif
-

     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {
     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {


@@ -284,13 +257,6 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win )
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
 
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
 

-#ifndef __WXGTK20__
-    // support for native key accelerators indicated by underscroes
-    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
-

     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)
     {
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)
     {


@@ -307,11 +273,6 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
 
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
 

-#ifndef __WXGTK20__
-    // support for native key accelerators indicated by underscroes
-    gtk_accel_group_detach( m_accel, ACCEL_OBJ_CAST(top_frame->m_widget) );
-#endif
-

     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)
     {
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
     while (node)
     {


@@ -337,25 +298,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
     menu->SetTitle( str );
 
     // The "m_owner" is the "menu item"
     menu->SetTitle( str );
 
     // The "m_owner" is the "menu item"

-#ifdef __WXGTK20__

     menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );
     menu->m_owner = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( str ) );

-#else
-    menu->m_owner = gtk_menu_item_new_with_label( wxGTK_CONV( str ) );
-    GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
-    // set new text
-    gtk_label_set_text( label, wxGTK_CONV( str ) );
-    // reparse key accel
-    guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( str ) );
-    if (accel_key != GDK_VoidSymbol)
-    {
-        gtk_widget_add_accelerator (menu->m_owner,
-                                       "activate_item",
-                                        m_accel,//gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)),
-                                        accel_key,
-                                        GDK_MOD1_MASK,
-                                        GTK_ACCEL_LOCKED);
-    }
-#endif

 
     gtk_widget_show( menu->m_owner );
 
 
     gtk_widget_show( menu->m_owner );
 


@@ -366,9 +309,9 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
     else
         gtk_menu_shell_insert( GTK_MENU_SHELL(m_menubar), menu->m_owner, pos );
 
     else
         gtk_menu_shell_insert( GTK_MENU_SHELL(m_menubar), menu->m_owner, pos );
 

-    gtk_signal_connect( GTK_OBJECT(menu->m_owner), "activate",
-                        GTK_SIGNAL_FUNC(gtk_menu_open_callback),
-                        (gpointer)menu );
+    g_signal_connect (menu->m_owner, "activate",
+                      G_CALLBACK (gtk_menu_open_callback),
+                      menu);

 
     // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
     // addings menu later on.
 
     // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
     // addings menu later on.


@@ -563,22 +506,12 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
 
     wxMenu* menu = node->GetData();
 
 
     wxMenu* menu = node->GetData();
 

-    wxString str( wxReplaceUnderscore( label ) );
+    const wxString str( wxReplaceUnderscore( label ) );

 
     menu->SetTitle( str );
 
     if (menu->m_owner)
 
     menu->SetTitle( str );
 
     if (menu->m_owner)

-    {
-        GtkLabel *label = GTK_LABEL( GTK_BIN(menu->m_owner)->child );
-
-        /* set new text */
-        gtk_label_set( label, wxGTK_CONV( str ) );
-
-        /* reparse key accel */
-        (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( str ) );
-        gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
-    }
-
+        gtk_label_set_text_with_mnemonic( GTK_LABEL( GTK_BIN(menu->m_owner)->child), wxGTK_CONV(str) );

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -786,7 +719,6 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
             continue;
         }
 
             continue;
         }
 

-#ifdef __WXGTK20__

         if ( *pc == wxT('\\')  )
         {
             // GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx"
         if ( *pc == wxT('\\')  )
         {
             // GTK 2.0 escapes "xxx/xxx" to "xxx\/xxx"


@@ -794,7 +726,6 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
             label += *pc;
             continue;
         }
             label += *pc;
             continue;
         }

-#endif

 
         if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) )
         {
 
         if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) )
         {


@@ -818,12 +749,13 @@ void wxMenuItem::SetText( const wxString& str )
     oldLabel = wxStripMenuCodes(oldLabel);
     oldLabel.Replace(wxT("_"), wxT(""));
     wxString label1 = wxStripMenuCodes(str);
     oldLabel = wxStripMenuCodes(oldLabel);
     oldLabel.Replace(wxT("_"), wxT(""));
     wxString label1 = wxStripMenuCodes(str);

-    // Make sure we can change a hotkey even if the label is unaltered
-    wxString oldhotkey = GetHotKey();
+    wxString oldhotkey = GetHotKey();    // Store the old hotkey in Ctrl-foo format
+    wxCharBuffer oldbuf = wxGTK_CONV( GetGtkHotKey(*this) );  // and as <control>foo

 
     DoSetText(str);
 
 
     DoSetText(str);
 

-    if (oldLabel == label1 && oldhotkey == GetHotKey())
+    if (oldLabel == label1 &&
+             oldhotkey == GetHotKey())    // Make sure we can change a hotkey even if the label is unaltered

         return;
 
     if (m_menuItem)
         return;
 
     if (m_menuItem)


@@ -834,26 +766,15 @@ void wxMenuItem::SetText( const wxString& str )
         else
             label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
 
         else
             label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
 

-#ifdef __WXGTK20__

         gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(m_text) );
         gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(m_text) );

-#else
-        // set new text
-        gtk_label_set( label, wxGTK_CONV( m_text ) );
-
-        // reparse key accel
-        (void)gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV(m_text) );
-        gtk_accel_label_refetch( GTK_ACCEL_LABEL(label) );
-#endif

     }
 
     }
 

-#ifdef __WXGTK20__

     guint accel_key;
     GdkModifierType accel_mods;
     guint accel_key;
     GdkModifierType accel_mods;

-    wxCharBuffer oldbuf = wxGTK_CONV( oldhotkey );

     gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods);
     if (accel_key != 0)
     {
     gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods);
     if (accel_key != 0)
     {

-        gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem), 
+        gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem),

                                        m_parentMenu->m_accel,
                                        accel_key,
                                        accel_mods );
                                        m_parentMenu->m_accel,
                                        accel_key,
                                        accel_mods );


@@ -870,7 +791,6 @@ void wxMenuItem::SetText( const wxString& str )
                                     accel_mods,
                                     GTK_ACCEL_VISIBLE);
     }
                                     accel_mods,
                                     GTK_ACCEL_VISIBLE);
     }

-#endif

 }
 
 // it's valid for this function to be called even if m_menuItem == NULL
 }
 
 // it's valid for this function to be called even if m_menuItem == NULL


@@ -909,7 +829,7 @@ void wxMenuItem::DoSetText( const wxString& str )
        pc++;
        m_hotKey = pc;
     }
        pc++;
        m_hotKey = pc;
     }

-    
+

     // wxPrintf( wxT("DoSetText(): str %s m_text %s hotkey %s\n"), str.c_str(), m_text.c_str(), m_hotKey.c_str() );
 }
 
     // wxPrintf( wxT("DoSetText(): str %s m_text %s hotkey %s\n"), str.c_str(), m_text.c_str(), m_hotKey.c_str() );
 }
 


@@ -945,7 +865,7 @@ void wxMenuItem::Check( bool check )
     {
         case wxITEM_CHECK:
         case wxITEM_RADIO:
     {
         case wxITEM_CHECK:
         case wxITEM_RADIO:

-            gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+            gtk_check_menu_item_set_active( (GtkCheckMenuItem*)m_menuItem, (gint)check );

             break;
 
         default:
             break;
 
         default:


@@ -994,7 +914,7 @@ void wxMenu::Init()
     {
         GtkWidget *tearoff = gtk_tearoff_menu_item_new();
 
     {
         GtkWidget *tearoff = gtk_tearoff_menu_item_new();
 

-        gtk_menu_append(GTK_MENU(m_menu), tearoff);
+        gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff);

     }
 
     m_prevRadio = NULL;
     }
 
     m_prevRadio = NULL;


@@ -1014,7 +934,7 @@ wxMenu::~wxMenu()
    if ( GTK_IS_WIDGET( m_menu ))
    {
        // see wxMenu::Init
    if ( GTK_IS_WIDGET( m_menu ))
    {
        // see wxMenu::Init

-       gtk_widget_unref( m_menu ); 
+       gtk_widget_unref( m_menu );

        // if the menu is inserted in another menu at this time, there was
        // one more reference to it:
        if ( m_owner )
        // if the menu is inserted in another menu at this time, there was
        // one more reference to it:
        if ( m_owner )


@@ -1026,66 +946,17 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
 {
     GtkWidget *menuItem;
 
 {
     GtkWidget *menuItem;
 

+    wxString text;
+

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

-#ifdef __WXGTK20__

         menuItem = gtk_separator_menu_item_new();
         menuItem = gtk_separator_menu_item_new();

-#else
-        // TODO
-        menuItem = gtk_menu_item_new();
-#endif
-        if (pos == -1)
-            gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);
-        else
-            gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos);
-    }
-    else if ( mitem->IsSubMenu() )
-    {
-        // text has "_" instead of "&" after mitem->SetText()
-        wxString text( mitem->GetText() );
-
-#ifdef __WXGTK20__
-        menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
-#else
-        menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) );
-        GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
-        // set new text
-        gtk_label_set_text( label, wxGTK_CONV( text ) );
-        // reparse key accel
-        guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
-        if (accel_key != GDK_VoidSymbol)
-        {
-            gtk_widget_add_accelerator (menuItem,
-                                        "activate_item",
-                                        gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
-                                        accel_key,
-                                        GDK_MOD1_MASK,
-                                        GTK_ACCEL_LOCKED);
-        }
-#endif
-
-        gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
-        if (pos == -1)
-            gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);
-        else
-            gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos);
-
-        gtk_widget_show( mitem->GetSubMenu()->m_menu );
-
-        // if adding a submenu to a menu already existing in the menu bar, we
-        // must set invoking window to allow processing events from this
-        // submenu
-        if ( m_invokingWindow )
-            wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
-
-        m_prevRadio = NULL;

     }
     else if (mitem->GetBitmap().Ok())
     {
     }
     else if (mitem->GetBitmap().Ok())
     {

-        wxString text = mitem->GetText();
+        text = mitem->GetText();

         const wxBitmap *bitmap = &mitem->GetBitmap();
 
         const wxBitmap *bitmap = &mitem->GetBitmap();
 

-#ifdef __WXGTK20__

         menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
 
         GtkWidget *image;
         menuItem = gtk_image_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
 
         GtkWidget *image;


@@ -1096,111 +967,28 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
         else
         {
             GdkPixmap *gdk_pixmap = bitmap->GetPixmap();
         else
         {
             GdkPixmap *gdk_pixmap = bitmap->GetPixmap();

-            GdkBitmap *gdk_bitmap = bitmap->GetMask() ? 
+            GdkBitmap *gdk_bitmap = bitmap->GetMask() ?

                                         bitmap->GetMask()->GetBitmap() :
                                         (GdkBitmap*) NULL;
             image = gtk_image_new_from_pixmap( gdk_pixmap, gdk_bitmap );
         }
                                         bitmap->GetMask()->GetBitmap() :
                                         (GdkBitmap*) NULL;
             image = gtk_image_new_from_pixmap( gdk_pixmap, gdk_bitmap );
         }

-        
+

         gtk_widget_show(image);
 
         gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image );
 
         gtk_widget_show(image);
 
         gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menuItem), image );
 

-        gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
-                            GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
-                            (gpointer)this );
-
-        if (pos == -1)
-            gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);
-        else
-            gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos);
-#else
-        GdkPixmap *gdk_pixmap = bitmap->GetPixmap();
-        GdkBitmap *gdk_bitmap = bitmap->GetMask() ? bitmap->GetMask()->GetBitmap() : (GdkBitmap*) NULL;
-
-        menuItem = gtk_pixmap_menu_item_new ();
-        GtkWidget *label = gtk_accel_label_new ( wxGTK_CONV( text ) );
-        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-        gtk_container_add (GTK_CONTAINER (menuItem), label);
-
-        gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuItem);
-        guint accel_key;
-        GdkModifierType accel_mods;
-
-        // accelerator for the item, as specified by its label
-        // (ex. Ctrl+O for open)
-        gtk_accelerator_parse(GetGtkHotKey(*mitem).c_str(), &accel_key,
-                              &accel_mods);
-        if (accel_key != GDK_VoidSymbol)
-        {
-            gtk_widget_add_accelerator (menuItem,
-                                        "activate_item",
-                                        m_accel,
-                                        accel_key, accel_mods,
-                                        GTK_ACCEL_VISIBLE);
-        }
-
-        // accelerator for the underlined char (ex ALT+F for the File menu)
-        accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
-        if (accel_key != GDK_VoidSymbol)
-        {
-            gtk_widget_add_accelerator (menuItem,
-                                        "activate_item",
-                                        gtk_menu_ensure_uline_accel_group(GTK_MENU (m_menu)),
-                                        accel_key,
-                                        GDK_MOD1_MASK,
-                                        GTK_ACCEL_LOCKED);
-        }
-
-        gtk_widget_show (label);
-
-        mitem->SetLabelWidget(label);
-
-        GtkWidget* pixmap = gtk_pixmap_new( gdk_pixmap, gdk_bitmap );
-        gtk_widget_show(pixmap);
-        gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), pixmap);
-
-        gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
-                            GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
-                            (gpointer)this );
-
-        if (pos == -1)
-            gtk_menu_append( GTK_MENU(m_menu), menuItem );
-        else
-            gtk_menu_insert( GTK_MENU(m_menu), menuItem, pos );
-        gtk_widget_show( menuItem );
-#endif
-

         m_prevRadio = NULL;
     }
     else // a normal item
     {
         // text has "_" instead of "&" after mitem->SetText() so don't use it
         m_prevRadio = NULL;
     }
     else // a normal item
     {
         // text has "_" instead of "&" after mitem->SetText() so don't use it

-        wxString text( mitem->GetText() );
+        text =  mitem->GetText() ;

 
         switch ( mitem->GetKind() )
         {
             case wxITEM_CHECK:
             {
 
         switch ( mitem->GetKind() )
         {
             case wxITEM_CHECK:
             {

-#ifdef __WXGTK20__

                 menuItem = gtk_check_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
                 menuItem = gtk_check_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );

-#else
-                menuItem = gtk_check_menu_item_new_with_label( wxGTK_CONV( text ) );
-                GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
-                // set new text
-                gtk_label_set_text( label, wxGTK_CONV( text ) );
-                // reparse key accel
-                guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
-                if (accel_key != GDK_VoidSymbol)
-                {
-                    gtk_widget_add_accelerator (menuItem,
-                                                "activate_item",
-                                                gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
-                                                accel_key,
-                                                GDK_MOD1_MASK,
-                                                GTK_ACCEL_LOCKED);
-                }
-#endif

                 m_prevRadio = NULL;
                 break;
             }
                 m_prevRadio = NULL;
                 break;
             }


@@ -1211,49 +999,12 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
                 if ( m_prevRadio == NULL )
                 {
                     // start of a new radio group
                 if ( m_prevRadio == NULL )
                 {
                     // start of a new radio group

-#ifdef __WXGTK20__

                     m_prevRadio = menuItem = gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV( text ) );
                     m_prevRadio = menuItem = gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV( text ) );

-#else
-                    m_prevRadio = menuItem = gtk_radio_menu_item_new_with_label( group, wxGTK_CONV( text ) );
-                    GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
-                    // set new text
-                    gtk_label_set_text( label, wxGTK_CONV( text ) );
-                    // reparse key accel
-                    guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
-                    if (accel_key != GDK_VoidSymbol)
-                    {
-                        gtk_widget_add_accelerator (menuItem,
-                                                    "activate_item",
-                                                    gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
-                                                    accel_key,
-                                                    GDK_MOD1_MASK,
-                                                    GTK_ACCEL_LOCKED);
-                    }
-#endif

                 }
                 else // continue the radio group
                 {
                 }
                 else // continue the radio group
                 {

-#ifdef __WXGTK20__

                     group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (m_prevRadio));
                     m_prevRadio = menuItem = gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV( text ) );
                     group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (m_prevRadio));
                     m_prevRadio = menuItem = gtk_radio_menu_item_new_with_mnemonic( group, wxGTK_CONV( text ) );

-#else
-                    group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (m_prevRadio));
-                    m_prevRadio = menuItem = gtk_radio_menu_item_new_with_label( group, wxGTK_CONV( text ) );
-                    GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
-                    // set new text
-                    gtk_label_set_text( label, wxGTK_CONV( text ) );
-                    // reparse key accel
-                    guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
-                    if (accel_key != GDK_VoidSymbol)
-                    {
-                        gtk_widget_add_accelerator (menuItem,
-                                                    "activate_item",
-                                                    gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
-                                                    accel_key,
-                                                    GDK_MOD1_MASK,
-                                                    GTK_ACCEL_LOCKED);
-                    }
-#endif

                 }
                 break;
             }
                 }
                 break;
             }


@@ -1264,38 +1015,12 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
 
             case wxITEM_NORMAL:
             {
 
             case wxITEM_NORMAL:
             {

-#ifdef __WXGTK20__

                 menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );
                 menuItem = gtk_menu_item_new_with_mnemonic( wxGTK_CONV( text ) );

-#else
-                menuItem = gtk_menu_item_new_with_label( wxGTK_CONV( text ) );
-                GtkLabel *label = GTK_LABEL( GTK_BIN(menuItem)->child );
-                // set new text
-                gtk_label_set_text( label, wxGTK_CONV( text ) );
-                // reparse key accel
-                guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
-                if (accel_key != GDK_VoidSymbol)
-                {
-                    gtk_widget_add_accelerator (menuItem,
-                                                    "activate_item",
-                                                    gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
-                                                    accel_key,
-                                                    GDK_MOD1_MASK,
-                                                    GTK_ACCEL_LOCKED);
-                }
-#endif

                 m_prevRadio = NULL;
                 break;
             }
         }
 
                 m_prevRadio = NULL;
                 break;
             }
         }
 

-        gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
-                            GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
-                            (gpointer)this );
-
-        if (pos == -1)
-            gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);
-        else
-            gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos);

     }
 
     guint accel_key;
     }
 
     guint accel_key;


@@ -1314,19 +1039,40 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
                                     GTK_ACCEL_VISIBLE);
     }
 
                                     GTK_ACCEL_VISIBLE);
     }
 

+    if (pos == -1)
+        gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);
+    else
+        gtk_menu_shell_insert(GTK_MENU_SHELL(m_menu), menuItem, pos);
+

     gtk_widget_show( menuItem );
 
     if ( !mitem->IsSeparator() )
     {
         wxASSERT_MSG( menuItem, wxT("invalid menuitem") );
 
     gtk_widget_show( menuItem );
 
     if ( !mitem->IsSeparator() )
     {
         wxASSERT_MSG( menuItem, wxT("invalid menuitem") );
 

-        gtk_signal_connect( GTK_OBJECT(menuItem), "select",
-                            GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
-                            (gpointer)this );
+        g_signal_connect (menuItem, "select",
+                          G_CALLBACK (gtk_menu_hilight_callback), this);
+        g_signal_connect (menuItem, "deselect",
+                          G_CALLBACK (gtk_menu_nolight_callback), this);
+
+        if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK )
+        {
+            gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );

 
 

-        gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
-                            GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
-                            (gpointer)this );
+            gtk_widget_show( mitem->GetSubMenu()->m_menu );
+
+            // if adding a submenu to a menu already existing in the menu bar, we
+            // must set invoking window to allow processing events from this
+            // submenu
+            if ( m_invokingWindow )
+                wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
+        }
+        else
+        {
+            g_signal_connect (menuItem, "activate",
+                              G_CALLBACK (gtk_menu_clicked_callback),
+                              this);
+        }

     }
 
     mitem->SetMenuItem(menuItem);
     }
 
     mitem->SetMenuItem(menuItem);


@@ -1379,7 +1125,7 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
     {
         wxMenuItem *item = node->GetData();
         if (item->GetMenuItem() == menuItem)
     {
         wxMenuItem *item = node->GetData();
         if (item->GetMenuItem() == menuItem)

-           return item->GetId();
+            return item->GetId();

         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 


@@ -1422,19 +1168,25 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
             case WXK_F10:
             case WXK_F11:
             case WXK_F12:
             case WXK_F10:
             case WXK_F11:
             case WXK_F12:

+            case WXK_F13:
+            case WXK_F14:
+            case WXK_F15:
+            case WXK_F16:
+            case WXK_F17:
+            case WXK_F18:
+            case WXK_F19:
+            case WXK_F20:
+            case WXK_F21:
+            case WXK_F22:
+            case WXK_F23:
+            case WXK_F24:

                 hotkey += wxString::Format(wxT("F%d"), code - WXK_F1 + 1);
                 break;
 
                 // TODO: we should use gdk_keyval_name() (a.k.a.
                 //       XKeysymToString) here as well as hardcoding the keysym
                 //       names this might be not portable
                 hotkey += wxString::Format(wxT("F%d"), code - WXK_F1 + 1);
                 break;
 
                 // 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_DELETE:
-                hotkey << wxT("KP_Delete" );
-                break;
-            case WXK_INSERT:
+           case WXK_INSERT:

                 hotkey << wxT("Insert" );
                 break;
             case WXK_DELETE:
                 hotkey << wxT("Insert" );
                 break;
             case WXK_DELETE:


@@ -1469,7 +1221,165 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
             case WXK_RETURN:
                 hotkey << wxT("Return" );
                 break;
             case WXK_RETURN:
                 hotkey << wxT("Return" );
                 break;

-
+            case WXK_BACK:
+                hotkey << wxT("BackSpace" );
+                break;
+            case WXK_TAB:
+                hotkey << wxT("Tab" );
+                break;
+            case WXK_ESCAPE:
+                hotkey << wxT("Esc" );
+                break;
+            case WXK_SPACE:
+                hotkey << wxT("space" );
+                break;
+            case WXK_MULTIPLY:
+                hotkey << wxT("Multiply" );
+                break;
+            case WXK_ADD:
+                hotkey << wxT("Add" );
+                break;
+            case WXK_SEPARATOR:
+                hotkey << wxT("Separator" );
+                break;
+            case WXK_SUBTRACT:
+                hotkey << wxT("Subtract" );
+                break;
+            case WXK_DECIMAL:
+                hotkey << wxT("Decimal" );
+                break;
+            case WXK_DIVIDE:
+                hotkey << wxT("Divide" );
+                break;
+            case WXK_CANCEL:
+                hotkey << wxT("Cancel" );
+                break;
+            case WXK_CLEAR:
+                hotkey << wxT("Clear" );
+                break;
+            case WXK_MENU:
+                hotkey << wxT("Menu" );
+                break;
+            case WXK_PAUSE:
+                hotkey << wxT("Pause" );
+                break;
+            case WXK_CAPITAL:
+                hotkey << wxT("Capital" );
+                break;
+            case WXK_SELECT:
+                hotkey << wxT("Select" );
+                break;
+            case WXK_PRINT:
+                hotkey << wxT("Print" );
+                break;
+            case WXK_EXECUTE:
+                hotkey << wxT("Execute" );
+                break;
+            case WXK_SNAPSHOT:
+                hotkey << wxT("Snapshot" );
+                break;
+            case WXK_HELP:
+                hotkey << wxT("Help" );
+                break;
+            case WXK_NUMLOCK:
+                hotkey << wxT("Num_Lock" );
+                break;
+            case WXK_SCROLL:
+                hotkey << wxT("Scroll_Lock" );
+                break;
+            case WXK_NUMPAD_INSERT:
+                hotkey << wxT("KP_Insert" );
+                break;
+            case WXK_NUMPAD_DELETE:
+                hotkey << wxT("KP_Delete" );
+                break;
+             case WXK_NUMPAD_SPACE:
+                hotkey << wxT("KP_Space" );
+                break;
+            case WXK_NUMPAD_TAB:
+                hotkey << wxT("KP_Tab" );
+                break;
+            case WXK_NUMPAD_ENTER:
+                hotkey << wxT("KP_Enter" );
+                break;
+            case WXK_NUMPAD_F1: case WXK_NUMPAD_F2: case WXK_NUMPAD_F3:
+            case WXK_NUMPAD_F4:
+                hotkey += wxString::Format(wxT("KP_F%d"), code - WXK_NUMPAD_F1 + 1);
+                break;
+            case WXK_NUMPAD_HOME:
+                hotkey << wxT("KP_Home" );
+                break;
+            case WXK_NUMPAD_LEFT:
+                hotkey << wxT("KP_Left" );
+                break;
+             case WXK_NUMPAD_UP:
+                hotkey << wxT("KP_Up" );
+                break;
+            case WXK_NUMPAD_RIGHT:
+                hotkey << wxT("KP_Right" );
+                break;
+            case WXK_NUMPAD_DOWN:
+                hotkey << wxT("KP_Down" );
+                break;
+            case WXK_NUMPAD_PRIOR: case WXK_NUMPAD_PAGEUP:
+                hotkey << wxT("KP_Prior" );
+                break;
+            case WXK_NUMPAD_NEXT:  case WXK_NUMPAD_PAGEDOWN:
+                hotkey << wxT("KP_Next" );
+                break;
+            case WXK_NUMPAD_END:
+                hotkey << wxT("KP_End" );
+                break;
+            case WXK_NUMPAD_BEGIN:
+                hotkey << wxT("KP_Begin" );
+                break;
+            case WXK_NUMPAD_EQUAL:
+                hotkey << wxT("KP_Equal" );
+                break;
+            case WXK_NUMPAD_MULTIPLY:
+                hotkey << wxT("KP_Multiply" );
+                break;
+            case WXK_NUMPAD_ADD:
+                hotkey << wxT("KP_Add" );
+                break;
+            case WXK_NUMPAD_SEPARATOR:
+                hotkey << wxT("KP_Separator" );
+                break;
+            case WXK_NUMPAD_SUBTRACT:
+                hotkey << wxT("KP_Subtract" );
+                break;
+            case WXK_NUMPAD_DECIMAL:
+                hotkey << wxT("KP_Decimal" );
+                break;
+            case WXK_NUMPAD_DIVIDE:
+                hotkey << wxT("KP_Divide" );
+                break;
+           case WXK_NUMPAD0: case WXK_NUMPAD1: case WXK_NUMPAD2:
+           case WXK_NUMPAD3: case WXK_NUMPAD4: case WXK_NUMPAD5:
+           case WXK_NUMPAD6: case WXK_NUMPAD7: case WXK_NUMPAD8: case WXK_NUMPAD9:
+                hotkey += wxString::Format(wxT("KP_%d"), code - WXK_NUMPAD0);
+                break;
+            case WXK_WINDOWS_LEFT:
+                hotkey << wxT("Super_L" );
+                break;
+            case WXK_WINDOWS_RIGHT:
+                hotkey << wxT("Super_R" );
+                break;
+            case WXK_WINDOWS_MENU:
+                hotkey << wxT("Menu" );
+                break;
+            case WXK_COMMAND:
+                hotkey << wxT("Command" );
+                break;
+          /* These probably wouldn't work as there is no SpecialX in gdk/keynames.txt
+            case WXK_SPECIAL1: case WXK_SPECIAL2: case WXK_SPECIAL3: case WXK_SPECIAL4:
+            case WXK_SPECIAL5: case WXK_SPECIAL6: case WXK_SPECIAL7: case WXK_SPECIAL8:
+            case WXK_SPECIAL9:  case WXK_SPECIAL10:  case WXK_SPECIAL11: case WXK_SPECIAL12:
+            case WXK_SPECIAL13: case WXK_SPECIAL14: case WXK_SPECIAL15: case WXK_SPECIAL16:
+            case WXK_SPECIAL17: case WXK_SPECIAL18: case WXK_SPECIAL19:  case WXK_SPECIAL20:
+                hotkey += wxString::Format(wxT("Special%d"), code - WXK_SPECIAL1 + 1);
+                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
 


@@ -1495,386 +1405,116 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
 
 #endif // wxUSE_ACCEL
 
 
 #endif // wxUSE_ACCEL
 

+// ----------------------------------------------------------------------------
+// Pop-up menu stuff
+// ----------------------------------------------------------------------------

 
 

-//-----------------------------------------------------------------------------
-// substitute for missing GtkPixmapMenuItem
-//-----------------------------------------------------------------------------
-
-#ifndef __WXGTK20__
-
-/*
- * Copyright (C) 1998, 1999, 2000 Free Software Foundation
- * All rights reserved.
- *
- * This file is part of the Gnome Library.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
-  @NOTATION@
- */
-
-/* Author: Dietmar Maurer <dm@vlsivie.tuwien.ac.at> */
-
-#include <gtk/gtkaccellabel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkcontainer.h>
+#if wxUSE_MENUS_NATIVE

 
 extern "C"
 
 extern "C"

+void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting  )

 {
 {

-
-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,
-                                                GdkRectangle           *area);
-static gint gtk_pixmap_menu_item_expose        (GtkWidget              *widget,
-                                                GdkEventExpose         *event);
-
-/* we must override the following functions */
-
-static void gtk_pixmap_menu_item_map           (GtkWidget        *widget);
-static void gtk_pixmap_menu_item_size_allocate (GtkWidget        *widget,
-                                                GtkAllocation    *allocation);
-static void gtk_pixmap_menu_item_forall        (GtkContainer    *container,
-                                                gboolean         include_internals,
-                                                GtkCallback      callback,
-                                                gpointer         callback_data);
-static void gtk_pixmap_menu_item_size_request  (GtkWidget        *widget,
-                                                GtkRequisition   *requisition);
-static void gtk_pixmap_menu_item_remove        (GtkContainer *container,
-                                                GtkWidget    *child);
-
-static void changed_have_pixmap_status         (GtkPixmapMenuItem *menu_item);
-
-static GtkMenuItemClass *parent_class = NULL;
-
-} // extern "C"
-
-#define BORDER_SPACING  3
-#define PMAP_WIDTH 20
-
-GtkType
-gtk_pixmap_menu_item_get_type (void)
-{
-  static GtkType pixmap_menu_item_type = 0;
-
-  if (!pixmap_menu_item_type)
-    {
-      GtkTypeInfo pixmap_menu_item_info =
-      {
-        (char *)"GtkPixmapMenuItem",
-        sizeof (GtkPixmapMenuItem),
-        sizeof (GtkPixmapMenuItemClass),
-        (GtkClassInitFunc) gtk_pixmap_menu_item_class_init,
-        (GtkObjectInitFunc) gtk_pixmap_menu_item_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (),
-                                               &pixmap_menu_item_info);
-    }
-
-  return pixmap_menu_item_type;
-}
-
-extern "C" {
-
-/**
- * gtk_pixmap_menu_item_new
- *
- * Creates a new pixmap menu item. Use gtk_pixmap_menu_item_set_pixmap()
- * to set the pixmap wich is displayed at the left side.
- *
- * Returns:
- * &GtkWidget pointer to new menu item
- **/
-
-GtkWidget*
-gtk_pixmap_menu_item_new (void)
-{
-  return GTK_WIDGET (gtk_type_new (gtk_pixmap_menu_item_get_type ()));
-}
-
-static void
-gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass)
-{
-  GtkObjectClass *object_class;
-  GtkWidgetClass *widget_class;
-  GtkMenuItemClass *menu_item_class;
-  GtkContainerClass *container_class;
-
-  object_class = (GtkObjectClass*) klass;
-  widget_class = (GtkWidgetClass*) klass;
-  menu_item_class = (GtkMenuItemClass*) klass;
-  container_class = (GtkContainerClass*) klass;
-
-  parent_class = (GtkMenuItemClass*) gtk_type_class (gtk_menu_item_get_type ());
-
-  widget_class->draw = gtk_pixmap_menu_item_draw;
-  widget_class->expose_event = gtk_pixmap_menu_item_expose;
-  widget_class->map = gtk_pixmap_menu_item_map;
-  widget_class->size_allocate = gtk_pixmap_menu_item_size_allocate;
-  widget_class->size_request = gtk_pixmap_menu_item_size_request;
-
-  container_class->forall = gtk_pixmap_menu_item_forall;
-  container_class->remove = gtk_pixmap_menu_item_remove;
-
-  klass->orig_toggle_size = menu_item_class->toggle_size;
-  klass->have_pixmap_count = 0;
+    *is_waiting = FALSE;

 }
 
 }
 

-static void
-gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item)
+void SetInvokingWindow( wxMenu *menu, wxWindow* win )

 {
 {

-  GtkMenuItem *mi;
-
-  mi = GTK_MENU_ITEM (menu_item);
-
-  menu_item->pixmap = NULL;
-}
-
-static void
-gtk_pixmap_menu_item_draw (GtkWidget    *widget,
-                           GdkRectangle *area)
-{
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
-  g_return_if_fail (area != NULL);
+    menu->SetInvokingWindow( win );

 
 

-  if (GTK_WIDGET_CLASS (parent_class)->draw)
-    (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
+    wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
+    while (node)
+    {
+        wxMenuItem *menuitem = node->GetData();
+        if (menuitem->IsSubMenu())
+        {
+            SetInvokingWindow( menuitem->GetSubMenu(), win );
+        }

 
 

-  if (GTK_WIDGET_DRAWABLE (widget) &&
-      GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
-    gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
-  }
+        node = node->GetNext();
+    }

 }
 
 }
 

-static gint
-gtk_pixmap_menu_item_expose (GtkWidget      *widget,
-                             GdkEventExpose *event)
+extern "C"
+void wxPopupMenuPositionCallback( GtkMenu *menu,
+                                  gint *x, gint *y,
+                                  gboolean * WXUNUSED(whatever),
+                                  gpointer user_data )

 {
 {

-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
+    // ensure that the menu appears entirely on screen
+    GtkRequisition req;
+    gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req);

 
 

-  if (GTK_WIDGET_CLASS (parent_class)->expose_event)
-    (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
+    wxSize sizeScreen = wxGetDisplaySize();
+    wxPoint *pos = (wxPoint*)user_data;

 
 

-  if (GTK_WIDGET_DRAWABLE (widget) &&
-      GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
-    gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
-  }
+    gint xmax = sizeScreen.x - req.width,
+         ymax = sizeScreen.y - req.height;

 
 

-  return FALSE;
+    *x = pos->x < xmax ? pos->x : xmax;
+    *y = pos->y < ymax ? pos->y : ymax;

 }
 
 }
 

-/**
- * gtk_pixmap_menu_item_set_pixmap
- * @menu_item: Pointer to the pixmap menu item
- * @pixmap: Pointer to a pixmap widget
- *
- * Set the pixmap of the menu item.
- *
- **/
-
-void
-gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
-                                 GtkWidget         *pixmap)
+bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )

 {
 {

-  g_return_if_fail (menu_item != NULL);
-  g_return_if_fail (pixmap != NULL);
-  g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (menu_item));
-  g_return_if_fail (GTK_IS_WIDGET (pixmap));
-  g_return_if_fail (menu_item->pixmap == NULL);
-
-  gtk_widget_set_parent (pixmap, GTK_WIDGET (menu_item));
-  menu_item->pixmap = pixmap;
-
-  if (GTK_WIDGET_REALIZED (pixmap->parent) &&
-      !GTK_WIDGET_REALIZED (pixmap))
-    gtk_widget_realize (pixmap);
-
-  if (GTK_WIDGET_VISIBLE (pixmap->parent)) {
-    if (GTK_WIDGET_MAPPED (pixmap->parent) &&
-        GTK_WIDGET_VISIBLE(pixmap) &&
-        !GTK_WIDGET_MAPPED (pixmap))
-      gtk_widget_map (pixmap);
-  }
-
-  changed_have_pixmap_status(menu_item);
-
-  if (GTK_WIDGET_VISIBLE (pixmap) && GTK_WIDGET_VISIBLE (menu_item))
-    gtk_widget_queue_resize (pixmap);
-}
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );

 
 

-static void
-gtk_pixmap_menu_item_map (GtkWidget *widget)
-{
-  GtkPixmapMenuItem *menu_item;
+    wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") );

 
 

-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
+    // NOTE: if you change this code, you need to update
+    //       the same code in taskbar.cpp as well. This
+    //       is ugly code duplication, I know.

 
 

-  menu_item = GTK_PIXMAP_MENU_ITEM(widget);
+    SetInvokingWindow( menu, this );

 
 

-  GTK_WIDGET_CLASS(parent_class)->map(widget);
+    menu->UpdateUI();

 
 

-  if (menu_item->pixmap &&
-      GTK_WIDGET_VISIBLE (menu_item->pixmap) &&
-      !GTK_WIDGET_MAPPED (menu_item->pixmap))
-    gtk_widget_map (menu_item->pixmap);
-}
+    bool is_waiting = true;

 
 

-static void
-gtk_pixmap_menu_item_size_allocate (GtkWidget        *widget,
-                                    GtkAllocation    *allocation)
-{
-  GtkPixmapMenuItem *pmenu_item;
-
-  pmenu_item = GTK_PIXMAP_MENU_ITEM(widget);
+    gulong handler = g_signal_connect (menu->m_menu, "hide",
+                                       G_CALLBACK (gtk_pop_hide_callback),
+                                       &is_waiting);

 
 

-  if (pmenu_item->pixmap && GTK_WIDGET_VISIBLE(pmenu_item))
+    wxPoint pos;
+    gpointer userdata;
+    GtkMenuPositionFunc posfunc;
+    if ( x == -1 && y == -1 )

     {
     {

-      GtkAllocation child_allocation;
-      int border_width;
-
-      border_width = GTK_CONTAINER (widget)->border_width;
-
-      child_allocation.width = pmenu_item->pixmap->requisition.width;
-      child_allocation.height = pmenu_item->pixmap->requisition.height;
-      child_allocation.x = border_width + BORDER_SPACING;
-      child_allocation.y = (border_width + BORDER_SPACING
-                            + (((allocation->height - child_allocation.height) - child_allocation.x)
-                               / 2)); /* center pixmaps vertically */
-      gtk_widget_size_allocate (pmenu_item->pixmap, &child_allocation);
+        // use GTK's default positioning algorithm
+        userdata = NULL;
+        posfunc = NULL;
+    }
+    else
+    {
+        pos = ClientToScreen(wxPoint(x, y));
+        userdata = &pos;
+        posfunc = wxPopupMenuPositionCallback;

     }
 
     }
 

-  if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
-    GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
-}
-
-static void
-gtk_pixmap_menu_item_forall (GtkContainer    *container,
-                             gboolean         include_internals,
-                             GtkCallback      callback,
-                             gpointer         callback_data)
-{
-  GtkPixmapMenuItem *menu_item;
-
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container));
-  g_return_if_fail (callback != NULL);
-
-  menu_item = GTK_PIXMAP_MENU_ITEM (container);
-
-  if (menu_item->pixmap)
-    (* callback) (menu_item->pixmap, callback_data);
-
-  GTK_CONTAINER_CLASS(parent_class)->forall(container,include_internals,
-                                            callback,callback_data);
-}
-
-static void
-gtk_pixmap_menu_item_size_request (GtkWidget      *widget,
-                                   GtkRequisition *requisition)
-{
-  GtkPixmapMenuItem *menu_item;
-  GtkRequisition req = {0, 0};
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_MENU_ITEM (widget));
-  g_return_if_fail (requisition != NULL);
-
-  GTK_WIDGET_CLASS(parent_class)->size_request(widget,requisition);
-
-  menu_item = GTK_PIXMAP_MENU_ITEM (widget);
-
-  if (menu_item->pixmap)
-    gtk_widget_size_request(menu_item->pixmap, &req);
+    wxMenuEvent eventOpen(wxEVT_MENU_OPEN, -1, menu);
+    DoCommonMenuCallbackCode(menu, eventOpen);

 
 

-  requisition->height = MAX(req.height + GTK_CONTAINER(widget)->border_width + BORDER_SPACING, (unsigned int) requisition->height);
-  requisition->width += (req.width + GTK_CONTAINER(widget)->border_width + BORDER_SPACING);
-}
-
-static void
-gtk_pixmap_menu_item_remove (GtkContainer *container,
-                             GtkWidget    *child)
-{
-  GtkBin *bin;
-  gboolean widget_was_visible;
-
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container));
-  g_return_if_fail (child != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (child));
-
-  bin = GTK_BIN (container);
-  g_return_if_fail ((bin->child == child ||
-                     (GTK_PIXMAP_MENU_ITEM(container)->pixmap == child)));
-
-  widget_was_visible = GTK_WIDGET_VISIBLE (child);
-
-  gtk_widget_unparent (child);
-  if (bin->child == child)
-    bin->child = NULL;
-  else {
-    GTK_PIXMAP_MENU_ITEM(container)->pixmap = NULL;
-    changed_have_pixmap_status(GTK_PIXMAP_MENU_ITEM(container));
-  }
-
-  if (widget_was_visible)
-    gtk_widget_queue_resize (GTK_WIDGET (container));
-}
+    gtk_menu_popup(
+                  GTK_MENU(menu->m_menu),
+                  (GtkWidget *) NULL,           // parent menu shell
+                  (GtkWidget *) NULL,           // parent menu item
+                  posfunc,                      // function to position it
+                  userdata,                     // client data
+                  0,                            // button used to activate it
+                  gtk_get_current_event_time()
+                );

 
 

+    while (is_waiting)
+    {
+        gtk_main_iteration();
+    }

 
 

-/* important to only call this if there was actually a _change_ in pixmap == NULL */
-static void
-changed_have_pixmap_status (GtkPixmapMenuItem *menu_item)
-{
-  if (menu_item->pixmap != NULL) {
-    GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count += 1;
+    g_signal_handler_disconnect (menu->m_menu, handler);

 
 

-    if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 1) {
-      /* Install pixmap toggle size */
-      GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = MAX(GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size, PMAP_WIDTH);
-    }
-  } else {
-    GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count -= 1;
+    wxMenuEvent eventClose(wxEVT_MENU_CLOSE, -1, menu);
+    DoCommonMenuCallbackCode(menu, eventClose);

 
 

-    if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 0) {
-      /* Install normal toggle size */
-      GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size;
-    }
-  }
-
-  /* Note that we actually need to do this for _all_ GtkPixmapMenuItem
-     whenever the klass->toggle_size changes; but by doing it anytime
-     this function is called, we get the same effect, just because of
-     how the preferences option to show pixmaps works. Bogus, broken.
-  */
-  if (GTK_WIDGET_VISIBLE(GTK_WIDGET(menu_item)))
-    gtk_widget_queue_resize(GTK_WIDGET(menu_item));
+    return true;

 }
 
 }
 

-} // extern "C"
-
-#endif // !__WXGTK20__
+#endif // wxUSE_MENUS_NATIVE