Fixed various bugs (from - err - various authors) related

    to inserting and replacing menubars etc.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 6a093c743ea6bc82e458fb0412d43ee6ae8a1456..9fd4095b12cde8d2099b6b096abdae80a13dae56 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -1,3 +1,9 @@
+/*
+    Test for menu swapping bug (?) with GTK 2.1.13
+*/
+
+
+

 /////////////////////////////////////////////////////////////////////////////
 // Name:        minimal.cpp
 // Purpose:     Minimal wxWindows sample
 /////////////////////////////////////////////////////////////////////////////
 // Name:        minimal.cpp
 // Purpose:     Minimal wxWindows sample


@@ -34,6 +40,13 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

+
+// ----------------------------------------------------------------------------
+// Global variables
+// ----------------------------------------------------------------------------
+static wxMenuBar *bar[2];
+static int current_bar;
+

 // ----------------------------------------------------------------------------
 // ressources
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ressources
 // ----------------------------------------------------------------------------


@@ -69,6 +82,9 @@ public:
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

+    void OnSwapMenus(wxCommandEvent& event);
+    void OnReplaceMenu(wxCommandEvent& event);
+    void OnRemoveInsertMenu(wxCommandEvent& event);

 
 private:
     // any class wishing to process wxWindows events must use this macro
 
 private:
     // any class wishing to process wxWindows events must use this macro


@@ -84,7 +100,10 @@ enum
 {
     // menu items
     Minimal_Quit = 1,
 {
     // menu items
     Minimal_Quit = 1,

-    Minimal_About
+    Minimal_About,
+    Minimal_SwapMenus,
+    Minimal_ReplaceMenu,
+    Minimal_RemoveInsertMenu

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -97,6 +116,9 @@ enum
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)

+    EVT_MENU(Minimal_SwapMenus, MyFrame::OnSwapMenus)
+    EVT_MENU(Minimal_ReplaceMenu, MyFrame::OnReplaceMenu)
+    EVT_MENU(Minimal_RemoveInsertMenu, MyFrame::OnRemoveInsertMenu)

 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create


@@ -110,6 +132,26 @@ IMPLEMENT_APP(MyApp)
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+wxString IntTowxString(int number)
+{
+  return(wxString(IntToString(number)));
+}
+
+wxMenu *GetFileMenu(int menu_number)
+{
+  wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
+  menuFile->Append(Minimal_Quit, "E&xit" + IntTowxString(menu_number) +
+   "\tAlt-X", "Quit this program");
+  menuFile->Append(Minimal_SwapMenus, "&SwapMenus" + IntTowxString(menu_number)
+   + "\tAlt-S", "Swap Menus");
+  menuFile->Append(Minimal_ReplaceMenu, "&ReplaceMenu" +
+   IntTowxString(menu_number) + "\tAlt-R", "Replace Menu");
+  menuFile->Append(Minimal_RemoveInsertMenu, "&RemoveInsertMenu" +
+   IntTowxString(menu_number) + "\tAlt-I", "Remove Then Insert Menu");
+
+  return(menuFile);
+}
+

 // ----------------------------------------------------------------------------
 // the application class
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // the application class
 // ----------------------------------------------------------------------------


@@ -148,22 +190,33 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // set the frame icon
     SetIcon(wxICON(mondrian));
 
     // set the frame icon
     SetIcon(wxICON(mondrian));
 

-    // create a menu bar
-    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
+    bar[0] = new wxMenuBar();
+
+    wxMenu *menuFile0 = GetFileMenu(0);
+
+    wxMenu *helpMenu0 = new wxMenu;
+    helpMenu0->Append(Minimal_About, "&About0...\tCtrl-A",
+     "Show about dialog");
+
+    bar[0]->Append(menuFile0, "&File0");
+    bar[0]->Append(helpMenu0, "&Help0");

 
 

-    // the "About" item should be in the help menu
-    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");

 
 

-    menuFile->Append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program");
+    bar[1] = new wxMenuBar();

 
 

-    // now append the freshly created menu to the menu bar...
-    wxMenuBar *menuBar = new wxMenuBar();
-    menuBar->Append(menuFile, "&File");
-    menuBar->Append(helpMenu, "&Help");
+    wxMenu *menuFile1 = GetFileMenu(1);
+
+    wxMenu *helpMenu1 = new wxMenu;
+    helpMenu1->Append(Minimal_About, "&About1...\tCtrl-A",
+     "Show about dialog");
+
+    bar[1]->Append(menuFile1, "&File1");
+    bar[1]->Append(helpMenu1, "&Help1");
+
+    current_bar = 1;

 
     // ... and attach this menu bar to the frame
 
     // ... and attach this menu bar to the frame

-    SetMenuBar(menuBar);
+    SetMenuBar(bar[current_bar]);

 
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
 
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)


@@ -189,3 +242,49 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
     wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);
 }
 
     wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);
 }

