diff options
Diffstat (limited to 'gtk')
| -rwxr-xr-x | gtk/gtk.def | 17 | ||||
| -rw-r--r-- | gtk/gtkrc.c | 18 | ||||
| -rw-r--r-- | gtk/gtkrc.h | 5 |
3 files changed, 23 insertions, 17 deletions
diff --git a/gtk/gtk.def b/gtk/gtk.def index f5ea0d165b..35335a3018 100755 --- a/gtk/gtk.def +++ b/gtk/gtk.def @@ -218,8 +218,8 @@ EXPORTS gtk_calendar_freeze gtk_calendar_get_date gtk_calendar_get_type - gtk_calendar_new gtk_calendar_mark_day + gtk_calendar_new gtk_calendar_select_day gtk_calendar_select_month gtk_calendar_thaw @@ -298,7 +298,6 @@ EXPORTS gtk_clist_set_selection_mode gtk_clist_set_shadow_type gtk_clist_set_shift - gtk_ctree_set_show_stub gtk_clist_set_sort_column gtk_clist_set_sort_type gtk_clist_set_text @@ -418,6 +417,7 @@ EXPORTS gtk_ctree_set_indent gtk_ctree_set_line_style gtk_ctree_set_node_info + gtk_ctree_set_show_stub gtk_ctree_set_spacing gtk_ctree_sort_node gtk_ctree_sort_recursive @@ -447,8 +447,8 @@ EXPORTS gtk_drag_highlight gtk_drag_set_default_icon gtk_drag_set_icon_default - gtk_drag_set_icon_widget gtk_drag_set_icon_pixmap + gtk_drag_set_icon_widget gtk_drag_source_handle_event gtk_drag_source_set gtk_drag_source_set_icon @@ -695,8 +695,8 @@ EXPORTS gtk_marshal_NONE__POINTER gtk_marshal_NONE__POINTER_INT gtk_marshal_NONE__POINTER_INT_INT - gtk_marshal_NONE__POINTER_INT_POINTER gtk_marshal_NONE__POINTER_INT_INT_POINTER_INT_INT + gtk_marshal_NONE__POINTER_INT_POINTER gtk_marshal_NONE__POINTER_POINTER gtk_marshal_NONE__POINTER_POINTER_INT_INT gtk_marshal_NONE__POINTER_POINTER_POINTER @@ -854,13 +854,13 @@ EXPORTS gtk_paint_focus gtk_paint_handle gtk_paint_hline - gtk_paint_oval gtk_paint_option + gtk_paint_oval gtk_paint_polygon gtk_paint_ramp - gtk_paint_slider gtk_paint_shadow gtk_paint_shadow_gap + gtk_paint_slider gtk_paint_string gtk_paint_tab gtk_paint_vline @@ -967,8 +967,8 @@ EXPORTS gtk_rc_find_pixmap_in_path gtk_rc_get_default_files gtk_rc_get_module_dir - gtk_rc_get_theme_dir gtk_rc_get_style + gtk_rc_get_theme_dir gtk_rc_init gtk_rc_load_image gtk_rc_parse @@ -1053,9 +1053,9 @@ EXPORTS gtk_signal_name gtk_signal_new gtk_signal_newv - gtk_signal_set_funcs gtk_signal_query gtk_signal_remove_emission_hook + gtk_signal_set_funcs gtk_socket_get_type gtk_socket_new gtk_socket_steal @@ -1320,6 +1320,7 @@ EXPORTS gtk_widget_unparent gtk_widget_unrealize gtk_widget_unref + gtk_win32_get_installation_directory gtk_window_activate_default gtk_window_activate_focus gtk_window_add_accel_group diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 9fbaa444cd..b6b3c82034 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -255,35 +255,35 @@ static GtkImageLoader image_loader = NULL; #ifdef G_OS_WIN32 gchar * -get_gtk_sysconf_directory (void) +gtk_win32_get_installation_directory (void) { static gboolean been_here = FALSE; - static gchar gtk_sysconf_dir[200]; + static gchar gtk_installation_dir[200]; gchar win_dir[100]; HKEY reg_key = NULL; DWORD type; - DWORD nbytes = sizeof (gtk_sysconf_dir); + DWORD nbytes = sizeof (gtk_installation_dir); if (been_here) - return gtk_sysconf_dir; + return gtk_installation_dir; been_here = TRUE; if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, "Software\\GNU\\GTk+", 0, KEY_QUERY_VALUE, ®_key) != ERROR_SUCCESS || RegQueryValueEx (reg_key, "InstallationDirectory", 0, - &type, gtk_sysconf_dir, &nbytes) != ERROR_SUCCESS + &type, gtk_installation_dir, &nbytes) != ERROR_SUCCESS || type != REG_SZ) { /* Uh oh. Use the old hard-coded %WinDir%\GTk+ value */ GetWindowsDirectory (win_dir, sizeof (win_dir)); - sprintf (gtk_sysconf_dir, "%s\\gtk+", win_dir); + sprintf (gtk_installation_dir, "%s\\gtk+", win_dir); } if (reg_key != NULL) RegCloseKey (reg_key); - return gtk_sysconf_dir; + return gtk_installation_dir; } static gchar * @@ -291,7 +291,7 @@ get_themes_directory (void) { static gchar themes_dir[200]; - sprintf (themes_dir, "%s\\themes", get_gtk_sysconf_directory ()); + sprintf (themes_dir, "%s\\themes", gtk_win32_get_installation_directory ()); return themes_dir; } @@ -398,7 +398,7 @@ gtk_rc_add_initial_default_files (void) #ifndef G_OS_WIN32 str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc"); #else - str = g_strdup_printf ("%s\\gtkrc", get_gtk_sysconf_directory ()); + str = g_strdup_printf ("%s\\gtkrc", gtk_win32_get_installation_directory ()); #endif gtk_rc_add_default_file (str); diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h index cba8e1f841..942a27a25b 100644 --- a/gtk/gtkrc.h +++ b/gtk/gtkrc.h @@ -186,6 +186,11 @@ guint gtk_rc_parse_state (GScanner *scanner, guint gtk_rc_parse_priority (GScanner *scanner, GtkPathPriorityType *priority); +#ifdef G_OS_WIN32 + +gchar *gtk_win32_get_installation_directory (void); + +#endif #ifdef __cplusplus |