Found bug that skrewed up display wrt horizontal

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index b7f16438561bc3f7d2781b886b4b5f6bf6e72616..12185fcd39a2cc2dd809d405a2c44f5f6972ee0e 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -78,6 +78,8 @@ wxMenuBar::wxMenuBar( long style )
     }
 
     PostCreation();
     }
 
     PostCreation();

+
+    ApplyWidgetStyle();

 }
 
 wxMenuBar::wxMenuBar()
 }
 
 wxMenuBar::wxMenuBar()


@@ -108,6 +110,8 @@ wxMenuBar::wxMenuBar()
     m_widget = GTK_WIDGET(m_menubar);
 
     PostCreation();
     m_widget = GTK_WIDGET(m_menubar);
 
     PostCreation();

+
+    ApplyWidgetStyle();

 }
 
 wxMenuBar::~wxMenuBar()
 }
 
 wxMenuBar::~wxMenuBar()


@@ -142,13 +146,15 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
     menu->SetInvokingWindow( win );
 
 {
     menu->SetInvokingWindow( win );
 

-#if (GTK_MINOR_VERSION > 0)
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 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_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
+    GtkObject *obj = GTK_OBJECT(top_frame->m_widget);
+    if ( !g_slist_find( menu->m_accel->attach_objects, obj ) )
+        gtk_accel_group_attach( menu->m_accel, obj );

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


@@ -170,7 +176,9 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win )
         top_frame = top_frame->GetParent();
 
     /* support for native key accelerators indicated by underscroes */
         top_frame = top_frame->GetParent();
 
     /* support for native key accelerators indicated by underscroes */

-    gtk_accel_group_attach( m_accel, GTK_OBJECT(top_frame->m_widget) );
+    GtkObject *obj = GTK_OBJECT(top_frame->m_widget);
+    if ( !g_slist_find( m_accel->attach_objects, obj ) )
+        gtk_accel_group_attach( m_accel, obj );

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


@@ -309,6 +317,9 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
     if ( !GtkAppend(menu, title) )
         return FALSE;
 
     if ( !GtkAppend(menu, title) )
         return FALSE;
 

+    if (pos+1 >= m_menus.GetCount())
+        return TRUE;
+

     GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
     gpointer data = g_list_last(menu_shell->children)->data;
     menu_shell->children = g_list_remove(menu_shell->children, data);
     GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
     gpointer data = g_list_last(menu_shell->children)->data;
     menu_shell->children = g_list_remove(menu_shell->children, data);


@@ -327,14 +338,11 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {

-    if ( !wxMenuBarBase::Replace(pos, menu, title) )
-        return FALSE;
-

     // remove the old item and insert a new one
     wxMenu *menuOld = Remove(pos);
     if ( menuOld && !Insert(pos, menu, title) )
     {
     // remove the old item and insert a new one
     wxMenu *menuOld = Remove(pos);
     if ( menuOld && !Insert(pos, menu, title) )
     {

-        return NULL;
+        return (wxMenu*) NULL;

     }
 
     // either Insert() succeeded or Remove() failed and menuOld is NULL
     }
 
     // either Insert() succeeded or Remove() failed and menuOld is NULL


@@ -345,35 +353,28 @@ wxMenu *wxMenuBar::Remove(size_t pos)
 {
     wxMenu *menu = wxMenuBarBase::Remove(pos);
     if ( !menu )
 {
     wxMenu *menu = wxMenuBarBase::Remove(pos);
     if ( !menu )

-        return FALSE;
+        return (wxMenu*) NULL;

 
 

-#ifdef __WXGTK12__
-    // gtk_item_factory_delete_entry() is buggy as of GTK+ 1.2.6, so don't use
-    // it but delete the widget manually instead
-    wxString path = _T("<main>/"),
-             title = menu->GetTitle();
-    for ( const wxChar *p = title.c_str(); *p; p++ )
-    {
-        if ( *p != _T('_') )
-            path += *p;
-    }
+/*
+    GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);

 
 

-    GtkWidget *widget = gtk_item_factory_get_item(m_factory, path.mb_str());
-    if ( widget )
-    {
-        gtk_widget_destroy(widget);
+    printf( "factory entries before %d\n", (int)g_slist_length(m_factory->items) );
+    printf( "menu shell entries before %d\n", (int)g_list_length( menu_shell->children ) );
+*/

 
 

-        return menu;
-    }
+    // unparent calls unref() and that would delete the widget so we raise
+    // the ref count to 2 artificially before invoking unparent.
+    gtk_widget_ref( menu->m_menu );
+    gtk_widget_unparent( menu->m_menu );

 
 

-    // shouldn't happen (FIXME but does now)
-    wxFAIL_MSG( _T("gtk_item_factory_get_item() failed") );
-#else // GTK < 1.2
-    // this should be very simple to implement
-    wxFAIL_MSG( wxT("TODO") );
-#endif // GTK 1.2/1.0
+    gtk_widget_destroy( menu->m_owner );
+
+/*
+    printf( "factory entries after %d\n", (int)g_slist_length(m_factory->items) );
+    printf( "menu shell entries after %d\n", (int)g_list_length( menu_shell->children ) );
+*/

 
 

-    return NULL;
+    return menu;

 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )


@@ -633,22 +634,24 @@ wxMenuItem::~wxMenuItem()
 }
 
 // return the menu item text without any menu accels
 }
 
 // return the menu item text without any menu accels

