Change FSF Address

[~andy/gtk] / gtk / gtkmenubar.c

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 521f814d52b875b43ae424922cde048df3341b9b..72b0b919e19547cc3105841163cbb482057ebaa7 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -48,6 +46,7 @@
 #include "gtksettings.h"
 #include "gtksizerequest.h"
 #include "gtkwindow.h"
+#include "gtkcontainerprivate.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
@@ -129,6 +128,8 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
   widget_class->draw = gtk_menu_bar_draw;
   widget_class->hierarchy_changed = gtk_menu_bar_hierarchy_changed;
   
+  gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_MENU_BAR);
+
   menu_shell_class->submenu_placement = GTK_TOP_BOTTOM;
   menu_shell_class->get_popup_delay = gtk_menu_bar_get_popup_delay;
   menu_shell_class->move_current = gtk_menu_bar_move_current;
@@ -633,15 +634,11 @@ gtk_menu_bar_draw (GtkWidget *widget,
                   cairo_t   *cr)
 {
   GtkStyleContext *context;
-  GtkStateFlags state;
   int border;
 
   border = gtk_container_get_border_width (GTK_CONTAINER (widget));
   context = gtk_widget_get_style_context (widget);
 
-  state = gtk_widget_get_state_flags (widget);
-  gtk_style_context_set_state (context, state);
-
   if (get_shadow_type (GTK_MENU_BAR (widget)) != GTK_SHADOW_NONE)
     gtk_render_background (context, cr,
                            border, border,