From f605d3d698fd2c3558aa0d0048cd5d89ada1ae98 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Mon, 10 Jan 2011 21:34:33 +0100 Subject: [PATCH] Bug 639127 - Add missing gdkdisplaymanager-win32.c --- gdk/win32/gdkdisplaymanager-win32.c | 135 ++++++++++++++++++++++++++++ gtk/gtk.symbols | 28 +++--- 2 files changed, 145 insertions(+), 18 deletions(-) create mode 100644 gdk/win32/gdkdisplaymanager-win32.c diff --git a/gdk/win32/gdkdisplaymanager-win32.c b/gdk/win32/gdkdisplaymanager-win32.c new file mode 100644 index 0000000000..3df8d1752e --- /dev/null +++ b/gdk/win32/gdkdisplaymanager-win32.c @@ -0,0 +1,135 @@ +/* GDK - The GIMP Drawing Kit + * gdkdisplaymanager-win32.c + * + * Copyright 2010 Hans Breuer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include "gdkwin32display.h" +#include "gdkwin32displaymanager.h" +#include "gdkprivate-win32.h" + +#include "gdkdisplaymanagerprivate.h" +#include "gdkinternals.h" + +struct _GdkWin32DisplayManager +{ + GdkDisplayManager parent_instance; +}; + +struct _GdkWin32DisplayManagerClass +{ + GdkDisplayManagerClass parent_instance; +}; + +G_DEFINE_TYPE (GdkWin32DisplayManager, gdk_win32_display_manager, GDK_TYPE_DISPLAY_MANAGER) + +static GdkDisplay * +gdk_win32_display_manager_open_display (GdkDisplayManager *manager, + const gchar *name) +{ + return _gdk_win32_display_open (name); +} + +static GSList * +gdk_win32_display_manager_list_displays (GdkDisplayManager *manager) +{ + return g_slist_append (NULL, gdk_display_get_default ()); +} + +static GdkDisplay * +gdk_win32_display_manager_get_default_display (GdkDisplayManager *manager) +{ + return _gdk_win32_display_open (NULL); +} + +static void +gdk_win32_display_manager_set_default_display (GdkDisplayManager *manager, + GdkDisplay *display) +{ + g_assert (gdk_display_get_default () == display); +} + +#include "../gdkkeynames.c" + +static gchar * +gdk_win32_display_manager_get_keyval_name (GdkDisplayManager *manager, + guint keyval) +{ + return _gdk_keyval_name (keyval); +} + +static guint +gdk_win32_display_manager_lookup_keyval (GdkDisplayManager *manager, + const gchar *name) +{ + return _gdk_keyval_from_name (name); +} + +static void +gdk_win32_display_manager_keyval_convert_case (GdkDisplayManager *manager, + guint symbol, + guint *lower, + guint *upper) +{ + /* FIXME implement this */ + if (lower) + *lower = symbol; + if (upper) + *upper = symbol; +} + +static void +gdk_win32_display_manager_init (GdkWin32DisplayManager *manager) +{ + static once = TRUE; + /* relies on displaymanager being a singleton , but our init functions + * call gtk_diplay_maanger_get() again */ + if (once) + { + once = FALSE; + _gdk_win32_windowing_init (); + } +} + +static void +gdk_win32_display_manager_finalize (GObject *object) +{ + g_error ("A GdkWin32DisplayManager object was finalized. This should not happen"); + G_OBJECT_CLASS (gdk_win32_display_manager_parent_class)->finalize (object); +} + +static void +gdk_win32_display_manager_class_init (GdkWin32DisplayManagerClass *class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (class); + GdkDisplayManagerClass *manager_class = GDK_DISPLAY_MANAGER_CLASS (class); + + object_class->finalize = gdk_win32_display_manager_finalize; + + manager_class->open_display = gdk_win32_display_manager_open_display; + manager_class->list_displays = gdk_win32_display_manager_list_displays; + manager_class->set_default_display = gdk_win32_display_manager_set_default_display; + manager_class->get_default_display = gdk_win32_display_manager_get_default_display; + manager_class->atom_intern = _gdk_win32_display_manager_atom_intern; + manager_class->get_atom_name = _gdk_win32_display_manager_get_atom_name; + manager_class->lookup_keyval = gdk_win32_display_manager_lookup_keyval; + manager_class->get_keyval_name = gdk_win32_display_manager_get_keyval_name; + manager_class->keyval_convert_case = gdk_win32_display_manager_keyval_convert_case; +} diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 1f99b02cf0..b625747f2c 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -504,6 +504,8 @@ gtk_cell_renderer_toggle_new gtk_cell_renderer_toggle_set_activatable gtk_cell_renderer_toggle_set_active gtk_cell_renderer_toggle_set_radio +gtk_cell_view_get_desired_height_for_width_of_row +gtk_cell_view_get_desired_width_of_row gtk_cell_view_get_displayed_row gtk_cell_view_get_draw_sensitive gtk_cell_view_get_fit_model @@ -605,7 +607,6 @@ gtk_color_selection_set_has_palette gtk_color_selection_set_previous_alpha gtk_color_selection_set_previous_color gtk_color_selection_set_previous_rgba -gtk_combo_box_cell_layout_get_area gtk_combo_box_get_active gtk_combo_box_get_active_id gtk_combo_box_get_active_iter @@ -1478,7 +1479,6 @@ gtk_menu_item_activate gtk_menu_item_deselect gtk_menu_item_get_accel_path gtk_menu_item_get_label -gtk_menu_item_get_reserve_indicator gtk_menu_item_get_right_justified gtk_menu_item_get_submenu gtk_menu_item_get_type G_GNUC_CONST @@ -1489,7 +1489,6 @@ gtk_menu_item_new_with_mnemonic gtk_menu_item_select gtk_menu_item_set_accel_path gtk_menu_item_set_label -gtk_menu_item_set_reserve_indicator gtk_menu_item_set_right_justified gtk_menu_item_set_submenu gtk_menu_item_set_use_underline @@ -1607,19 +1606,6 @@ gtk_notebook_set_tab_pos gtk_notebook_set_tab_reorderable gtk_notebook_tab_get_type G_GNUC_CONST gtk_number_up_layout_get_type G_GNUC_CONST -gtk_numerable_icon_get_background_gicon -gtk_numerable_icon_get_background_icon_name -gtk_numerable_icon_get_count -gtk_numerable_icon_get_label -gtk_numerable_icon_get_style_context -gtk_numerable_icon_get_type G_GNUC_CONST -gtk_numerable_icon_new -gtk_numerable_icon_new_with_style_context -gtk_numerable_icon_set_background_gicon -gtk_numerable_icon_set_background_icon_name -gtk_numerable_icon_set_count -gtk_numerable_icon_set_label -gtk_numerable_icon_set_style_context gtk_offscreen_window_get_pixbuf gtk_offscreen_window_get_surface gtk_offscreen_window_get_type G_GNUC_CONST @@ -1816,8 +1802,6 @@ gtk_printer_request_details gtk_print_error_get_type G_GNUC_CONST gtk_print_error_quark #ifdef G_OS_UNIX -gtk_printer_set_accepts_pdf -gtk_printer_set_accepts_ps gtk_printer_set_description gtk_printer_set_has_details gtk_printer_set_icon_name @@ -2022,6 +2006,11 @@ gtk_progress_bar_set_pulse_step gtk_progress_bar_set_show_text gtk_progress_bar_set_text gtk_propagate_event +gtk_quit_add +gtk_quit_add_destroy +gtk_quit_add_full +gtk_quit_remove +gtk_quit_remove_by_data gtk_radio_action_get_current_value gtk_radio_action_get_group gtk_radio_action_get_type G_GNUC_CONST @@ -2067,6 +2056,7 @@ gtk_range_get_show_fill_level gtk_range_get_slider_range gtk_range_get_slider_size_fixed gtk_range_get_type G_GNUC_CONST +gtk_range_get_update_policy gtk_range_get_upper_stepper_sensitivity gtk_range_get_value gtk_range_set_adjustment @@ -2080,6 +2070,7 @@ gtk_range_set_range gtk_range_set_restrict_to_fill_level gtk_range_set_show_fill_level gtk_range_set_slider_size_fixed +gtk_range_set_update_policy gtk_range_set_upper_stepper_sensitivity gtk_range_set_value gtk_rc_add_default_file @@ -3414,6 +3405,7 @@ gtk_ui_manager_remove_action_group gtk_ui_manager_remove_ui gtk_ui_manager_set_add_tearoffs gtk_unit_get_type G_GNUC_CONST +gtk_update_type_get_type G_GNUC_CONST gtk_vbox_get_type G_GNUC_CONST gtk_vbox_new gtk_vbutton_box_get_type G_GNUC_CONST