-wxString wxMenuItem::GetLabel() const
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)

 {
     wxString label;
 #if (GTK_MINOR_VERSION > 0)
 {
     wxString label;
 #if (GTK_MINOR_VERSION > 0)

-    for ( const wxChar *pc = m_text.c_str(); *pc; pc++ )
+    for ( const wxChar *pc = text.c_str(); *pc; pc++ )

     {
     {

-        if ( *pc == wxT('_') )
+        if ( *pc == wxT('_') || *pc == wxT('&') )

         {
         {

-            // this is the escape character for GTK+ - skip it
+            // '_' is the escape character for GTK+ and '&' is the one for
+            // wxWindows - skip both of them

             continue;
         }
 
         label += *pc;
     }
 #else // GTK+ 1.0
             continue;
         }
 
         label += *pc;
     }
 #else // GTK+ 1.0

-    label = m_text;
+    label = text;

 #endif // GTK+ 1.2/1.0
 
     return label;
 #endif // GTK+ 1.2/1.0
 
     return label;


@@ -820,7 +823,7 @@ wxMenu::~wxMenu()
    gtk_object_unref( GTK_OBJECT(m_factory) );
 }
 
    gtk_object_unref( GTK_OBJECT(m_factory) );
 }
 

-bool wxMenu::DoAppend(wxMenuItem *mitem)
+bool wxMenu::GtkAppend(wxMenuItem *mitem)

 {
     GtkWidget *menuItem;
 
 {
     GtkWidget *menuItem;
 


@@ -934,58 +937,38 @@ bool wxMenu::DoAppend(wxMenuItem *mitem)
 
     mitem->SetMenuItem(menuItem);
 
 
     mitem->SetMenuItem(menuItem);
 

-    return wxMenuBase::DoAppend(mitem);
+    return TRUE;

 }
 
 }
 

-// VZ: this seems to be GTK+ 1.0 only code, I don't understand why there were
-//     both specialized versions of Append() and this one before my changes,
-//     but it seems that the others are better...
-#if 0
-void wxMenu::Append( wxMenuItem *item )
+bool wxMenu::DoAppend(wxMenuItem *mitem)

 {
 {

-    GtkWidget *menuItem = (GtkWidget*) NULL;
-
-    if (item->IsSeparator())
-        menuItem = gtk_menu_item_new();
-    else if (item->IsSubMenu())
-        menuItem = gtk_menu_item_new_with_label(item->GetText().mbc_str());
-    else
-        menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText().mbc_str())
-                                       : gtk_menu_item_new_with_label(item->GetText().mbc_str());
-
-    if (!item->IsSeparator())
-    {
-        gtk_signal_connect( GTK_OBJECT(menuItem), "select",
-                            GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
-                            (gpointer*)this );
-
-        gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
-                            GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
-                            (gpointer*)this );
-
-        if (!item->IsSubMenu())
-        {
-            gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
-                                GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
-                                (gpointer*)this );
-        }
-    }
-
-    gtk_menu_append( GTK_MENU(m_menu), menuItem );
-    gtk_widget_show( menuItem );
-
-    item->SetMenuItem(menuItem);
+    return GtkAppend(mitem) && wxMenuBase::DoAppend(mitem);

 }
 }

-#endif // 0

 
 bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 {
     if ( !wxMenuBase::DoInsert(pos, item) )
         return FALSE;
 
 
 bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 {
     if ( !wxMenuBase::DoInsert(pos, item) )
         return FALSE;
 

-    wxFAIL_MSG(wxT("not implemented"));
+#ifdef __WXGTK12__
+    // GTK+ doesn't have a function to insert a menu using GtkItemFactory (as
+    // of version 1.2.6), so we first append the item and then change its
+    // index
+    if ( !GtkAppend(item) )
+        return FALSE;
+
+    GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
+    gpointer data = g_list_last(menu_shell->children)->data;
+    menu_shell->children = g_list_remove(menu_shell->children, data);
+    menu_shell->children = g_list_insert(menu_shell->children, data, pos);
+
+    return TRUE;
+#else // GTK < 1.2
+    // this should be easy to do...
+    wxFAIL_MSG( wxT("not implemented") );

 
     return FALSE;
 
     return FALSE;

+#endif // GTK 1.2/1.0

 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)