small optimizations: m_isWindow and m_isCommandEvent flags introduced

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 4696faeb11a73dd4df88c5214ecb175de663c88f..aff2211922fa246801ac7cd44f134b303dd956dc 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -26,6 +26,32 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 

+wxMenuBar::wxMenuBar( long style )
+{
+    m_needParent = FALSE; // hmmm
+
+    PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+
+    m_menus.DeleteContents( TRUE );
+
+    m_menubar = gtk_menu_bar_new();
+
+    if (style & wxMB_DOCKABLE)
+    {
+        m_widget = gtk_handle_box_new();
+       gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) );
+       gtk_widget_show( GTK_WIDGET(m_menubar) );
+    }
+    else
+    {
+        m_widget = GTK_WIDGET(m_menubar);
+    }
+
+    PostCreation();
+
+    Show( TRUE );
+}
+

 wxMenuBar::wxMenuBar()
 {
     m_needParent = FALSE; // hmmm
 wxMenuBar::wxMenuBar()
 {
     m_needParent = FALSE; // hmmm


@@ -36,7 +62,7 @@ wxMenuBar::wxMenuBar()
 
     m_menubar = gtk_menu_bar_new();
 
 
     m_menubar = gtk_menu_bar_new();
 

-    m_widget = GTK_WIDGET(m_menubar);
+        m_widget = GTK_WIDGET(m_menubar);

 
     PostCreation();
 
 
     PostCreation();
 


@@ -55,12 +81,11 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
         if (pos != -1) menu->m_title.Remove( pos, 1 );
     } while (pos != -1);
 
         if (pos != -1) menu->m_title.Remove( pos, 1 );
     } while (pos != -1);
 

-    GtkWidget *root_menu;
-    root_menu = gtk_menu_item_new_with_label( WXSTRINGCAST(menu->m_title) );
-    gtk_widget_show( root_menu );
-    gtk_menu_item_set_submenu( GTK_MENU_ITEM(root_menu), menu->m_menu );
+    menu->m_owner = gtk_menu_item_new_with_label( WXSTRINGCAST(menu->m_title) );
+    gtk_widget_show( menu->m_owner );
+    gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu );

 
 

-    gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), root_menu );
+    gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner );

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


@@ -77,6 +102,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->IsSubMenu())
             return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->IsSubMenu())
             return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);

+

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


@@ -152,33 +178,74 @@ bool wxMenuBar::Enabled( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
     if (item) return item->IsEnabled();
 {
     wxMenuItem* item = FindMenuItemById( id );
     if (item) return item->IsEnabled();

+    

     return FALSE;
 }
 
 wxString wxMenuBar::GetLabel( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );
     return FALSE;
 }
 
 wxString wxMenuBar::GetLabel( int id ) const
 {
     wxMenuItem* item = FindMenuItemById( id );

+    

     if (item) return item->GetText();
     if (item) return item->GetText();

-    return "";
+    
+    return wxString("");

 }
 
 void wxMenuBar::SetLabel( int id, const wxString &label )
 {
     wxMenuItem* item = FindMenuItemById( id );
 }
 
 void wxMenuBar::SetLabel( int id, const wxString &label )
 {
     wxMenuItem* item = FindMenuItemById( id );

-    if (item) return item->SetText( label );
+    
+    if (item) item->SetText( label );

 }
 
 }
 

-void wxMenuBar::EnableTop( int WXUNUSED(pos), bool WXUNUSED(flag) )
+void wxMenuBar::EnableTop( int pos, bool flag )

 {
 {

+    wxNode *node = m_menus.Nth( pos );
+  
+    wxCHECK_RET( node, "menu not found" );
+  
+    wxMenu* menu = (wxMenu*)node->Data();
+  
+    if (menu->m_owner) gtk_widget_set_sensitive( menu->m_owner, flag );

 }
 
 }
 

-wxString wxMenuBar::GetLabelTop( int WXUNUSED(pos) ) const
+wxString wxMenuBar::GetLabelTop( int pos ) const

 {
 {

-  return "menu";
+    wxNode *node = m_menus.Nth( pos );
+  
+    wxCHECK_MSG( node, "invalid", "menu not found" );
+  
+    wxMenu* menu = (wxMenu*)node->Data();
+  
+    return menu->GetTitle();

 }
 
 }
 

