diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-10-22 00:55:39 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-10-22 01:13:00 -0400 |
| commit | 247f2c91926e6d090554aac1d0092f044aece790 (patch) | |
| tree | 56efb3a69e5e45eed3eefa1f860ea31df24625e3 /docs | |
| parent | fc13ff501d7bd02031fcb26562572b8a31b0764d (diff) | |
| download | gtk+-247f2c91926e6d090554aac1d0092f044aece790.tar.gz | |
Add GtkGLArea to the widget gallery
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/gtk/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/reference/gtk/images/glarea.png | bin | 0 -> 5338 bytes | |||
| -rw-r--r-- | docs/reference/gtk/visual_index.xml | 3 | ||||
| -rw-r--r-- | docs/tools/Makefile.am | 5 | ||||
| -rw-r--r-- | 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 b27ad71f64..f1b067d1b5 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 Binary files differnew file mode 100644 index 0000000000..e90ee6ea7e --- /dev/null +++ b/docs/reference/gtk/images/glarea.png diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml index b9e143006d..6e58e5397c 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 e3b2966bad..31982aec39 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 ecd2399e28..dc455e241b 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; } |
