AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove GtkTable

Browse Source
This commit is contained in:
Timm Bäder 2016-10-13 15:55:00 +02:00 committed by Benjamin Otte
parent b082fb598d
commit d844abe066
10 changed files with 2 additions and 2155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demos/gtk-demo/main.c
View File

@ -293,7 +293,6 @@ static gchar *types[] =
"PangoMatrix ",
"PangoContext ",
"PangoLayout ",
"GtkTable ",
"GtkToggleButton ",
"GString ",
"GtkIconSize ",

34
docs/reference/gtk/gtk4-sections.txt
View File

@ -3259,40 +3259,6 @@ GtkLevelBarPrivate
gtk_level_bar_get_type
</SECTION>
<SECTION>
<FILE>gtktable</FILE>
<TITLE>GtkTable</TITLE>
GtkTable
gtk_table_new
gtk_table_resize
gtk_table_get_size
GtkAttachOptions
gtk_table_attach
gtk_table_attach_defaults
gtk_table_set_row_spacing
gtk_table_set_col_spacing
gtk_table_set_row_spacings
gtk_table_set_col_spacings
gtk_table_set_homogeneous
gtk_table_get_default_row_spacing
gtk_table_get_homogeneous
gtk_table_get_row_spacing
gtk_table_get_col_spacing
gtk_table_get_default_col_spacing
<SUBSECTION Standard>
GTK_TABLE
GTK_IS_TABLE
GTK_TYPE_TABLE
GTK_TABLE_CLASS
GTK_IS_TABLE_CLASS
GTK_TABLE_GET_CLASS
<SUBSECTION Private>
GtkTablePrivate
GtkTableChild
GtkTableRowCol
gtk_table_get_type
</SECTION>
<SECTION>
<FILE>gtktearoffmenuitem</FILE>
<TITLE>GtkTearoffMenuItem</TITLE>

2
gtk/deprecated/Makefile.inc
View File

@ -8,7 +8,6 @@ deprecated_h_sources = \
deprecated/gtkrecentaction.h \
deprecated/gtkstock.h \
deprecated/gtksymboliccolor.h \
deprecated/gtktable.h \
deprecated/gtktoggleaction.h \
deprecated/gtkuimanager.h
@ -26,6 +25,5 @@ deprecated_c_sources = \
deprecated/gtkrecentaction.c \
deprecated/gtkstock.c \
deprecated/gtksymboliccolor.c \
deprecated/gtktable.c \
deprecated/gtktoggleaction.c \
deprecated/gtkuimanager.c

1932
gtk/deprecated/gtktable.c
View File

File diff suppressed because it is too large Load Diff

180
gtk/deprecated/gtktable.h
View File

@ -1,180 +0,0 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* 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, see <http://www.gnu.org/licenses/>.
*/
/*
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_TABLE_H__
#define __GTK_TABLE_H__
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#include <gtk/gtkcontainer.h>
G_BEGIN_DECLS
#define GTK_TYPE_TABLE (gtk_table_get_type ())
#define GTK_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TABLE, GtkTable))
#define GTK_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TABLE, GtkTableClass))
#define GTK_IS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TABLE))
#define GTK_IS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TABLE))
#define GTK_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TABLE, GtkTableClass))
typedef struct _GtkTable GtkTable;
typedef struct _GtkTablePrivate GtkTablePrivate;
typedef struct _GtkTableClass GtkTableClass;
typedef struct _GtkTableChild GtkTableChild;
typedef struct _GtkTableRowCol GtkTableRowCol;
struct _GtkTable
{
GtkContainer container;
/*< private >*/
GtkTablePrivate *priv;
};
struct _GtkTableClass
{
GtkContainerClass parent_class;
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
};
struct _GtkTableChild
{
GtkWidget *widget;
guint16 left_attach;
guint16 right_attach;
guint16 top_attach;
guint16 bottom_attach;
guint16 xpadding;
guint16 ypadding;
guint xexpand : 1;
guint yexpand : 1;
guint xshrink : 1;
guint yshrink : 1;
guint xfill : 1;
guint yfill : 1;
};
struct _GtkTableRowCol
{
guint16 requisition;
guint16 allocation;
guint16 spacing;
guint need_expand : 1;
guint need_shrink : 1;
guint expand : 1;
guint shrink : 1;
guint empty : 1;
};
/**
* GtkAttachOptions:
* @GTK_EXPAND: the widget should expand to take up any extra space in its
* container that has been allocated.
* @GTK_SHRINK: the widget should shrink as and when possible.
* @GTK_FILL: the widget should fill the space allocated to it.
*
* Denotes the expansion properties that a widget will have when it (or its
* parent) is resized.
*/
typedef enum
{
GTK_EXPAND = 1 << 0,
GTK_SHRINK = 1 << 1,
GTK_FILL = 1 << 2
} GtkAttachOptions;
GDK_DEPRECATED_IN_3_4
GType gtk_table_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
GtkWidget* gtk_table_new (guint rows,
guint columns,
gboolean homogeneous);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_resize (GtkTable *table,
guint rows,
guint columns);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_attach (GtkTable *table,
GtkWidget *child,
guint left_attach,
guint right_attach,
guint top_attach,
guint bottom_attach,
GtkAttachOptions xoptions,
GtkAttachOptions yoptions,
guint xpadding,
guint ypadding);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_attach_defaults (GtkTable *table,
GtkWidget *widget,
guint left_attach,
guint right_attach,
guint top_attach,
guint bottom_attach);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_set_row_spacing (GtkTable *table,
guint row,
guint spacing);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
guint gtk_table_get_row_spacing (GtkTable *table,
guint row);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_set_col_spacing (GtkTable *table,
guint column,
guint spacing);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
guint gtk_table_get_col_spacing (GtkTable *table,
guint column);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_set_row_spacings (GtkTable *table,
guint spacing);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
guint gtk_table_get_default_row_spacing (GtkTable *table);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_set_col_spacings (GtkTable *table,
guint spacing);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
guint gtk_table_get_default_col_spacing (GtkTable *table);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_set_homogeneous (GtkTable *table,
gboolean homogeneous);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
gboolean gtk_table_get_homogeneous (GtkTable *table);
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_get_size (GtkTable *table,
guint *rows,
guint *columns);
G_END_DECLS
#endif /* __GTK_TABLE_H__ */

