AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

Add deprecation guards for gtk_rc_style_ref/unref and the old file

Browse Source 
2007-01-27  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkfilesel.h:
        * gtk/gtkrc.h:
        * gtk/gtk.symbols: Add deprecation guards for gtk_rc_style_ref/unref
        and the old file selector.  (#348256)



svn path=/trunk/; revision=17223
This commit is contained in:
Matthias Clasen 2007-01-27 05:34:05 +00:00 committed by Matthias Clasen
parent 318f1c97bc
commit 98e2295efc
7 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-01-27 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilesel.h:
* gtk/gtkrc.h:
* gtk/gtk.symbols: Add deprecation guards for gtk_rc_style_ref/unref
and the old file selector. (#348256)
2007-01-26 Matthias Clasen <mclasen@redhat.com> 2007-01-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c: Documentation fixes (#400530, Anders Brander) * gtk/gtkiconview.c: Documentation fixes (#400530, Anders Brander)

4
docs/reference/ChangeLog
View File

@ -1,3 +1,7 @@
2007-01-27 Matthias Clasen <mclasen@redhat.com>
* gtk/sgml/gtkfilesel.sgml: Add deprecation information.
2007-01-08 Matthias Clasen <mclasen@redhat.com> 2007-01-08 Matthias Clasen <mclasen@redhat.com>
* gtk/tmpl/gtkentry.sgml: Expand deprecation notes for * gtk/tmpl/gtkentry.sgml: Expand deprecation notes for

55
docs/reference/gtk/tmpl/gtkfilesel.sgml
View File

@ -6,6 +6,10 @@ Prompt the user for a file or directory name
<!-- ##### SECTION Long_Description ##### --> <!-- ##### SECTION Long_Description ##### -->
<para> <para>
#GtkFileSelection has been superseded by the newer #GtkFileChooser family
of widgets.
</para>
<para>
#GtkFileSelection should be used to retrieve file or directory names from #GtkFileSelection should be used to retrieve file or directory names from
the user. It will create a new dialog window containing a directory list, the user. It will create a new dialog window containing a directory list,
and a file list corresponding to the current working directory. The filesystem and a file list corresponding to the current working directory. The filesystem
@ -93,53 +97,35 @@ void create_file_selection (void) {
<!-- ##### STRUCT GtkFileSelection ##### --> <!-- ##### STRUCT GtkFileSelection ##### -->
<para> <para>
The #GtkFileSelection struct contains the following #GtkWidget fields: The #GtkFileSelection struct contains the following #GtkWidget fields:
<informaltable pgwide="1" frame="none" role="struct">
<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
<tbody>
<row>
<entry>*fileop_dialog;</entry>
<entry>the dialog box used to display the #GtkFileSelection. It can be customized by adding/removing widgets from it using the standard #GtkDialog functions.</entry>
</row>
<row>
<entry>*ok_button, *cancel_button;</entry>
<entry>the two main buttons that signals should be connected to in order to perform an action when the user hits either OK or Cancel.</entry>
</row>
<row>
<entry>*history_pulldown;</entry>
<entry>the #GtkOptionMenu used to create the drop-down directory history.</entry>
</row>
<row>
<entry>*fileop_c_dir, *fileop_del_file, *fileop_ren_file;</entry>
<entry>the buttons that appear at the top of the file selection dialog. These "operation buttons" can be hidden and redisplayed with gtk_file_selection_hide_fileop_buttons() and gtk_file_selection_show_fileop_buttons() respectively.</entry>
</row>
</tbody></tgroup></informaltable>
</para> </para>
@fileop_dialog: the dialog box used to display the #GtkFileSelection.
It can be customized by adding/removing widgets from it using the
standard #GtkDialog functions.
@ok_button:
@cancel_button: the two main buttons that signals should be connected
to in order to perform an action when the user hits either OK or
Cancel.
@history_pulldown: the #GtkOptionMenu used to create the drop-down
directory history.
@fileop_c_dir:
@fileop_del_file:
@fileop_ren_file: the buttons that appear at the top of the file
selection dialog. These "operation buttons" can be hidden and
redisplayed with gtk_file_selection_hide_fileop_buttons() and
gtk_file_selection_show_fileop_buttons() respectively.
@dir_list: @dir_list:
@file_list: @file_list:
@selection_entry: @selection_entry:
@selection_text: @selection_text:
@main_vbox: @main_vbox:
@ok_button:
@cancel_button:
@help_button: @help_button:
@history_pulldown:
@history_menu: @history_menu:
@history_list: @history_list:
@fileop_dialog:
@fileop_entry: @fileop_entry:
@fileop_file: @fileop_file:
@cmpl_state: @cmpl_state:
@fileop_c_dir:
@fileop_del_file:
@fileop_ren_file:
@button_area: @button_area:
@action_area: @action_area:
@ -165,6 +151,7 @@ Creates a new file selection dialog box. By default it will contain a #GtkTreeVi
@title: a message that will be placed in the file requestor's titlebar. @title: a message that will be placed in the file requestor's titlebar.
@Returns: the new file selection. @Returns: the new file selection.
@Deprecated: Use gtk_file_chooser_dialog_new() instead
<!-- ##### FUNCTION gtk_file_selection_set_filename ##### --> <!-- ##### FUNCTION gtk_file_selection_set_filename ##### -->

2
docs/reference/gtk/tmpl/gtkrc.sgml
View File

@ -1064,6 +1064,7 @@ Increments the reference count of a #GtkRcStyle.
</para> </para>
@rc_style: a #GtkRcStyle @rc_style: a #GtkRcStyle
@Deprecated: Use g_object_ref() instead
<!-- ##### FUNCTION gtk_rc_style_unref ##### --> <!-- ##### FUNCTION gtk_rc_style_unref ##### -->
@ -1073,5 +1074,6 @@ frees if the result is 0.
</para> </para>
@rc_style: a #GtkRcStyle @rc_style: a #GtkRcStyle
@Deprecated: Use g_object_unref() instead

4
gtk/gtk.symbols
View File

@ -1489,6 +1489,7 @@ gtk_file_system_win32_new
#if IN_HEADER(__GTK_FILESEL_H__) #if IN_HEADER(__GTK_FILESEL_H__)
#if IN_FILE(__GTK_FILESEL_C__) #if IN_FILE(__GTK_FILESEL_C__)
#ifndef GTK_DISABLE_DEPRECATED
gtk_file_selection_complete gtk_file_selection_complete
gtk_file_selection_get_filename PRIVATE gtk_file_selection_get_filename PRIVATE
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
@ -1510,6 +1511,7 @@ gtk_file_selection_set_select_multiple
gtk_file_selection_show_fileop_buttons gtk_file_selection_show_fileop_buttons
#endif #endif
#endif #endif
#endif
#if IN_HEADER(__GTK_FIXED_H__) #if IN_HEADER(__GTK_FIXED_H__)
#if IN_FILE(__GTK_FIXED_C__) #if IN_FILE(__GTK_FIXED_C__)
@ -3021,10 +3023,12 @@ gtk_rc_set_default_files_utf8
gtk_rc_style_copy gtk_rc_style_copy
gtk_rc_style_get_type G_GNUC_CONST gtk_rc_style_get_type G_GNUC_CONST
gtk_rc_style_new gtk_rc_style_new
#ifndef GTK_DISABLE_DEPRECATED
gtk_rc_style_ref gtk_rc_style_ref
gtk_rc_style_unref gtk_rc_style_unref
#endif #endif
#endif #endif
#endif
#if IN_HEADER(__GTK_RECENT_CHOOSER_H__) #if IN_HEADER(__GTK_RECENT_CHOOSER_H__)
#if IN_FILE(__GTK_RECENT_CHOOSER_C__) #if IN_FILE(__GTK_RECENT_CHOOSER_C__)

4
gtk/gtkfilesel.h
View File

@ -24,6 +24,8 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/. * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/ */
#ifndef GTK_DISABLE_DEPRECATED
#ifndef __GTK_FILESEL_H__ #ifndef __GTK_FILESEL_H__
#define __GTK_FILESEL_H__ #define __GTK_FILESEL_H__
@ -121,3 +123,5 @@ G_END_DECLS
#endif /* __GTK_FILESEL_H__ */ #endif /* __GTK_FILESEL_H__ */
#endif /* GTK_DISABLE_DEPRECATED */

3
gtk/gtkrc.h
View File

@ -168,8 +168,11 @@ void gtk_rc_add_class_style (GtkRcStyle *rc_style,
GType gtk_rc_style_get_type (void) G_GNUC_CONST; GType gtk_rc_style_get_type (void) G_GNUC_CONST;
GtkRcStyle* gtk_rc_style_new (void); GtkRcStyle* gtk_rc_style_new (void);
GtkRcStyle* gtk_rc_style_copy (GtkRcStyle *orig); GtkRcStyle* gtk_rc_style_copy (GtkRcStyle *orig);
#ifndef GTK_DISABLE_DEPRECATED
void gtk_rc_style_ref (GtkRcStyle *rc_style); void gtk_rc_style_ref (GtkRcStyle *rc_style);
void gtk_rc_style_unref (GtkRcStyle *rc_style); void gtk_rc_style_unref (GtkRcStyle *rc_style);
#endif
gchar* gtk_rc_find_module_in_path (const gchar *module_file); gchar* gtk_rc_find_module_in_path (const gchar *module_file);
gchar* gtk_rc_get_theme_dir (void); gchar* gtk_rc_get_theme_dir (void);