Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 5e3e83d92f6190fd82bfe29598ebf07853807650..16e1d9d203fe29b96f0ad546dc1f0a6f62191cab 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk1/menu.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        src/gtk1/menu.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -25,6 +24,7 @@
 #endif // wxUSE_ACCEL
 
 #include "wx/gtk1/private.h"
 #endif // wxUSE_ACCEL
 
 #include "wx/gtk1/private.h"

+#include "wx/gtk1/private/mnemonics.h"

 
 #include <gdk/gdkkeysyms.h>
 
 
 #include <gdk/gdkkeysyms.h>
 


@@ -141,7 +141,7 @@ static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
     if (handler && handler->ProcessEvent(event))
         return;
 
     if (handler && handler->ProcessEvent(event))
         return;
 

-    wxWindow *win = menu->GetInvokingWindow();
+    wxWindow *win = menu->GetWindow();

     if (win)
         win->HandleWindowEvent( event );
 }
     if (win)
         win->HandleWindowEvent( event );
 }


@@ -174,14 +174,11 @@ static void gtk_menu_close_callback( GtkWidget *WXUNUSED(widget), wxMenuBar *men
 // wxMenuBar
 //-----------------------------------------------------------------------------
 
 // wxMenuBar
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
-

 void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
 {
     // the parent window is known after wxFrame::SetMenu()
     m_needParent = false;
     m_style = style;
 void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
 {
     // the parent window is known after wxFrame::SetMenu()
     m_needParent = false;
     m_style = style;

-    m_invokingWindow = NULL;

 
     if (!PreCreation( NULL, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
 
     if (!PreCreation( NULL, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))


@@ -241,10 +238,8 @@ wxMenuBar::~wxMenuBar()
 {
 }
 
 {
 }
 

-static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
+static void DetachFromFrame( wxMenu *menu, wxWindow *win )

 {
 {

-    menu->SetInvokingWindow( NULL );
-

     wxWindow *top_frame = win;
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
     wxWindow *top_frame = win;
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();


@@ -257,15 +252,13 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
     {
         wxMenuItem *menuitem = node->GetData();
         if (menuitem->IsSubMenu())
     {
         wxMenuItem *menuitem = node->GetData();
         if (menuitem->IsSubMenu())

-            wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win );
+            DetachFromFrame( menuitem->GetSubMenu(), win );

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

-static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
+static void AttachToFrame( wxMenu *menu, wxWindow *win )

 {
 {

-    menu->SetInvokingWindow( win );
-

     wxWindow *top_frame = win;
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
     wxWindow *top_frame = win;
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();


@@ -280,14 +273,15 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
     {
         wxMenuItem *menuitem = node->GetData();
         if (menuitem->IsSubMenu())
     {
         wxMenuItem *menuitem = node->GetData();
         if (menuitem->IsSubMenu())

-            wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );
+            AttachToFrame( menuitem->GetSubMenu(), win );

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

-void wxMenuBar::SetInvokingWindow( wxWindow *win )
+void wxMenuBar::Attach( wxFrame *win )

 {
 {

-    m_invokingWindow = win;
+    wxMenuBarBase::Attach(win);
+

     wxWindow *top_frame = win;
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
     wxWindow *top_frame = win;
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();


@@ -301,15 +295,14 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win )
     while (node)
     {
         wxMenu *menu = node->GetData();
     while (node)
     {
         wxMenu *menu = node->GetData();

-        wxMenubarSetInvokingWindow( menu, win );
+        AttachToFrame( menu, win );

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

-void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
+void wxMenuBar::Detach()

 {
 {

-    m_invokingWindow = NULL;
-    wxWindow *top_frame = win;
+    wxWindow *top_frame = m_menuBarFrame;

     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
 
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
 


@@ -320,9 +313,11 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
     while (node)
     {
         wxMenu *menu = node->GetData();
     while (node)
     {
         wxMenu *menu = node->GetData();

-        wxMenubarUnsetInvokingWindow( menu, win );
+        DetachFromFrame( menu, top_frame );

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

+
+    wxMenuBarBase::Detach();

 }
 
 bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
 }
 
 bool wxMenuBar::Append( wxMenu *menu, const wxString &title )


@@ -370,11 +365,9 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
                         GTK_SIGNAL_FUNC(gtk_menu_open_callback),
                         (gpointer)menu );
 
                         GTK_SIGNAL_FUNC(gtk_menu_open_callback),
                         (gpointer)menu );
 

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

     {
     {

-        wxMenubarSetInvokingWindow( menu, m_invokingWindow );
+        AttachToFrame( menu, m_menuBarFrame );

 
             // OPTIMISE ME:  we should probably cache this, or pass it
             //               directly, but for now this is a minimal
 
             // OPTIMISE ME:  we should probably cache this, or pass it
             //               directly, but for now this is a minimal


@@ -382,10 +375,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
             //               see (and refactor :) similar code in Remove
             //               below.
 
             //               see (and refactor :) similar code in Remove
             //               below.
 

-        wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
-
-        if( frame )
-            frame->UpdateMenuBarSize();
+            m_menuBarFrame->UpdateMenuBarSize();

     }
 
     return true;
     }
 
     return true;


@@ -429,13 +419,10 @@ wxMenu *wxMenuBar::Remove(size_t pos)
     gtk_widget_destroy( menu->m_owner );
     menu->m_owner = NULL;
 
     gtk_widget_destroy( menu->m_owner );
     menu->m_owner = NULL;
 

-    if (m_invokingWindow)
+    if (m_menuBarFrame)

     {
         // OPTIMISE ME:  see comment in GtkAppend
     {
         // OPTIMISE ME:  see comment in GtkAppend

-        wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
-
-        if( frame )
-            frame->UpdateMenuBarSize();
+        m_menuBarFrame->UpdateMenuBarSize();

     }
 
     return menu;
     }
 
     return menu;


@@ -443,7 +430,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
 {
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
 {

-    if (wxMenuItem::GetLabelText(wxConvertFromGTKToWXLabel(menu->GetTitle())) == wxMenuItem::GetLabelText(menuString))
+    if (wxMenuItem::GetLabelText(menu->GetTitle()) == wxMenuItem::GetLabelText(menuString))

     {
         int res = menu->FindItem( itemString );
         if (res != wxNOT_FOUND)
     {
         int res = menu->FindItem( itemString );
         if (res != wxNOT_FOUND)


@@ -536,7 +523,7 @@ wxString wxMenuBar::GetMenuLabel( size_t pos ) const
 
     wxMenu* menu = node->GetData();
 
 
     wxMenu* menu = node->GetData();
 

-    return wxConvertFromGTKToWXLabel(menu->GetTitle());
+    return menu->GetTitle();

 }
 
 void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )
 }
 
 void wxMenuBar::SetMenuLabel( size_t pos, const wxString& label )


@@ -578,7 +565,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
     int id = menu->FindMenuIdByMenuItem(widget);
 
     /* should find it for normal (not popup) menu */
     int id = menu->FindMenuIdByMenuItem(widget);
 
     /* should find it for normal (not popup) menu */

-    wxASSERT_MSG( (id != -1) || (menu->GetInvokingWindow() != NULL),
+    wxASSERT_MSG( (id != -1) || (menu->GetWindow() != NULL),

                   wxT("menu item not found in gtk_menu_clicked_callback") );
 
     if (!menu->IsEnabled(id))
                   wxT("menu item not found in gtk_menu_clicked_callback") );
 
     if (!menu->IsEnabled(id))


@@ -619,14 +606,14 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 
     // FIXME: why do we have to call wxFrame::GetEventHandler() directly here?
     //        normally wxMenu::SendEvent() should be enough, if it doesn't work
 
     // FIXME: why do we have to call wxFrame::GetEventHandler() directly here?
     //        normally wxMenu::SendEvent() should be enough, if it doesn't work

-    //        in wxGTK then we have a bug in wxMenu::GetInvokingWindow() which
+    //        in wxGTK then we have a bug in wxMenu::GetWindow() which

     //        should be fixed instead of working around it here...
     if (frame)
     {
         // If it is attached then let the frame send the event.
         // Don't call frame->ProcessCommand(id) because it toggles
         // checkable items and we've already done that above.
     //        should be fixed instead of working around it here...
     if (frame)
     {
         // If it is attached then let the frame send the event.
         // Don't call frame->ProcessCommand(id) because it toggles
         // checkable items and we've already done that above.

-        wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+        wxCommandEvent commandEvent(wxEVT_MENU, id);

         commandEvent.SetEventObject(frame);
         if (item->IsCheckable())
             commandEvent.SetInt(item->IsChecked());
         commandEvent.SetEventObject(frame);
         if (item->IsCheckable())
             commandEvent.SetInt(item->IsChecked());


@@ -665,7 +652,7 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
     if (handler && handler->ProcessEvent(event))
         return;
 
     if (handler && handler->ProcessEvent(event))
         return;
 

-    wxWindow *win = menu->GetInvokingWindow();
+    wxWindow *win = menu->GetWindow();

     if (win) win->HandleWindowEvent( event );
 }
 }
     if (win) win->HandleWindowEvent( event );
 }
 }


@@ -693,7 +680,7 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
     if (handler && handler->ProcessEvent(event))
         return;
 
     if (handler && handler->ProcessEvent(event))
         return;
 

-    wxWindow *win = menu->GetInvokingWindow();
+    wxWindow *win = menu->GetWindow();

     if (win)
         win->HandleWindowEvent( event );
 }
     if (win)
         win->HandleWindowEvent( event );
 }


@@ -703,8 +690,6 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
 // wxMenuItem
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-

 wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,
                                 const wxString& name,
 wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,
                                 const wxString& name,


@@ -928,8 +913,6 @@ bool wxMenuItem::IsChecked() const
 // wxMenu
 //-----------------------------------------------------------------------------
 
 // wxMenu
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
-

 void wxMenu::Init()
 {
     m_accel = gtk_accel_group_new();
 void wxMenu::Init()
 {
     m_accel = gtk_accel_group_new();


@@ -975,6 +958,11 @@ wxMenu::~wxMenu()
    }
 }
 
    }
 }
 

+wxString wxMenu::GetTitle() const
+{
+    return wxConvertMnemonicsFromGTK(wxMenuBase::GetTitle());
+}
+

 bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
 {
     GtkWidget *menuItem;
 bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
 {
     GtkWidget *menuItem;


@@ -987,7 +975,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
         // TODO
         menuItem = gtk_menu_item_new();
     }
         // TODO
         menuItem = gtk_menu_item_new();
     }

-    else if (mitem->GetBitmap().Ok())
+    else if (mitem->GetBitmap().IsOk())

     {
         text = mitem->wxMenuItemBase::GetItemLabel();
         const wxBitmap *bitmap = &mitem->GetBitmap();
     {
         text = mitem->wxMenuItemBase::GetItemLabel();
         const wxBitmap *bitmap = &mitem->GetBitmap();


@@ -1091,12 +1079,6 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
             gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
 
             gtk_widget_show( mitem->GetSubMenu()->m_menu );
             gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
 
             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
         {
         }
         else
         {