X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/3350ea746618d70db640bc3ce1032e2e3cc1f339..960aa85cfb98deaa705ab656ab59a5aeef30e5c4:/gtk/alien/glue.c diff --git a/gtk/alien/glue.c b/gtk/alien/glue.c index 6cd334c..31ee242 100644 --- a/gtk/alien/glue.c +++ b/gtk/alien/glue.c @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: glue.c,v 1.1 2004-10-31 12:14:47 espen Exp $ */ +/* $Id: glue.c,v 1.7 2005-01-06 21:54:19 espen Exp $ */ #include @@ -37,33 +37,6 @@ gtk_query_version (guint *major, guint *minor, guint *micro) } -void gtk_callback_marshal (GtkWidget *widget, gpointer data) -{ - GValue arg; - - memset (&arg, 0, sizeof (GValue)); - g_value_init (&arg, gtk_widget_get_type ()); - g_value_set_object (&arg, widget); - callback_marshal ((guint)data, NULL, 1, &arg); -} - -void gtk_menu_position_callback_marshal (GtkMenu *menu, gint x, gint y, - gboolean push_in, gpointer data) -{ - GValue args[3]; - - memset (args, 0, 3 * sizeof (GValue)); - g_value_init (&args[0], G_TYPE_INT); - g_value_set_int (&args[0], x); - g_value_init (&args[1], G_TYPE_INT); - g_value_set_int (&args[1], y); - g_value_init (&args[2], G_TYPE_BOOLEAN); - g_value_set_boolean (&args[2], push_in); - - callback_marshal ((guint)data, NULL, 3, args); -} - - /* Widget */ GdkWindow* @@ -100,6 +73,12 @@ gtk_container_get_focus_child (GtkContainer *container) return container->focus_child; } +gboolean +gtk_container_get_reallocate_redraws (GtkContainer *container) +{ + return container->reallocate_redraws; +} + /* Dialog */ @@ -117,22 +96,6 @@ gtk_dialog_get_action_area (GtkDialog *dialog) -/* Check menu item */ - -gboolean -gtk_check_menu_item_get_active (GtkCheckMenuItem* check_menu_item) -{ - return check_menu_item->active; -} - -gboolean -gtk_check_menu_item_get_show_toggle (GtkCheckMenuItem* check_menu_item) -{ - return check_menu_item->always_show_toggle; -} - - - /* Window */ GtkWidget* @@ -141,110 +104,40 @@ gtk_window_get_default (GtkWindow *window) return window->default_widget; } - -/* File selection */ - -GtkWidget* -gtk_file_selection_get_action_area (GtkFileSelection *filesel) -{ - return filesel->action_area; -} - -GtkWidget* -gtk_file_selection_get_ok_button (GtkFileSelection *filesel) +GtkWindowGroup* +gtk_window_get_group (GtkWindow *window) { - return filesel->ok_button; + return window->group; } -GtkWidget* -gtk_file_selection_get_cancel_button (GtkFileSelection *filesel) -{ - return filesel->cancel_button; -} -/* Color selection */ +/* Menu */ -gtk_color_selection_set_color_by_values (GtkColorSelection *colorsel, - gdouble red, - gdouble green, - gdouble blue, - gdouble opacity) +GdkScreen* +gtk_menu_get_screen (GtkMenu *menu) { - gdouble color[4]; - - color[0] = red; - color[1] = green; - color[2] = blue; - color[3] = opacity; - - gtk_color_selection_set_color (colorsel, color); + return (GdkScreen*)g_object_get_data (G_OBJECT (menu), "gtk-menu-explicit-screen"); } -void -gtk_color_selection_get_color_as_values (GtkColorSelection *colorsel, - gdouble *red, - gdouble *green, - gdouble *blue, - gdouble *opacity) -{ - gdouble color[4]; - - gtk_color_selection_get_color (colorsel, color); - - *red = color[0]; - *green = color[1]; - *blue = color[2]; - *opacity = color[3]; -} - - -/* Combo */ - -GtkWidget* -gtk_combo_get_entry (GtkCombo *combo) -{ - return combo->entry; -} -gboolean -gtk_combo_get_use_arrows (GtkCombo *combo) -{ - return combo->use_arrows; -} -gboolean -gtk_combo_get_use_arrows_always (GtkCombo *combo) -{ - return combo->use_arrows_always; -} +/* Toolbar */ -gboolean -gtk_combo_get_case_sensitive (GtkCombo *combo) +GtkTooltips* +gtk_toolbar_get_tooltips_object (GtkToolbar *toolbar) { - return combo->case_sensitive; + return toolbar->tooltips; } -/* Paned */ - -GtkWidget* -gtk_paned_child1 (GtkPaned *paned, guint *resize, guint *shrink) -{ - *resize = paned->child1_resize; - *shrink = paned->child1_shrink; - - return paned->child1; -} +/* Tooltips */ -GtkWidget* -gtk_paned_child2 (GtkPaned *paned, guint *resize, guint *shrink) +gint +gtk_tooltips_get_enabled (GtkTooltips *tooltips) { - *resize = paned->child2_resize; - *shrink = paned->child2_shrink; - - return paned->child2; + return tooltips->enabled; } @@ -257,62 +150,6 @@ gtk_layout_get_bin_window (GtkLayout *layout) } -/* List */ - -GList* -gtk_list_selection (GtkList *list) -{ - return list->selection; -} - - - -/* Toolbar */ - -gint -gtk_toolbar_get_tooltips (GtkToolbar *toolbar) -{ - return toolbar->tooltips->enabled; -} - - -/* Drawing area */ - -void -gtk_drawing_area_get_size (GtkDrawingArea *darea, gint *width, gint *height) -{ - GtkWidget *widget; - - widget = GTK_WIDGET (darea); - *width = widget->allocation.width; - *height = widget->allocation.height; -} - - -/* Progress */ - -gchar* -gtk_progress_get_format_string (GtkProgress *progress) -{ - return progress->format; -} - -GtkAdjustment* -gtk_progress_get_adjustment (GtkProgress *progress) -{ - return progress->adjustment; -} - - -/* Tooltips */ - -gboolean -gtk_tooltips_get_enabled (GtkTooltips *tooltips) -{ - return tooltips->enabled; -} - - /* GtkStyle accessor functions */ typedef enum { @@ -323,6 +160,7 @@ typedef enum { GTK_COLOR_MID, GTK_COLOR_TEXT, GTK_COLOR_BASE, + GTK_COLOR_TEXT_AA, GTK_COLOR_WHITE, GTK_COLOR_BLACK } GtkColorType; @@ -351,11 +189,13 @@ gtk_style_get_color (GtkStyle *style, GtkColorType color_type, return &style->text[state]; case GTK_COLOR_BASE: return &style->base[state]; + case GTK_COLOR_TEXT_AA: + return &style->text_aa[state]; } } -GdkColor* +void gtk_style_set_color (GtkStyle *style, GtkColorType color_type, GtkStateType state, GdkColor *color) { @@ -379,26 +219,12 @@ gtk_style_set_color (GtkStyle *style, GtkColorType color_type, style->text[state] = *color; break; case GTK_COLOR_BASE: style->base[state] = *color; break; + case GTK_COLOR_TEXT_AA: + style->text_aa[state] = *color; break; } - - return gtk_style_get_color (style, color_type, state); -} - -/* -GdkFont* -gtk_style_get_font (GtkStyle *style) -{ - return style->font; } -GdkFont* -gtk_style_set_font (GtkStyle *style, GdkFont *font) -{ - return style->font = font; -} -*/ - GdkGC* gtk_style_get_gc (GtkStyle *style, GtkColorType color_type, GtkStateType state) { @@ -422,5 +248,16 @@ gtk_style_get_gc (GtkStyle *style, GtkColorType color_type, GtkStateType state) return style->text_gc[state]; case GTK_COLOR_BASE: return style->base_gc[state]; + case GTK_COLOR_TEXT_AA: + return style->text_aa_gc[state]; } } + +int +gtk_style_font_desc_offset () +{ + GtkStyle style; + + return (int)&style.font_desc - (int)&style; +} +