-void wxMenuBar::SetLabelTop( int WXUNUSED(pos), const wxString& WXUNUSED(label) )
+void wxMenuBar::SetLabelTop( int pos, const wxString& label )

 {
 {

+    wxNode *node = m_menus.Nth( pos );
+  
+    wxCHECK_RET( node, "menu not found" );
+  
+    wxMenu* menu = (wxMenu*)node->Data();
+  
+    menu->SetTitle( label );
+}
+
+void wxMenuBar::SetHelpString( int id, const wxString& helpString )
+{
+    wxMenuItem* item = FindMenuItemById( id );
+    
+    if (item) item->SetHelp( helpString );
+}
+
+wxString wxMenuBar::GetHelpString( int id ) const
+{
+    wxMenuItem* item = FindMenuItemById( id );
+    
+    if (item) 
+        return item->GetHelp();
+    else
+        return wxString("");

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


@@ -239,9 +306,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
 
     if (!menu->IsEnabled(id)) return;
 
 
     if (!menu->IsEnabled(id)) return;
 

-    wxCommandEvent event( wxEVT_MENU_HIGHLIGHT, id );
+    wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );

     event.SetEventObject( menu );
     event.SetEventObject( menu );

-    event.SetInt(id );

 
 /*   wxMSW doesn't call callback here either
 
 
 /*   wxMSW doesn't call callback here either
 


@@ -258,6 +324,27 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
     if (win) win->GetEventHandler()->ProcessEvent( event );
 }
 
     if (win) win->GetEventHandler()->ProcessEvent( event );
 }
 

+//-----------------------------------------------------------------------------
+// "deselect"
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
+{
+    int id = menu->FindMenuIdByMenuItem(widget);
+
+    wxASSERT( id != -1 ); // should find it!
+
+    if (!menu->IsEnabled(id)) return;
+
+    wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
+    event.SetEventObject( menu );
+
+    if (menu->GetEventHandler()->ProcessEvent(event)) return;
+
+    wxWindow *win = menu->GetInvokingWindow();
+    if (win) win->GetEventHandler()->ProcessEvent( event );
+}
+

 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------


@@ -345,6 +432,8 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
         Append(-2, m_title);
         AppendSeparator();
     }
         Append(-2, m_title);
         AppendSeparator();
     }

+    
+    m_owner = (GtkWidget*) NULL;

 }
 
 void wxMenu::SetTitle( const wxString& title )
 }
 
 void wxMenu::SetTitle( const wxString& title )


@@ -391,6 +480,10 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
                         GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
                         (gpointer*)this );
 
                         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 );
+

     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
     m_items.Append( mitem );
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
     m_items.Append( mitem );


@@ -407,6 +500,14 @@ void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxStri
     mitem->SetMenuItem(menuItem);
     mitem->SetSubMenu(subMenu);
 
     mitem->SetMenuItem(menuItem);
     mitem->SetSubMenu(subMenu);
 

+    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 );
+

     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );


@@ -567,4 +668,44 @@ wxWindow *wxMenu::GetInvokingWindow()
     return m_invokingWindow;
 }
 
     return m_invokingWindow;
 }
 

+// Update a menu and all submenus recursively.
+// source is the object that has the update event handlers
+// defined for it. If NULL, the menu or associated window
+// will be used.
+void wxMenu::UpdateUI(wxEvtHandler* source)
+{
+  if (!source && GetInvokingWindow())
+    source = GetInvokingWindow()->GetEventHandler();
+  if (!source)
+    source = GetEventHandler();
+  if (!source)
+    source = this;
+
+  wxNode* node = GetItems().First();
+  while (node)
+  {
+    wxMenuItem* item = (wxMenuItem*) node->Data();
+    if ( !item->IsSeparator() )
+    {
+      wxWindowID id = item->GetId();
+      wxUpdateUIEvent event(id);
+      event.SetEventObject( source );
+
+      if (source->ProcessEvent(event))
+      {
+        if (event.GetSetText())
+          SetLabel(id, event.GetText());
+        if (event.GetSetChecked())
+          Check(id, event.GetChecked());
+        if (event.GetSetEnabled())
+          Enable(id, event.GetEnabled());
+      }
+
+      if (item->GetSubMenu())
+        item->GetSubMenu()->UpdateUI(source);
+    }
+    node = node->Next();
+  }
+}
+