[gtk+/wip/gmenu: 58/87] Drop GtkApplicationMenuButton for now
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/gmenu: 58/87] Drop GtkApplicationMenuButton for now
- Date: Sat, 3 Dec 2011 23:53:01 +0000 (UTC)
commit 73fc010be3f877d2b0db97d1ac0a0da3dc26dcfc
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Dec 1 12:17:53 2011 -0500
Drop GtkApplicationMenuButton for now
This feels premature; we do have the fallback situation covered
adaequately with the menubar, and people can do their own creative
solutions with gtk_application_window_get_menu(), so we don't have
to offer a widget for this right now.
docs/reference/gtk/gtk-docs.sgml | 1 -
docs/reference/gtk/gtk3-sections.txt | 15 --
docs/reference/gtk/gtk3.types | 1 -
examples/bloatpad.c | 9 +-
gtk/Makefile.am | 2 -
gtk/gtk.h | 1 -
gtk/gtkapplicationmenubutton.c | 238 ----------------------------------
gtk/gtkapplicationmenubutton.h | 44 ------
8 files changed, 2 insertions(+), 309 deletions(-)
---
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index b0b0ffd..5ad00b3 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -339,7 +339,6 @@
<title>Application support</title>
<xi:include href="xml/gtkapplication.xml" />
<xi:include href="xml/gtkapplicationwindow.xml" />
- <xi:include href="xml/gtkapplicationmenubutton.xml" />
</chapter>
</part>
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 5e5b04c..d5dcc2e 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -7031,21 +7031,6 @@ GtkApplicationWindowPrivate
</SECTION>
<SECTION>
-<FILE>gtkapplicationmenubutton</FILE>
-<TITLE>GtkApplicationMenuButton</TITLE>
-GtkApplicationMenuButton
-gtk_application_menu_button_new
-
-<SUBSECTION Standard>
-GTK_TYPE_APPLICATION_MENU_BUTTON
-GTK_APPLICATION_MENU_BUTTON
-GTK_IS_APPLICATION_MENU_BUTTON
-
-<SUBSECTION Private>
-gtk_application_menu_button_get_type
-</SECTION>
-
-<SECTION>
<FILE>gtkgrid</FILE>
<TITLE>GtkGrid</TITLE>
GtkGrid
diff --git a/docs/reference/gtk/gtk3.types b/docs/reference/gtk/gtk3.types
index 1153539..4a035af 100644
--- a/docs/reference/gtk/gtk3.types
+++ b/docs/reference/gtk/gtk3.types
@@ -17,7 +17,6 @@ gtk_app_chooser_dialog_get_type
gtk_app_chooser_widget_get_type
gtk_application_get_type
gtk_application_window_get_type
-gtk_application_menu_button_get_type
gtk_arrow_get_type
gtk_aspect_frame_get_type
gtk_assistant_get_type
diff --git a/examples/bloatpad.c b/examples/bloatpad.c
index 4632c39..315ec12 100644
--- a/examples/bloatpad.c
+++ b/examples/bloatpad.c
@@ -49,7 +49,7 @@ static void
new_window (GApplication *app,
GFile *file)
{
- GtkWidget *window, *button, *grid, *scrolled, *view;
+ GtkWidget *window, *grid, *scrolled, *view;
window = gtk_application_window_new (GTK_APPLICATION (app));
g_action_map_add_action_entries (G_ACTION_MAP (window), win_entries, G_N_ELEMENTS (win_entries), window);
@@ -58,11 +58,6 @@ new_window (GApplication *app,
grid = gtk_grid_new ();
gtk_container_add (GTK_CONTAINER (window), grid);
- button = gtk_application_menu_button_new ();
- gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name ("help-about", GTK_ICON_SIZE_MENU));
- gtk_widget_set_halign (button, GTK_ALIGN_START);
- gtk_grid_attach (GTK_GRID (grid), button, 0, 0, 1, 1);
-
scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_hexpand (scrolled, TRUE);
gtk_widget_set_vexpand (scrolled, TRUE);
@@ -70,7 +65,7 @@ new_window (GApplication *app,
gtk_container_add (GTK_CONTAINER (scrolled), view);
- gtk_grid_attach (GTK_GRID (grid), scrolled, 0, 1, 1, 1);
+ gtk_grid_attach (GTK_GRID (grid), scrolled, 0, 0, 1, 1);
if (file != NULL)
{
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 64684bb..6bb5eba 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -181,7 +181,6 @@ gtk_public_h_sources = \
gtkappchooserwidget.h \
gtkapplication.h \
gtkapplicationwindow.h \
- gtkapplicationmenubutton.h \
gtkarrow.h \
gtkaspectframe.h \
gtkassistant.h \
@@ -523,7 +522,6 @@ gtk_base_c_sources = \
gtkappchooseronline.c \
gtkapplication.c \
gtkapplicationwindow.c \
- gtkapplicationmenubutton.c \
gtkanimationdescription.c \
gtkarrow.c \
gtkaspectframe.c \
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 5849569..0668636 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -45,7 +45,6 @@
#include <gtk/gtkappchooserwidget.h>
#include <gtk/gtkappchooserbutton.h>
#include <gtk/gtkapplication.h>
-#include <gtk/gtkapplicationmenubutton.h>
#include <gtk/gtkapplicationwindow.h>
#include <gtk/gtkarrow.h>
#include <gtk/gtkaspectframe.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]