Mercurial > emacs
comparison src/config.in @ 109067:b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
* configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY,
check for gtk_file_chooser_dialog_new, and HAVE_GTK_FILE_BOTH (implied
by minimum required Gtk+ 2.6). Add checks for functions introduced
in Gtk+ 2.14 or newer.
* xterm.h (gtk_widget_get_window, gtk_widget_get_mapped)
(gtk_adjustment_get_page_size, gtk_adjustment_get_upper): New
defines based on what configure finds.
* xterm.c (XTflash): Use gtk_widget_get_window.
(xg_scroll_callback): Use gtk_adjustment_get_upper and
gtk_adjustment_get_page_size.
(handle_one_xevent): Use gtk_widget_get_mapped.
(x_term_init): Remove HAVE_GTK_MULTIDISPLAY and associated error
messages.
* xmenu.c (create_and_show_popup_menu): Call gtk_widget_get_mapped.
* gtkutil.h: Replace HAVE_GTK_FILE_BOTH with
HAVE_GTK_FILE_SELECTION_NEW.
* gtkutil.c (xg_display_open, xg_display_close): Remove
HAVE_GTK_MULTIDISPLAY, it is always defined.
(xg_display_open): Return type is void.
(gtk_widget_set_has_window)
(gtk_dialog_get_action_area, gtk_dialog_get_content_area)
(gtk_widget_get_sensitive, gtk_adjustment_set_page_size)
(gtk_adjustment_set_page_increment)
(gtk_adjustment_get_step_increment): #define these if not found
by configure.
(remove_submenu): New define based on Gtk+ version.
(xg_set_cursor, xg_frame_resized, xg_event_is_for_scrollbar): Use
gtk_widget_get_window.
(xg_frame_resized, xg_update_frame_menubar): Use gtk_widget_get_mapped.
(xg_create_frame_widgets): Use gtk_widget_set_has_window.
(create_dialog): Use gtk_dialog_get_action_area and
gtk_dialog_get_content_area.
(xg_uses_old_file_dialog, xg_get_file_name): Remove HAVE_GTK_FILE_BOTH
and HAVE_GTK_FILE_CHOOSER_DIALOG_NEW. File chooser is always
available, so checking for HAVE_GTK_FILE_SELECTION_NEW is enough.
(xg_update_menubar, xg_update_submenu, xg_show_toolbar_item): Use
g_object_ref and g_object_unref.
(xg_update_menu_item, xg_tool_bar_menu_proxy): Use
gtk_widget_get_sensitive.
(xg_update_submenu): Use remove_submenu.
(xg_update_scrollbar_pos): Don't use GtkFixedChild, use child
properties instead to get old x and y position.
(xg_set_toolkit_scroll_bar_thumb): Use gtk_adjustment_get_page_size,
gtk_adjustment_get_step_increment, gtk_adjustment_set_page_size,
gtk_adjustment_set_step_increment and gtk_adjustment_set_page_increment.
(xg_get_tool_bar_widgets): New function.
(xg_tool_bar_menu_proxy, xg_show_toolbar_item)
(update_frame_tool_bar): Call xg_get_tool_bar_widgets.
(toolbar_set_orientation): New #define based on if configure
finds gtk_orientable_set_orientation.
(xg_create_tool_bar): Call toolbar_set_orientation.
(xg_make_tool_item, xg_show_toolbar_item): Call gtk_box_pack_start
instead of gtk_box_pack_start_defaults.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Mon, 28 Jun 2010 12:11:26 +0200 |
parents | 38cf1b719b59 |
children | c97bf1cfaa8d |
comparison
equal
deleted
inserted
replaced
109066:6d629fcc79e9 | 109067:b5f73bf59a4f |
---|---|
193 #undef HAVE_GAI_STRERROR | 193 #undef HAVE_GAI_STRERROR |
194 | 194 |
195 /* Define to 1 if using GConf. */ | 195 /* Define to 1 if using GConf. */ |
196 #undef HAVE_GCONF | 196 #undef HAVE_GCONF |
197 | 197 |
198 /* Define to 1 if you have the `gdk_display_open' function. */ | |
199 #undef HAVE_GDK_DISPLAY_OPEN | |
200 | |
201 /* Define to 1 if you have the `getaddrinfo' function. */ | 198 /* Define to 1 if you have the `getaddrinfo' function. */ |
202 #undef HAVE_GETADDRINFO | 199 #undef HAVE_GETADDRINFO |
203 | 200 |
204 /* Define to 1 if you have the `getcwd' function. */ | 201 /* Define to 1 if you have the `getcwd' function. */ |
205 #undef HAVE_GETCWD | 202 #undef HAVE_GETCWD |
262 #undef HAVE_GPM | 259 #undef HAVE_GPM |
263 | 260 |
264 /* Define to 1 if you have the `grantpt' function. */ | 261 /* Define to 1 if you have the `grantpt' function. */ |
265 #undef HAVE_GRANTPT | 262 #undef HAVE_GRANTPT |
266 | 263 |
264 /* Define to 1 if you have the `gtk_adjustment_get_page_size' function. */ | |
265 #undef HAVE_GTK_ADJUSTMENT_GET_PAGE_SIZE | |
266 | |
267 /* Define to 1 if you have GTK and pthread (-lpthread). */ | 267 /* Define to 1 if you have GTK and pthread (-lpthread). */ |
268 #undef HAVE_GTK_AND_PTHREAD | 268 #undef HAVE_GTK_AND_PTHREAD |
269 | 269 |
270 /* Define to 1 if GTK has both file selection and chooser dialog. */ | 270 /* Define to 1 if you have the `gtk_dialog_get_action_area' function. */ |
271 #undef HAVE_GTK_FILE_BOTH | 271 #undef HAVE_GTK_DIALOG_GET_ACTION_AREA |
272 | |
273 /* Define to 1 if you have the `gtk_file_chooser_dialog_new' function. */ | |
274 #undef HAVE_GTK_FILE_CHOOSER_DIALOG_NEW | |
275 | 272 |
276 /* Define to 1 if you have the `gtk_file_selection_new' function. */ | 273 /* Define to 1 if you have the `gtk_file_selection_new' function. */ |
277 #undef HAVE_GTK_FILE_SELECTION_NEW | 274 #undef HAVE_GTK_FILE_SELECTION_NEW |
278 | 275 |
279 /* Define to 1 if you have the `gtk_main' function. */ | 276 /* Define to 1 if you have the `gtk_main' function. */ |
280 #undef HAVE_GTK_MAIN | 277 #undef HAVE_GTK_MAIN |
281 | 278 |
282 /* Define to 1 if GTK can handle more than one display. */ | 279 /* Define to 1 if you have the `gtk_orientable_set_orientation' function. */ |
283 #undef HAVE_GTK_MULTIDISPLAY | 280 #undef HAVE_GTK_ORIENTABLE_SET_ORIENTATION |
281 | |
282 /* Define to 1 if you have the `gtk_widget_get_mapped' function. */ | |
283 #undef HAVE_GTK_WIDGET_GET_MAPPED | |
284 | |
285 /* Define to 1 if you have the `gtk_widget_get_sensitive' function. */ | |
286 #undef HAVE_GTK_WIDGET_GET_SENSITIVE | |
287 | |
288 /* Define to 1 if you have the `gtk_widget_get_window' function. */ | |
289 #undef HAVE_GTK_WIDGET_GET_WINDOW | |
290 | |
291 /* Define to 1 if you have the `gtk_widget_set_has_window' function. */ | |
292 #undef HAVE_GTK_WIDGET_SET_HAS_WINDOW | |
284 | 293 |
285 /* Define to 1 if netdb.h declares h_errno. */ | 294 /* Define to 1 if netdb.h declares h_errno. */ |
286 #undef HAVE_H_ERRNO | 295 #undef HAVE_H_ERRNO |
287 | 296 |
288 /* Define to 1 if you have the `index' function. */ | 297 /* Define to 1 if you have the `index' function. */ |