diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gen-paper-names.c | 6 | ||||
| -rw-r--r-- | gtk/gtk.symbols | 12 | ||||
| -rw-r--r-- | gtk/gtkscalebutton.c | 8 | ||||
| -rw-r--r-- | gtk/gtktooltip.c | 6 | ||||
| -rw-r--r-- | gtk/gtktooltip.h | 6 | ||||
| -rw-r--r-- | gtk/gtkvolumebutton.c | 9 | ||||
| -rw-r--r-- | gtk/paper_names_offsets.c | 6 |
7 files changed, 37 insertions, 16 deletions
diff --git a/gtk/gen-paper-names.c b/gtk/gen-paper-names.c index 1bd47fe77f..c3e9c910c6 100644 --- a/gtk/gen-paper-names.c +++ b/gtk/gen-paper-names.c @@ -188,7 +188,7 @@ main (int argc, char *argv[]) printf ("#endif\n\n"); /* write strings */ - printf ("const char paper_names[] ="); + printf ("static const char paper_names[] ="); for (i = 0; i < n_names; i++) { if (names[i].suffix == -1) @@ -204,7 +204,7 @@ main (int argc, char *argv[]) " int display_name;\n" " int ppd_name;\n" "} PaperInfo;\n\n" - "const PaperInfo standard_names_offsets[] = {\n"); + "static const PaperInfo standard_names_offsets[] = {\n"); for (i = 0; i < n_infos; i++) { @@ -224,7 +224,7 @@ main (int argc, char *argv[]) /* dump extras */ - printf ("const struct {\n" + printf ("static const struct {\n" " int ppd_name;\n" " int standard_name;\n" "} extra_ppd_names_offsets[] = {\n"); diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 1d398d2ed1..9f7e02fe15 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -33,7 +33,12 @@ gtk_about_dialog_get_documenters gtk_about_dialog_get_license gtk_about_dialog_get_logo gtk_about_dialog_get_logo_icon_name +#ifndef GTK_DISABLE_DEPRECATED gtk_about_dialog_get_name +gtk_about_dialog_set_name +#endif +gtk_about_dialog_get_program_name +gtk_about_dialog_set_program_name gtk_about_dialog_get_translator_credits gtk_about_dialog_get_type G_GNUC_CONST gtk_about_dialog_get_version @@ -50,7 +55,6 @@ gtk_about_dialog_set_email_hook gtk_about_dialog_set_license gtk_about_dialog_set_logo gtk_about_dialog_set_logo_icon_name -gtk_about_dialog_set_name gtk_about_dialog_set_translator_credits gtk_about_dialog_set_url_hook gtk_about_dialog_set_version @@ -140,6 +144,7 @@ gtk_action_connect_proxy gtk_action_create_icon gtk_action_create_menu_item gtk_action_create_tool_item +gtk_action_create_menu gtk_action_disconnect_accelerator gtk_action_disconnect_proxy gtk_action_get_accel_closure @@ -259,6 +264,7 @@ gtk_corner_type_get_type G_GNUC_CONST gtk_debug_flag_get_type G_GNUC_CONST gtk_delete_type_get_type G_GNUC_CONST gtk_dest_defaults_get_type G_GNUC_CONST +gtk_drag_result_get_type G_GNUC_CONST gtk_clist_drag_pos_get_type G_GNUC_CONST gtk_dialog_flags_get_type G_GNUC_CONST gtk_direction_type_get_type G_GNUC_CONST @@ -1222,7 +1228,9 @@ gtk_entry_completion_complete gtk_entry_completion_delete_action gtk_entry_completion_get_entry gtk_entry_completion_get_inline_completion +gtk_entry_completion_get_inline_selection gtk_entry_completion_get_minimum_key_length +gtk_entry_completion_get_completion_prefix gtk_entry_completion_get_model gtk_entry_completion_get_popup_completion gtk_entry_completion_get_popup_set_width @@ -1234,6 +1242,7 @@ gtk_entry_completion_insert_action_text gtk_entry_completion_insert_prefix gtk_entry_completion_new gtk_entry_completion_set_inline_completion +gtk_entry_completion_set_inline_selection gtk_entry_completion_set_match_func gtk_entry_completion_set_minimum_key_length gtk_entry_completion_set_model @@ -4742,6 +4751,7 @@ gtk_window_set_default_size gtk_window_set_destroy_with_parent gtk_window_set_focus gtk_window_set_focus_on_map +gtk_window_set_startup_id gtk_window_set_frame_dimensions gtk_window_set_geometry_hints gtk_window_set_gravity diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c index 1ac3db438e..822913e1a1 100644 --- a/gtk/gtkscalebutton.c +++ b/gtk/gtkscalebutton.c @@ -56,6 +56,8 @@ #include <gdk/gdkkeysyms.h> #include "gtkscalebutton.h" +#include "gtkalias.h" + #define SCALE_SIZE 100 #define CLICK_TIMEOUT 250 @@ -1241,6 +1243,6 @@ gtk_scale_button_scale_value_changed (GtkRange *range) g_object_notify (G_OBJECT (button), "value"); } -/* - * vim: sw=2 ts=8 cindent noai bs=2 - */ + +#define __GTK_SCALE_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index 15dfce9e3e..bfcf7436bf 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -29,6 +29,8 @@ #include "gtkhbox.h" #include "gtkalignment.h" +#include "gtkalias.h" + #include <string.h> @@ -1065,3 +1067,7 @@ _gtk_tooltip_handle_event (GdkEvent *event) break; } } + + +#define __GTK_TOOLTIP_C__ +#include "gtkaliasdef.c" diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h index 69b53e7670..fe45ac171b 100644 --- a/gtk/gtktooltip.h +++ b/gtk/gtktooltip.h @@ -19,8 +19,8 @@ * Boston, MA 02111-1307, USA. */ -#ifndef __GTK_TOOLTIP__ -#define __GTK_TOOLTIP__ +#ifndef __GTK_TOOLTIP_H__ +#define __GTK_TOOLTIP_H__ #include "gtkwidget.h" #include "gtkwindow.h" @@ -52,4 +52,4 @@ void _gtk_tooltip_hide (GtkWidget *widget); G_END_DECLS -#endif /* __GTK_TOOLTIP__ */ +#endif /* __GTK_TOOLTIP_H__ */ diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c index d913997179..52bc9aebb5 100644 --- a/gtk/gtkvolumebutton.c +++ b/gtk/gtkvolumebutton.c @@ -36,6 +36,9 @@ #include "gtktooltips.h" #include "gtkstock.h" +#include "gtkalias.h" + + struct _GtkVolumeButton { GtkScaleButton parent; @@ -171,6 +174,6 @@ cb_value_changed (GtkVolumeButton *button, gdouble value, gpointer user_data) gtk_volume_button_update_tooltip (button); } -/* - * vim: sw=2 ts=8 cindent noai bs=2 - */ + +#define __GTK_VOLUME_BUTTON_C__ +#include "gtkaliasdef.c" diff --git a/gtk/paper_names_offsets.c b/gtk/paper_names_offsets.c index 2d213ddff6..c640c8c888 100644 --- a/gtk/paper_names_offsets.c +++ b/gtk/paper_names_offsets.c @@ -331,7 +331,7 @@ N_("paper size|ROC 16k") N_("paper size|ROC 8k") #endif -const char paper_names[] = +static const char paper_names[] = "asme_f\0" "iso_2a0\0" "A0x2\0" @@ -695,7 +695,7 @@ typedef struct { int ppd_name; } PaperInfo; -const PaperInfo standard_names_offsets[] = { +static const PaperInfo standard_names_offsets[] = { { 0, 711.2, 1016, 0, -1 }, { 7, 1189, 1682, 15, -1 }, { 20, 841, 1189, 918, 918 }, @@ -862,7 +862,7 @@ const PaperInfo standard_names_offsets[] = { { 3138, 273.05, 393.7, 3145, -1 }, }; -const struct { +static const struct { int ppd_name; int standard_name; } extra_ppd_names_offsets[] = { |