[gtk+] Add GtkGLArea to the widget gallery
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Add GtkGLArea to the widget gallery
- Date: Wed, 22 Oct 2014 05:17:32 +0000 (UTC)
commit 247f2c91926e6d090554aac1d0092f044aece790
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Oct 22 00:55:39 2014 -0400
Add GtkGLArea to the widget gallery
docs/reference/gtk/Makefile.am | 1 +
docs/reference/gtk/images/glarea.png | Bin 0 -> 5338 bytes
docs/reference/gtk/visual_index.xml | 3 +++
docs/tools/Makefile.am | 5 ++++-
docs/tools/widgets.c | 20 ++++++++++++++++++++
5 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index b27ad71..f1b067d 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -206,6 +206,7 @@ HTML_IMAGES = \
$(srcdir)/images/font-button.png \
$(srcdir)/images/fontchooser.png \
$(srcdir)/images/frame.png \
+ $(srcdir)/images/glarea.png \
$(srcdir)/images/headerbar.png \
$(srcdir)/images/icon-view.png \
$(srcdir)/images/image.png \
diff --git a/docs/reference/gtk/images/glarea.png b/docs/reference/gtk/images/glarea.png
new file mode 100644
index 0000000..e90ee6e
Binary files /dev/null and b/docs/reference/gtk/images/glarea.png differ
diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml
index b9e1430..6e58e53 100644
--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -42,6 +42,9 @@
<link linkend="GtkScale">
<inlinegraphic fileref="scales.png" format="PNG"></inlinegraphic>
</link>
+ <link linkend="GtkGLArea">
+ <inlinegraphic fileref="glarea.png" format="PNG"></inlinegraphic>
+ </link>
</para>
</section>
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index e3b2966..31982ae 100644
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk \
-I$(top_srcdir)/gdk/x11 \
+ -I$(top_srcdir)/tests \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -30,7 +31,9 @@ doc_shooter_SOURCES= \
shadow.h \
shooter.c \
widgets.c \
- widgets.h
+ widgets.h \
+ $(top_srcdir)/tests/gtkgears.c \
+ $(top_srcdir)/tests/gtkgears.h
clean-local:
for file in *.png; do \
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index ecd2399..dc455e2 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -8,6 +8,7 @@
#include <X11/Xatom.h>
#include <gdkx.h>
#include "widgets.h"
+#include "gtkgears.h"
#define SMALL_WIDTH 240
#define SMALL_HEIGHT 75
@@ -1480,6 +1481,24 @@ create_flow_box (void)
return info;
}
+static WidgetInfo *
+create_gl_area (void)
+{
+ WidgetInfo *info;
+ GtkWidget *widget;
+ GtkWidget *gears;
+
+ widget = gtk_frame_new (NULL);
+ gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN);
+
+ gears = gtk_gears_new ();
+ gtk_container_add (GTK_CONTAINER (widget), gears);
+
+ info = new_widget_info ("glarea", widget, MEDIUM);
+
+ return info;
+}
+
GList *
get_all_widgets (void)
{
@@ -1544,6 +1563,7 @@ get_all_widgets (void)
retval = g_list_prepend (retval, create_search_entry ());
retval = g_list_prepend (retval, create_level_bar ());
retval = g_list_prepend (retval, create_info_bar ());
+ retval = g_list_prepend (retval, create_gl_area ());
return retval;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]