Minimum is now GTK+ 2.4

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 98a7ea30decbf3906c33b65f9e7fb49d82c55d3a..a48c4c3b0436e7cbab5a6a483c1425b9cd62309e 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -26,10 +26,6 @@
 #include "wx/stockitem.h"
 #include "wx/gtk/private.h"
 
 #include "wx/stockitem.h"
 #include "wx/gtk/private.h"
 

-#ifdef __WXGTK20__
-#include <gdk/gdktypes.h>
-#endif
-

 // FIXME: is this right? somehow I don't think so (VZ)
 
 #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
 // FIXME: is this right? somehow I don't think so (VZ)
 
 #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))


@@ -390,21 +386,8 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
     // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
     // addings menu later on.
     if (m_invokingWindow)
     // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
     // addings menu later on.
     if (m_invokingWindow)

-    {

         wxMenubarSetInvokingWindow( menu, m_invokingWindow );
 
         wxMenubarSetInvokingWindow( menu, m_invokingWindow );
 

-            // OPTIMISE ME:  we should probably cache this, or pass it
-            //               directly, but for now this is a minimal
-            //               change to validate the new dynamic sizing.
-            //               see (and refactor :) similar code in Remove
-            //               below.
-
-        wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
-
-        if( frame )
-            frame->UpdateMenuBarSize();
-    }
-

     return true;
 }
 
     return true;
 }
 


@@ -447,16 +430,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
     menu->m_owner = NULL;
 
     if (m_invokingWindow)
     menu->m_owner = NULL;
 
     if (m_invokingWindow)

-    {
-        // OPTIMISE ME:  see comment in GtkAppend
-        wxFrame *frame = wxDynamicCast( m_invokingWindow, wxFrame );
-
-        if( frame )
-            frame->UpdateMenuBarSize();
-

         wxMenubarUnsetInvokingWindow( menu, m_invokingWindow );
         wxMenubarUnsetInvokingWindow( menu, m_invokingWindow );

-    }
-

 
     return menu;
 }
 
     return menu;
 }


@@ -637,7 +611,6 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
         commandEvent.SetEventObject(frame);
         if (item->IsCheckable())
             commandEvent.SetInt(item->IsChecked());
         commandEvent.SetEventObject(frame);
         if (item->IsCheckable())
             commandEvent.SetInt(item->IsChecked());

-        commandEvent.SetEventObject(menu);

 
         frame->GetEventHandler()->ProcessEvent(commandEvent);
     }
 
         frame->GetEventHandler()->ProcessEvent(commandEvent);
     }