Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unnecessary class definitions and variables

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-01-08 06:40:26 +00:00
parent 8945688a86
commit 8a724edb3d
1 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/gtk/dataview.cpp
View File

@@ -484,15 +484,11 @@ extern "C" {
#define GTK_TYPE_WX_TREE_MODEL (gtk_wx_tree_model_get_type ()) #define GTK_TYPE_WX_TREE_MODEL (gtk_wx_tree_model_get_type ())
#define GTK_WX_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModel)) #define GTK_WX_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModel))
#define GTK_WX_TREE_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModelClass))
#define GTK_IS_WX_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_TREE_MODEL)) #define GTK_IS_WX_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_TREE_MODEL))
#define GTK_IS_WX_TREE_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_TREE_MODEL)) #define GTK_IS_WX_TREE_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_TREE_MODEL))
#define GTK_WX_TREE_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_TREE_MODEL, GtkWxTreeModelClass))
GType gtk_wx_tree_model_get_type (void); GType gtk_wx_tree_model_get_type (void);
typedef struct _GtkWxTreeModelClass GtkWxTreeModelClass;
struct _GtkWxTreeModel struct _GtkWxTreeModel
{ {
GObject parent; GObject parent;
@@ -502,14 +498,8 @@ struct _GtkWxTreeModel
wxDataViewCtrlInternal *internal; wxDataViewCtrlInternal *internal;
}; };
struct _GtkWxTreeModelClass
{
GObjectClass list_parent_class;
};
static GtkWxTreeModel *wxgtk_tree_model_new (void); static GtkWxTreeModel *wxgtk_tree_model_new (void);
static void wxgtk_tree_model_init (GtkWxTreeModel *tree_model); static void wxgtk_tree_model_init (GtkWxTreeModel *tree_model);
static void wxgtk_tree_model_class_init (GtkWxTreeModelClass *klass);
static void wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface); static void wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface);
static void wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface); static void wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface);
@@ -579,9 +569,6 @@ static gboolean wxgtk_tree_model_row_drop_possible (GtkTreeDragDest *d
GtkTreePath *dest_path, GtkTreePath *dest_path,
GtkSelectionData *selection_data); GtkSelectionData *selection_data);
static GObjectClass *list_parent_class = NULL;
GType GType
gtk_wx_tree_model_get_type (void) gtk_wx_tree_model_get_type (void)
{ {
@@ -591,10 +578,10 @@ gtk_wx_tree_model_get_type (void)
{ {
const GTypeInfo tree_model_info = const GTypeInfo tree_model_info =
{ {
sizeof (GtkWxTreeModelClass), sizeof (GObjectClass),
NULL, /* base_init */ NULL, /* base_init */
NULL, /* base_finalize */ NULL, /* base_finalize */
(GClassInitFunc) wxgtk_tree_model_class_init, NULL,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkWxTreeModel), sizeof (GtkWxTreeModel),
@@ -657,12 +644,6 @@ wxgtk_tree_model_new(void)
return retval; return retval;
} }
static void
wxgtk_tree_model_class_init (GtkWxTreeModelClass *klass)
{
list_parent_class = (GObjectClass*) g_type_class_peek_parent (klass);
}
static void static void
wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface) wxgtk_tree_model_tree_model_init (GtkTreeModelIface *iface)
{ {
@@ -1056,15 +1037,12 @@ extern "C" {
#define GTK_TYPE_WX_CELL_RENDERER_TEXT (gtk_wx_cell_renderer_text_get_type ()) #define GTK_TYPE_WX_CELL_RENDERER_TEXT (gtk_wx_cell_renderer_text_get_type ())
#define GTK_WX_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT, GtkWxCellRendererText)) #define GTK_WX_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT, GtkWxCellRendererText))
#define GTK_WX_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_CELL_RENDERER_TEXT, GtkWxCellRendererTextClass))
#define GTK_IS_WX_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT)) #define GTK_IS_WX_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT))
#define GTK_IS_WX_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER_TEXT)) #define GTK_IS_WX_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER_TEXT))
#define GTK_WX_CELL_RENDERER_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_CELL_RENDERER_TEXT, GtkWxCellRendererTextClass))
GType gtk_wx_cell_renderer_text_get_type (void); GType gtk_wx_cell_renderer_text_get_type (void);
typedef struct _GtkWxCellRendererText GtkWxCellRendererText; typedef struct _GtkWxCellRendererText GtkWxCellRendererText;
typedef struct _GtkWxCellRendererTextClass GtkWxCellRendererTextClass;
struct _GtkWxCellRendererText struct _GtkWxCellRendererText
{ {
@@ -1073,17 +1051,11 @@ struct _GtkWxCellRendererText
wxDataViewRenderer *wx_renderer; wxDataViewRenderer *wx_renderer;
}; };
struct _GtkWxCellRendererTextClass
{
GtkCellRendererTextClass cell_parent_class;
};
static GtkWxCellRendererText *gtk_wx_cell_renderer_text_new (void); static GtkWxCellRendererText *gtk_wx_cell_renderer_text_new (void);
static void gtk_wx_cell_renderer_text_init ( static void gtk_wx_cell_renderer_text_init (
GtkWxCellRendererText *cell ); GtkWxCellRendererText *cell );
static void gtk_wx_cell_renderer_text_class_init( static void gtk_wx_cell_renderer_text_class_init(
GtkWxCellRendererTextClass *klass ); void* klass, void*);
static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing( static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing(
GtkCellRenderer *cell, GtkCellRenderer *cell,
GdkEvent *event, GdkEvent *event,
@@ -1107,10 +1079,10 @@ gtk_wx_cell_renderer_text_get_type (void)
{ {
const GTypeInfo cell_wx_info = const GTypeInfo cell_wx_info =
{ {
sizeof (GtkWxCellRendererTextClass), sizeof (GtkCellRendererTextClass),
NULL, /* base_init */ NULL, /* base_init */
NULL, /* base_finalize */ NULL, /* base_finalize */
(GClassInitFunc) gtk_wx_cell_renderer_text_class_init, gtk_wx_cell_renderer_text_class_init,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkWxCellRendererText), sizeof (GtkWxCellRendererText),
@@ -1132,7 +1104,7 @@ gtk_wx_cell_renderer_text_init (GtkWxCellRendererText *cell)
} }
static void static void
gtk_wx_cell_renderer_text_class_init (GtkWxCellRendererTextClass *klass) gtk_wx_cell_renderer_text_class_init(void* klass, void*)
{ {
GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass); GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass);
@@ -1186,15 +1158,12 @@ extern "C" {
#define GTK_TYPE_WX_CELL_RENDERER (gtk_wx_cell_renderer_get_type ()) #define GTK_TYPE_WX_CELL_RENDERER (gtk_wx_cell_renderer_get_type ())
#define GTK_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRenderer)) #define GTK_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRenderer))
#define GTK_WX_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRendererClass))
#define GTK_IS_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER)) #define GTK_IS_WX_CELL_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_RENDERER))
#define GTK_IS_WX_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER)) #define GTK_IS_WX_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_RENDERER))
#define GTK_WX_CELL_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WX_CELL_RENDERER, GtkWxCellRendererClass))
GType gtk_wx_cell_renderer_get_type (void); GType gtk_wx_cell_renderer_get_type (void);
typedef struct _GtkWxCellRenderer GtkWxCellRenderer; typedef struct _GtkWxCellRenderer GtkWxCellRenderer;
typedef struct _GtkWxCellRendererClass GtkWxCellRendererClass;
struct _GtkWxCellRenderer struct _GtkWxCellRenderer
{ {
@@ -1204,17 +1173,11 @@ struct _GtkWxCellRenderer
wxDataViewCustomRenderer *cell; wxDataViewCustomRenderer *cell;
}; };
struct _GtkWxCellRendererClass
{
GtkCellRendererClass cell_parent_class;
};
static GtkCellRenderer *gtk_wx_cell_renderer_new (void); static GtkCellRenderer *gtk_wx_cell_renderer_new (void);
static void gtk_wx_cell_renderer_init ( static void gtk_wx_cell_renderer_init (
GtkWxCellRenderer *cell ); GtkWxCellRenderer *cell );
static void gtk_wx_cell_renderer_class_init( static void gtk_wx_cell_renderer_class_init(
GtkWxCellRendererClass *klass ); void* klass, void*);
static void gtk_wx_cell_renderer_get_size ( static void gtk_wx_cell_renderer_get_size (
GtkCellRenderer *cell, GtkCellRenderer *cell,
GtkWidget *widget, GtkWidget *widget,
@@ -1248,9 +1211,6 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
GdkRectangle *cell_area, GdkRectangle *cell_area,
GtkCellRendererState flags ); GtkCellRendererState flags );
static GObjectClass *cell_parent_class = NULL;
} // extern "C" } // extern "C"
GType GType
@@ -1262,10 +1222,10 @@ gtk_wx_cell_renderer_get_type (void)
{ {
const GTypeInfo cell_wx_info = const GTypeInfo cell_wx_info =
{ {
sizeof (GtkWxCellRendererClass), sizeof (GtkCellRendererClass),
NULL, /* base_init */ NULL, /* base_init */
NULL, /* base_finalize */ NULL, /* base_finalize */
(GClassInitFunc) gtk_wx_cell_renderer_class_init, gtk_wx_cell_renderer_class_init,
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkWxCellRenderer), sizeof (GtkWxCellRenderer),
@@ -1287,12 +1247,10 @@ gtk_wx_cell_renderer_init (GtkWxCellRenderer *cell)
} }
static void static void
gtk_wx_cell_renderer_class_init (GtkWxCellRendererClass *klass) gtk_wx_cell_renderer_class_init(void* klass, void*)
{ {
GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass); GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass);
cell_parent_class = (GObjectClass*) g_type_class_peek_parent (klass);
cell_class->get_size = gtk_wx_cell_renderer_get_size; cell_class->get_size = gtk_wx_cell_renderer_get_size;
cell_class->render = gtk_wx_cell_renderer_render; cell_class->render = gtk_wx_cell_renderer_render;
cell_class->activate = gtk_wx_cell_renderer_activate; cell_class->activate = gtk_wx_cell_renderer_activate;