1
gtk/gtk.h
View File

@ -253,7 +253,6 @@
#include <gtk/deprecated/gtkrecentaction.h>
#include <gtk/deprecated/gtkstock.h>
#include <gtk/deprecated/gtksymboliccolor.h>
#include <gtk/deprecated/gtktable.h>
#include <gtk/deprecated/gtktoggleaction.h>
#include <gtk/deprecated/gtkuimanager.h>
#endif /* GTK_DISABLE_DEPRECATED */

4
gtk/gtkgrid.c
View File

@ -36,10 +36,10 @@
* SECTION:gtkgrid
* @Short_description: Pack widgets in a rows and columns
* @Title: GtkGrid
* @See_also: #GtkTable, #GtkVBox
* @See_also: #GtkBox
*
* GtkGrid is a container which arranges its child widgets in
* rows and columns. It is a very similar to #GtkTable and #GtkBox,
* rows and columns. It is a very similar to #GtkBox,
* but it consistently uses #GtkWidget’s #GtkWidget:margin and #GtkWidget:expand
* properties instead of custom child properties, and it fully supports
* [height-for-width geometry management][geometry-management].

1
testsuite/a11y/children.c
View File

@ -253,7 +253,6 @@ main (int argc, char *argv[])
add_child_tests (gtk_assistant_new ());
add_child_tests (gtk_frame_new ("frame"));
add_child_tests (gtk_expander_new ("expander"));
add_child_tests (gtk_table_new (2, 2, FALSE));
add_child_tests (gtk_text_view_new ());
add_child_tests (gtk_tree_view_new ());
#if 0

1
testsuite/gtk/builder.c
View File

@ -741,7 +741,6 @@ test_types (void)
" <object class=\"GtkToolbar\" id=\"toolbar\"/>"
" <object class=\"GtkTreeStore\" id=\"treestore\"/>"
" <object class=\"GtkTreeView\" id=\"treeview\"/>"
" <object class=\"GtkTable\" id=\"table\"/>"
" <object class=\"GtkViewport\" id=\"viewport\"/>"
" <object class=\"GtkWindow\" id=\"window\"/>"
" <object class=\"GtkUIManager\" id=\"uimanager\"/>"

1
testsuite/gtk/notify.c
View File

@ -375,7 +375,6 @@ test_type (gconstpointer data)
g_str_equal (g_type_name (type), "GtkNumerableIcon") ||
g_str_equal (g_type_name (type), "GtkRadioAction") ||
g_str_equal (g_type_name (type), "GtkToggleAction") ||
g_str_equal (g_type_name (type), "GtkTable") ||
g_str_equal (g_type_name (type), "GtkUIManager") ||
g_str_equal (g_type_name (type), "GtkImageMenuItem"))
return;