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

Remove unnecessary size members from GtkPizzaChild.

Browse Source 
Move some declarations out of header.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-10-20 05:47:15 +00:00
parent 9c08a8165c
commit 91641d0443
2 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/gtk/win_gtk.h
View File

@@ -22,18 +22,7 @@ extern "C" {
#define GTK_PIZZA(obj) GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza) #define GTK_PIZZA(obj) GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza)
#define GTK_IS_PIZZA(obj) GTK_CHECK_TYPE (obj, gtk_pizza_get_type ()) #define GTK_IS_PIZZA(obj) GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())
typedef struct _GtkPizzaChild GtkPizzaChild;
typedef struct _GtkPizza GtkPizza; typedef struct _GtkPizza GtkPizza;
typedef struct _GtkPizzaClass GtkPizzaClass;
struct _GtkPizzaChild
{
GtkWidget *widget;
gint x;
gint y;
gint width;
gint height;
};
struct _GtkPizza struct _GtkPizza
{ {
@@ -46,15 +35,6 @@ struct _GtkPizza
GdkWindow *bin_window; GdkWindow *bin_window;
}; };
struct _GtkPizzaClass
{
GtkContainerClass parent_class;
void (*set_scroll_adjustments) (GtkPizza *pizza,
GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment);
};
WXDLLIMPEXP_CORE WXDLLIMPEXP_CORE
GtkType gtk_pizza_get_type (void); GtkType gtk_pizza_get_type (void);
WXDLLIMPEXP_CORE WXDLLIMPEXP_CORE

29
src/gtk/win_gtk.c
View File

@@ -20,8 +20,26 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
typedef struct _GtkPizzaChild GtkPizzaChild;
typedef struct _GtkPizzaClass GtkPizzaClass;
typedef struct _GtkPizzaAdjData GtkPizzaAdjData; typedef struct _GtkPizzaAdjData GtkPizzaAdjData;
struct _GtkPizzaClass
{
GtkContainerClass parent_class;
void (*set_scroll_adjustments) (GtkPizza *pizza,
GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment);
};
struct _GtkPizzaChild
{
GtkWidget *widget;
gint x;
gint y;
};
struct _GtkPizzaAdjData struct _GtkPizzaAdjData
{ {
gint dx; gint dx;
@@ -276,8 +294,6 @@ gtk_pizza_put (GtkPizza *pizza,
child_info->widget = widget; child_info->widget = widget;
child_info->x = x; child_info->x = x;
child_info->y = y; child_info->y = y;
child_info->width = width;
child_info->height = height;
pizza->children = g_list_append (pizza->children, child_info); pizza->children = g_list_append (pizza->children, child_info);
@@ -324,16 +340,9 @@ gtk_pizza_set_size (GtkPizza *pizza,
if (child->widget == widget) if (child->widget == widget)
{ {
if ((child->x == x) &&
(child->y == y) &&
(child->width == width) &&
(child->height == height)) return;
child->x = x; child->x = x;
child->y = y; child->y = y;
child->width = width;
child->height = height;
gtk_widget_set_size_request (widget, width, height); gtk_widget_set_size_request (widget, width, height);
return; return;