+
+void MyFrame::OnSwapMenus(wxCommandEvent& WXUNUSED(event))
+{
+  // Change the menu set around
+  current_bar = 1 - current_bar;
+  SetMenuBar(bar[current_bar]);
+}
+
+void MyFrame::OnReplaceMenu(wxCommandEvent& WXUNUSED(event))
+{
+  wxMenuBar *curr_bar = bar[current_bar];
+  wxMenu *menu = GetFileMenu(3);
+  wxString title = "&File3";
+
+  // Replace the first menu with the same thing
+  int pos = 1;
+  if (pos != wxNOT_FOUND)
+  {
+      curr_bar->Replace(pos, menu, title);
+//    SetMenuBar(curr_bar);
+  }
+}
+
+
+void MyFrame::OnRemoveInsertMenu(wxCommandEvent& WXUNUSED(event))
+{
+  wxMenuBar *curr_bar = bar[current_bar];
+  wxMenu *menu = GetFileMenu(current_bar);
+  wxString title = "&File3";
+
+  // Remove the first menu then insert it back in
+  int pos = 1; 
+  if (pos != wxNOT_FOUND)
+  {
+    curr_bar->Remove(pos);
+    if (curr_bar->GetMenuCount() != 0)
+      curr_bar->Insert(pos, menu, title);
+    else
+      curr_bar->Append(menu, title);
+
+    SetMenuBar(curr_bar);
+  }
+}
+
+
+

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 86b13483796a482c63a01dab24417fb765d7d8e3..fd1cc38a1e135b7abfd61c9a6bec376ad92c96c2 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -501,7 +501,7 @@ bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,
 {
     if ( pos == m_menus.GetCount() )
     {
 {
     if ( pos == m_menus.GetCount() )
     {

-        return Append(menu, title);
+        return wxMenuBarBase::Append(menu, title);

     }
     else
     {
     }
     else
     {

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 2bc208bcb46f880e68410c4b03a0175d312881e5..c20496ef80773680808539d03abdf10bf9bd7999 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -899,33 +899,51 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 

+    if (menuBar == m_frameMenuBar)
+        return;
+
+    if (m_frameMenuBar)
+    {
+        m_frameMenuBar->UnsetInvokingWindow( this );
+
+        if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)
+        {
+            gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget),
+                GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );
+
+            gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget),
+                GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
+        }
+        
+        gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
+        gtk_widget_ref( m_frameMenuBar->m_widget );
+        gtk_widget_unparent( m_frameMenuBar->m_widget );
+    }
+

     m_frameMenuBar = menuBar;
 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );
 
     m_frameMenuBar = menuBar;
 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );
 

-        if (m_frameMenuBar->GetParent() != this)
-        {
-            m_frameMenuBar->SetParent(this);
-            gtk_pizza_put( GTK_PIZZA(m_mainWidget),
+        m_frameMenuBar->SetParent(this);
+        gtk_pizza_put( GTK_PIZZA(m_mainWidget),

                 m_frameMenuBar->m_widget,
                 m_frameMenuBar->m_x,
                 m_frameMenuBar->m_y,
                 m_frameMenuBar->m_width,
                 m_frameMenuBar->m_height );
 
                 m_frameMenuBar->m_widget,
                 m_frameMenuBar->m_x,
                 m_frameMenuBar->m_y,
                 m_frameMenuBar->m_width,
                 m_frameMenuBar->m_height );
 

-            if (menuBar->GetWindowStyle() & wxMB_DOCKABLE)
-            {
-                gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_attached",
-                    GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );
-
-                gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
-                    GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
-            }
+        if (menuBar->GetWindowStyle() & wxMB_DOCKABLE)
+        {
+            gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_attached",
+                GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );

 
 

-            m_frameMenuBar->Show( TRUE );
+            gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
+                GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );

         }
         }

+
+        m_frameMenuBar->Show( TRUE );

     }
 
     /* resize window in OnInternalIdle */
     }
 
     /* resize window in OnInternalIdle */

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 573be47fd8e0a0b2e909fb8c1ec7f43528fa7f29..3aff75731f46e46423cbfd97e14798e5c1399bb4 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -317,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);


@@ -335,9 +338,6 @@ 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 (wxMenu*) NULL;
-

     // 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) )

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 2bc208bcb46f880e68410c4b03a0175d312881e5..c20496ef80773680808539d03abdf10bf9bd7999 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -899,33 +899,51 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 

+    if (menuBar == m_frameMenuBar)
+        return;
+
+    if (m_frameMenuBar)
+    {
+        m_frameMenuBar->UnsetInvokingWindow( this );
+
+        if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)
+        {
+            gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget),
+                GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );
+
+            gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget),
+                GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
+        }
+        
+        gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
+        gtk_widget_ref( m_frameMenuBar->m_widget );
+        gtk_widget_unparent( m_frameMenuBar->m_widget );
+    }
+

     m_frameMenuBar = menuBar;
 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );
 
     m_frameMenuBar = menuBar;
 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );
 

-        if (m_frameMenuBar->GetParent() != this)
-        {
-            m_frameMenuBar->SetParent(this);
-            gtk_pizza_put( GTK_PIZZA(m_mainWidget),
+        m_frameMenuBar->SetParent(this);
+        gtk_pizza_put( GTK_PIZZA(m_mainWidget),

                 m_frameMenuBar->m_widget,
                 m_frameMenuBar->m_x,
                 m_frameMenuBar->m_y,
                 m_frameMenuBar->m_width,
                 m_frameMenuBar->m_height );
 
                 m_frameMenuBar->m_widget,
                 m_frameMenuBar->m_x,
                 m_frameMenuBar->m_y,
                 m_frameMenuBar->m_width,
                 m_frameMenuBar->m_height );
 

-            if (menuBar->GetWindowStyle() & wxMB_DOCKABLE)
-            {
-                gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_attached",
-                    GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );
-
-                gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
-                    GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
-            }
+        if (menuBar->GetWindowStyle() & wxMB_DOCKABLE)
+        {
+            gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_attached",
+                GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );

 
 

-            m_frameMenuBar->Show( TRUE );
+            gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
+                GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );

         }
         }

+
+        m_frameMenuBar->Show( TRUE );

     }
 
     /* resize window in OnInternalIdle */
     }
 
     /* resize window in OnInternalIdle */

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 573be47fd8e0a0b2e909fb8c1ec7f43528fa7f29..3aff75731f46e46423cbfd97e14798e5c1399bb4 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -317,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);


@@ -335,9 +338,6 @@ 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 (wxMenu*) NULL;
-

     // 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) )