gtk: Put private functions in headers and include those

This is part of a bunch of fixes for gcc complaining about
-Wmissing-declarations.

It puts functions into headers and includes those headers both where the
functions are defined and where they function are used.
This commit is contained in:
Benjamin Otte 2012-10-02 19:27:25 +02:00
parent 101c6a05a9
commit dd99577691
8 changed files with 18 additions and 2 deletions

View File

@ -28,6 +28,9 @@
*/ */
#include "config.h" #include "config.h"
#include "gtkprivate.h"
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>

View File

@ -58,6 +58,7 @@ GtkWidget * _gtk_custom_paper_unix_dialog_new (GtkWindow
GtkUnit _gtk_print_get_default_user_units (void); GtkUnit _gtk_print_get_default_user_units (void);
void _gtk_print_load_custom_papers (GtkListStore *store); void _gtk_print_load_custom_papers (GtkListStore *store);
void _gtk_print_save_custom_papers (GtkListStore *store); void _gtk_print_save_custom_papers (GtkListStore *store);
GList * _gtk_load_custom_papers (void);
G_END_DECLS G_END_DECLS

View File

@ -33,6 +33,8 @@ typedef struct _GtkFileChooserDefault GtkFileChooserDefault;
GType _gtk_file_chooser_default_get_type (void) G_GNUC_CONST; GType _gtk_file_chooser_default_get_type (void) G_GNUC_CONST;
GtkWidget *_gtk_file_chooser_default_new (void); GtkWidget *_gtk_file_chooser_default_new (void);
gchar * _gtk_file_chooser_label_for_file (GFile *file);
G_END_DECLS G_END_DECLS
#endif /* __GTK_FILE_CHOOSER_DEFAULT_H__ */ #endif /* __GTK_FILE_CHOOSER_DEFAULT_H__ */

View File

@ -41,6 +41,7 @@
#include <config.h> #include <config.h>
#include "gtknumerableicon.h" #include "gtknumerableicon.h"
#include "gtknumerableiconprivate.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkintl.h" #include "gtkintl.h"

View File

@ -30,6 +30,10 @@
#include "gtkprintoperation.h" /* for GtkPrintError */ #include "gtkprintoperation.h" /* for GtkPrintError */
#include "gtkintl.h" #include "gtkintl.h"
#ifdef G_OS_UNIX /* _gtk_load_custom_papers() only on Unix so far */
#include "gtkcustompaperunixdialog.h"
#endif
#include "paper_names_offsets.c" #include "paper_names_offsets.c"
@ -454,8 +458,6 @@ gtk_paper_size_is_equal (GtkPaperSize *size1,
gtk_paper_size_get_name (size2)) == 0; gtk_paper_size_get_name (size2)) == 0;
} }
GList * _gtk_load_custom_papers (void);
/** /**
* gtk_paper_size_get_paper_sizes: * gtk_paper_size_get_paper_sizes:
* @include_custom: whether to include custom paper sizes * @include_custom: whether to include custom paper sizes

View File

@ -1,6 +1,7 @@
/*** BEGIN file-header ***/ /*** BEGIN file-header ***/
#include "gtk.h" #include "gtk.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkprivatetypebuiltins.h"
/*** END file-header ***/ /*** END file-header ***/

View File

@ -152,6 +152,7 @@ gtk_css_border_radius_grow (GtkRoundedBoxCorner *corner,
corner->vertical = 0; corner->vertical = 0;
} }
} }
void void
_gtk_rounded_box_grow (GtkRoundedBox *box, _gtk_rounded_box_grow (GtkRoundedBox *box,
double top, double top,

View File

@ -54,6 +54,11 @@ void _gtk_rounded_box_apply_border_radius_for_context (GtkRoundedBox
GtkStyleContext *context, GtkStyleContext *context,
GtkJunctionSides junction); GtkJunctionSides junction);
void _gtk_rounded_box_grow (GtkRoundedBox *box,
double top,
double right,
double bottom,
double left);
void _gtk_rounded_box_shrink (GtkRoundedBox *box, void _gtk_rounded_box_shrink (GtkRoundedBox *box,
double top, double top,
double right, double right,