Changeset 11094

Timestamp:

03/13/10 02:02:30 (2 years ago)

Author:

adamk

Message:

Untangle the situation with refresh -> menu

Location:

trunk/Padre/lib/Padre/Wx

Files:

• Main.pm (modified) (3 diffs)
• Menu/View.pm (modified) (1 diff)
• Menubar.pm (modified) (1 diff)

trunk/Padre/lib/Padre/Wx/Main.pm

@@ -1126 +1126 @@
     # Humans tend to look at the top of the screen first.
     $self->refresh_title($current);
-    $self->refresh_menubar($current);
+    $self->refresh_menu($current);
     $self->refresh_toolbar($current);
     $self->refresh_functions($current);
     $self->refresh_directory($current);
     $self->refresh_status($current);
-    
-    
 
     # Now signal the refresh to all remaining listeners
@@ -1326 +1324 @@
     $main->refresh_menu_plugins;
 
-Force a refresh of the plug-in menus.
+Force a refresh of just the plug-in menus.
 
 =cut
@@ -1348 +1346 @@
     return if $self->locked('REFRESH');
     $self->menu->window->refresh_windowlist($self);
-}
-
-=pod
-
-=head3 C<refresh_menubar>
-
-    $main->refresh_menubar;
-
-Force a refresh of Padre's menu bar.
-
-=cut
-
-sub refresh_menubar {
-    my $self = shift;
-    return if $self->locked('REFRESH');
-    $self->menu->refresh_top;
 }
 

trunk/Padre/lib/Padre/Wx/Menu/View.pm

@@ -27 +27 @@
     'toolbar',
 );
+
 
 

trunk/Padre/lib/Padre/Wx/Menubar.pm

@@ -150 +150 @@
 }
 
-sub refresh_top {
-    my $self    = shift;
-    my $current = _CURRENT(@_);
-    my $menu    = $self->wx->GetMenuCount ne $self->{default};
-
-    return 1; # This needs to be changed to match ->refresh, otherwise it breaks the menu
-
-    # Commented out temporarily to appease xt/critic.t
-    #   my $perl = !!(
-    #          _INSTANCE( $current->document, 'Padre::Document::Perl' )
-    #       or _INSTANCE( $current->project, 'Padre::Project::Perl' )
-    #   );
-    #
-    #   # Add/Remove the Perl menu
-    #   if ( $perl and not $menu ) {
-    #       $self->wx->Insert( 4, $self->perl->wx,     Wx::gettext("&Perl") );
-    #       $self->wx->Insert( 5, $self->refactor->wx, Wx::gettext("Ref&actor") );
-    #   } elsif ( $menu and not $perl ) {
-    #       $self->wx->Remove(5); # refactor
-    #       $self->wx->Remove(4); # perl
-    #   }
-    #
-    #   return 1;
-}
-
 1;