[gtk+] Removed all traces of GtkWrapBox from GTK+.
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Removed all traces of GtkWrapBox from GTK+.
- Date: Wed, 13 Oct 2010 13:22:53 +0000 (UTC)
commit e3cc39cb9813de101d35611e761ccc1571a3267c
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Wed Oct 13 22:26:08 2010 +0900
Removed all traces of GtkWrapBox from GTK+.
docs/reference/gtk/gtk-docs.sgml | 1 -
gtk/Makefile.am | 4 +-
gtk/gtk.h | 1 -
gtk/gtk.symbols | 27 -
gtk/gtkenums.h | 54 -
gtk/gtkwrapbox.c | 2636 --------------------------------------
gtk/gtkwrapbox.h | 102 --
tests/Makefile.am | 8 +-
tests/testwrapbox.c | 496 -------
9 files changed, 2 insertions(+), 3327 deletions(-)
---
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 9007dd1..f5497d9 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -305,7 +305,6 @@ that is, GUI components such as GtkButton or GtkTextView.
<xi:include href="xml/gtkbbox.xml" />
<xi:include href="xml/gtkhbbox.xml" />
<xi:include href="xml/gtkvbbox.xml" />
- <xi:include href="xml/gtkwrapbox.xml" />
<xi:include href="xml/gtkfixed.xml" />
<xi:include href="xml/gtkpaned.xml" />
<xi:include href="xml/gtkhpaned.xml" />
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 848d20f..8ee9701 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -332,8 +332,7 @@ gtk_public_h_sources = \
gtkvscrollbar.h \
gtkvseparator.h \
gtkwidget.h \
- gtkwindow.h \
- gtkwrapbox.h
+ gtkwindow.h
if OS_UNIX
gtk_unix_print_public_h_sources = \
@@ -615,7 +614,6 @@ gtk_base_c_sources = \
gtkwidget.c \
gtkwindow-decorate.c \
gtkwindow.c \
- gtkwrapbox.c \
$(gtk_clipboard_dnd_c_sources)
gtk_c_sources = $(gtk_base_c_sources)
diff --git a/gtk/gtk.h b/gtk/gtk.h
index f970cb3..1527512 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -215,7 +215,6 @@
#include <gtk/gtkvseparator.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkwindow.h>
-#include <gtk/gtkwrapbox.h>
#undef __GTK_H_INSIDE__
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 010f32c..08d13d1 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -4475,33 +4475,6 @@ gtk_window_unstick
#endif
-#if IN_HEADER(__GTK_WRAP_BOX_H__)
-#if IN_FILE(__GTK_WRAP_BOX_C__)
-gtk_wrap_allocation_mode_get_type
-gtk_wrap_box_get_allocation_mode
-gtk_wrap_box_get_horizontal_spacing
-gtk_wrap_box_get_minimum_line_children
-gtk_wrap_box_get_natural_line_children
-gtk_wrap_box_get_horizontal_spreading
-gtk_wrap_box_get_vertical_spreading
-gtk_wrap_box_get_type G_GNUC_CONST
-gtk_wrap_box_get_vertical_spacing
-gtk_wrap_box_insert_child
-gtk_wrap_box_new
-gtk_wrap_box_packing_get_type
-gtk_wrap_box_reorder_child
-gtk_wrap_box_set_allocation_mode
-gtk_wrap_box_set_horizontal_spacing
-gtk_wrap_box_set_minimum_line_children
-gtk_wrap_box_set_natural_line_children
-gtk_wrap_box_set_horizontal_spreading
-gtk_wrap_box_set_vertical_spreading
-gtk_wrap_box_set_vertical_spacing
-gtk_wrap_box_spreading_get_type
-#endif
-#endif
-
-
#if IN_HEADER(__GTK_WIN32_EMBED_WIDGET_H__)
#if IN_FILE(__GTK_WIN32_EMBED_WIDGET_C__)
#ifdef G_OS_WIN32
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 98cd0a5..515881e 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -541,60 +541,6 @@ typedef enum
GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT
} GtkSizeRequestMode;
-
-/**
- * GtkWrapAllocationMode:
- * @GTK_WRAP_ALLOCATE_FREE: Items wrap freely in the box's orientation
- * @GTK_WRAP_ALLOCATE_ALIGNED: Items are aligned into rows and columns
- * @GTK_WRAP_ALLOCATE_HOMOGENEOUS: Items are all allocated the same size
- *
- * Describes how an #GtkWrapBox positions its children.
- */
-typedef enum {
- GTK_WRAP_ALLOCATE_FREE = 0,
- GTK_WRAP_ALLOCATE_ALIGNED,
- GTK_WRAP_ALLOCATE_HOMOGENEOUS
-} GtkWrapAllocationMode;
-
-/**
- * GtkWrapBoxSpreading:
- * @GTK_WRAP_BOX_SPREAD_START: Children are allocated no more than their natural size
- * in the given orientation and any extra space is left trailing at
- * the end of each row/column.
- * @GTK_WRAP_BOX_SPREAD_END: Children are allocated no more than their natural size
- * in the given orientation and any extra space skipped at the beginning
- * of each row/column.
- * @GTK_WRAP_BOX_SPREAD_EVEN: Children are allocated no more than their natural size
- * in the given orientation and any extra space is evenly distributed
- * as empty space between children.
- * @GTK_WRAP_BOX_SPREAD_EXPAND: Extra space is given to children which asked to expand in the given
- * orientation (or columns/rows which contain children who asked to expand).
- * If no children asked to expand; extra space is distributed evenly.
- *
- * Describes how a #GtkWrapBox deals with extra space in a given orientation when allocating children.
- */
-typedef enum {
- GTK_WRAP_BOX_SPREAD_START = 0,
- GTK_WRAP_BOX_SPREAD_END,
- GTK_WRAP_BOX_SPREAD_EVEN,
- GTK_WRAP_BOX_SPREAD_EXPAND
-} GtkWrapBoxSpreading;
-
-/**
- * GtkWrapBoxPacking:
- * @GTK_WRAP_BOX_H_EXPAND: Whether the child expands horizontally.
- * @GTK_WRAP_BOX_V_EXPAND: Whether the child expands vertically.
- *
- * Specifies how widgets will expand vertically and
- * horizontally when placed inside a #GtkWrapBox.
- */
-typedef enum
-{
- GTK_WRAP_BOX_H_EXPAND = 1 << 0,
- GTK_WRAP_BOX_V_EXPAND = 1 << 1
-} GtkWrapBoxPacking;
-
-
G_END_DECLS
#endif /* __GTK_ENUMS_H__ */
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b607ad5..2b58458 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -91,8 +91,7 @@ noinst_PROGRAMS = $(TEST_PROGS) \
testgrouping \
testtooltips \
testexpander \
- testvolumebutton \
- testwrapbox
+ testvolumebutton
if USE_X11
noinst_PROGRAMS += testapplication testerrors
@@ -176,7 +175,6 @@ testactions_DEPENDENCIES = $(TEST_DEPS)
testgrouping_DEPENDENCIES = $(TEST_DEPS)
testtooltips_DEPENDENCIES = $(TEST_DEPS)
testvolumebutton_DEPENDENCIES = $(TEST_DEPS)
-testwrapbox_DEPENDENCIES = $(TEST_DEPS)
testwindows_DEPENDENCIES = $(TEST_DEPS)
testexpander_DEPENDENCIES = $(TEST_DEPS)
@@ -248,7 +246,6 @@ testactions_LDADD = $(LDADDS)
testgrouping_LDADD = $(LDADDS)
testtooltips_LDADD = $(LDADDS)
testvolumebutton_LDADD = $(LDADDS)
-testwrapbox_LDADD = $(LDADDS)
testwindows_LDADD = $(LDADDS)
testexpander_LDADD = $(LDADDS)
@@ -351,9 +348,6 @@ testrecentchoosermenu_SOURCES = \
testvolumebutton_SOURCES = \
testvolumebutton.c
-testwrapbox_SOURCES = \
- testwrapbox.c
-
testoffscreen_SOURCES = \
gtkoffscreenbox.c \
gtkoffscreenbox.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]