callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup. (#169648, Fabricio Barros Cabral)

Browse Source 
2005-06-12  Matthias Clasen  <mclasen@redhat.com>

	* gdk/*.h: Cleanup.  (#169648, Fabricio Barros Cabral)
This commit is contained in:
Matthias Clasen 2005-06-12 05:32:25 +00:00 committed by Matthias Clasen
parent 28bebc863a
commit 411241fb26
26 changed files with 51 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2005-06-12 Matthias Clasen <mclasen@redhat.com> 2005-06-12 Matthias Clasen <mclasen@redhat.com>
* gdk/*.h: Cleanup. (#169648, Fabricio Barros Cabral)
* gdk/gdkcairo.c: Small doc additions. * gdk/gdkcairo.c: Small doc additions.
* gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row): * gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row):

2
ChangeLog.pre-2-10
View File

@ -1,5 +1,7 @@
2005-06-12 Matthias Clasen <mclasen@redhat.com> 2005-06-12 Matthias Clasen <mclasen@redhat.com>
* gdk/*.h: Cleanup. (#169648, Fabricio Barros Cabral)
* gdk/gdkcairo.c: Small doc additions. * gdk/gdkcairo.c: Small doc additions.
* gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row): * gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row):

2
ChangeLog.pre-2-8
View File

@ -1,5 +1,7 @@
2005-06-12 Matthias Clasen <mclasen@redhat.com> 2005-06-12 Matthias Clasen <mclasen@redhat.com>
* gdk/*.h: Cleanup. (#169648, Fabricio Barros Cabral)
* gdk/gdkcairo.c: Small doc additions. * gdk/gdkcairo.c: Small doc additions.
* gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row): * gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row):

8
gdk/gdk.h
View File

@ -54,9 +54,7 @@
#include <gdk/gdkvisual.h> #include <gdk/gdkvisual.h>
#include <gdk/gdkwindow.h> #include <gdk/gdkwindow.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/* Initialization, exit and events /* Initialization, exit and events
@ -209,9 +207,7 @@ void gdk_threads_set_lock_functions (GCallback enter_fn,
# define GDK_THREADS_LEAVE() # define GDK_THREADS_LEAVE()
#endif /* !G_THREADS_ENABLED */ #endif /* !G_THREADS_ENABLED */
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_H__ */ #endif /* __GDK_H__ */

8
gdk/gdkdnd.h
View File

@ -3,9 +3,7 @@
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
typedef struct _GdkDragContext GdkDragContext; typedef struct _GdkDragContext GdkDragContext;
@ -138,8 +136,6 @@ void gdk_drag_abort (GdkDragContext *context,
guint32 time_); guint32 time_);
gboolean gdk_drag_drop_succeeded (GdkDragContext *context); gboolean gdk_drag_drop_succeeded (GdkDragContext *context);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_DND_H__ */ #endif /* __GDK_DND_H__ */

8
gdk/gdkdrawable.h
View File

@ -8,9 +8,7 @@
#include <cairo.h> #include <cairo.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
typedef struct _GdkDrawableClass GdkDrawableClass; typedef struct _GdkDrawableClass GdkDrawableClass;
typedef struct _GdkTrapezoid GdkTrapezoid; typedef struct _GdkTrapezoid GdkTrapezoid;
@ -391,8 +389,6 @@ GdkImage *gdk_drawable_copy_to_image (GdkDrawable *drawable,
GdkRegion *gdk_drawable_get_clip_region (GdkDrawable *drawable); GdkRegion *gdk_drawable_get_clip_region (GdkDrawable *drawable);
GdkRegion *gdk_drawable_get_visible_region (GdkDrawable *drawable); GdkRegion *gdk_drawable_get_visible_region (GdkDrawable *drawable);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_DRAWABLE_H__ */ #endif /* __GDK_DRAWABLE_H__ */

8
gdk/gdkevents.h
View File

@ -6,9 +6,7 @@
#include <gdk/gdkdnd.h> #include <gdk/gdkdnd.h>
#include <gdk/gdkinput.h> #include <gdk/gdkinput.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GDK_TYPE_EVENT (gdk_event_get_type ()) #define GDK_TYPE_EVENT (gdk_event_get_type ())
@ -512,8 +510,6 @@ gboolean gdk_setting_get (const gchar *name,
GValue *value); GValue *value);
#endif /* GDK_MULTIHEAD_SAFE */ #endif /* GDK_MULTIHEAD_SAFE */
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_EVENTS_H__ */ #endif /* __GDK_EVENTS_H__ */

8
gdk/gdkfont.h
View File

@ -6,9 +6,7 @@
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#include <pango/pango-font.h> #include <pango/pango-font.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GDK_TYPE_FONT gdk_font_get_type () #define GDK_TYPE_FONT gdk_font_get_type ()
@ -107,9 +105,7 @@ GdkDisplay * gdk_font_get_display (GdkFont *font);
#endif /* GDK_DISABLE_DEPRECATED */ #endif /* GDK_DISABLE_DEPRECATED */
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_FONT_H__ */ #endif /* __GDK_FONT_H__ */

8
gdk/gdkgc.h
View File

@ -4,9 +4,7 @@
#include <gdk/gdkcolor.h> #include <gdk/gdkcolor.h>
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
typedef struct _GdkGCValues GdkGCValues; typedef struct _GdkGCValues GdkGCValues;
typedef struct _GdkGCClass GdkGCClass; typedef struct _GdkGCClass GdkGCClass;
@ -269,8 +267,6 @@ GdkScreen * gdk_gc_get_screen (GdkGC *gc);
#define gdk_gc_destroy gdk_gc_unref #define gdk_gc_destroy gdk_gc_unref
#endif /* GDK_DISABLE_DEPRECATED */ #endif /* GDK_DISABLE_DEPRECATED */
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_DRAWABLE_H__ */ #endif /* __GDK_DRAWABLE_H__ */

8
gdk/gdkinput.h
View File

@ -3,9 +3,7 @@
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GDK_TYPE_DEVICE (gdk_device_get_type ()) #define GDK_TYPE_DEVICE (gdk_device_get_type ())
#define GDK_DEVICE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DEVICE, GdkDevice)) #define GDK_DEVICE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DEVICE, GdkDevice))
@ -142,8 +140,6 @@ void gdk_input_set_extension_events (GdkWindow *window,
GdkDevice *gdk_device_get_core_pointer (void); GdkDevice *gdk_device_get_core_pointer (void);
#endif #endif
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_INPUT_H__ */ #endif /* __GDK_INPUT_H__ */

4
gdk/gdkinternals.h
View File

@ -383,8 +383,6 @@ void _gdk_windowing_gc_get_background (GdkGC *gc,
void _gdk_image_exit (void); void _gdk_image_exit (void);
void _gdk_windowing_exit (void); void _gdk_windowing_exit (void);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_INTERNALS_H__ */ #endif /* __GDK_INTERNALS_H__ */

8
gdk/gdkkeys.h
View File

@ -29,9 +29,7 @@
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
typedef struct _GdkKeymapKey GdkKeymapKey; typedef struct _GdkKeymapKey GdkKeymapKey;
@ -120,8 +118,6 @@ guint32 gdk_keyval_to_unicode (guint keyval) G_GNUC_CONST;
guint gdk_unicode_to_keyval (guint32 wc) G_GNUC_CONST; guint gdk_unicode_to_keyval (guint32 wc) G_GNUC_CONST;
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_KEYS_H__ */ #endif /* __GDK_KEYS_H__ */

8
gdk/gdkpango.h
View File

@ -22,9 +22,7 @@
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/* Pango interaction */ /* Pango interaction */
@ -151,8 +149,6 @@ struct _GdkPangoAttrEmbossed
PangoAttribute *gdk_pango_attr_stipple_new (GdkBitmap *stipple); PangoAttribute *gdk_pango_attr_stipple_new (GdkBitmap *stipple);
PangoAttribute *gdk_pango_attr_embossed_new (gboolean embossed); PangoAttribute *gdk_pango_attr_embossed_new (gboolean embossed);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_FONT_H__ */ #endif /* __GDK_FONT_H__ */

8
gdk/gdkpixmap.h
View File

@ -4,9 +4,7 @@
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#include <gdk/gdkdrawable.h> #include <gdk/gdkdrawable.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
typedef struct _GdkPixmapObject GdkPixmapObject; typedef struct _GdkPixmapObject GdkPixmapObject;
typedef struct _GdkPixmapObjectClass GdkPixmapObjectClass; typedef struct _GdkPixmapObjectClass GdkPixmapObjectClass;
@ -92,8 +90,6 @@ GdkPixmap* gdk_pixmap_lookup_for_display (GdkDisplay *display,
#define gdk_pixmap_unref gdk_drawable_unref #define gdk_pixmap_unref gdk_drawable_unref
#endif /* GDK_DISABLE_DEPRECATED */ #endif /* GDK_DISABLE_DEPRECATED */
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_PIXMAP_H__ */ #endif /* __GDK_PIXMAP_H__ */

8
gdk/gdkproperty.h
View File

@ -3,9 +3,7 @@
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
typedef enum typedef enum
{ {
@ -90,8 +88,6 @@ gboolean gdk_utf8_to_compound_text_for_display (GdkDisplay *display,
void gdk_free_text_list (gchar **list); void gdk_free_text_list (gchar **list);
void gdk_free_compound_text (guchar *ctext); void gdk_free_compound_text (guchar *ctext);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_PROPERTY_H__ */ #endif /* __GDK_PROPERTY_H__ */

8
gdk/gdkregion.h
View File

@ -3,9 +3,7 @@
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/* GC fill rule for polygons /* GC fill rule for polygons
* EvenOddRule * EvenOddRule
@ -79,9 +77,7 @@ void gdk_region_spans_intersect_foreach (GdkRegion *region,
GdkSpanFunc function, GdkSpanFunc function,
gpointer data); gpointer data);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_REGION_H__ */ #endif /* __GDK_REGION_H__ */

8
gdk/gdkrgb.h
View File

@ -29,9 +29,7 @@
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
typedef struct _GdkRgbCmap GdkRgbCmap; typedef struct _GdkRgbCmap GdkRgbCmap;
@ -140,9 +138,7 @@ gboolean gdk_rgb_ditherable (void);
gboolean gdk_rgb_colormap_ditherable (GdkColormap *cmap); gboolean gdk_rgb_colormap_ditherable (GdkColormap *cmap);
#endif #endif
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_RGB_H__ */ #endif /* __GDK_RGB_H__ */

8
gdk/gdkselection.h
View File

@ -3,9 +3,7 @@
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/* Predefined atoms relating to selections. In general, one will need to use /* Predefined atoms relating to selections. In general, one will need to use
* gdk_intern_atom * gdk_intern_atom
@ -78,8 +76,6 @@ void gdk_selection_send_notify_for_display (GdkDisplay *display,
GdkAtom property, GdkAtom property,
guint32 time_); guint32 time_);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_SELECTION_H__ */ #endif /* __GDK_SELECTION_H__ */

8
gdk/gdktypes.h
View File

@ -56,9 +56,7 @@
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/* Type definitions for the basic structures. /* Type definitions for the basic structures.
@ -202,9 +200,7 @@ struct _GdkSpan
gint width; gint width;
}; };
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_TYPES_H__ */ #endif /* __GDK_TYPES_H__ */

8
gdk/gdkwindow.h
View File

@ -5,9 +5,7 @@
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#include <gdk/gdkevents.h> #include <gdk/gdkevents.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
typedef struct _GdkGeometry GdkGeometry; typedef struct _GdkGeometry GdkGeometry;
typedef struct _GdkWindowAttr GdkWindowAttr; typedef struct _GdkWindowAttr GdkWindowAttr;
@ -587,8 +585,6 @@ GdkWindow *gdk_get_default_root_window (void);
gdk_draw_pixmap(drawable,gc,source_drawable,source_x,source_y,x,y,width,height) gdk_draw_pixmap(drawable,gc,source_drawable,source_x,source_y,x,y,width,height)
#endif /* GDK_DISABLE_DEPRECATED */ #endif /* GDK_DISABLE_DEPRECATED */
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_WINDOW_H__ */ #endif /* __GDK_WINDOW_H__ */

8
gdk/win32/gdkdrawable-win32.h
View File

@ -30,9 +30,7 @@
#include <gdk/gdkdrawable.h> #include <gdk/gdkdrawable.h>
#include <gdk/win32/gdkwin32.h> #include <gdk/win32/gdkwin32.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/* Drawable implementation for Win32 /* Drawable implementation for Win32
*/ */
@ -72,8 +70,6 @@ HDC _gdk_win32_drawable_acquire_dc (GdkDrawable *drawable);
void _gdk_win32_drawable_release_dc (GdkDrawable *drawable); void _gdk_win32_drawable_release_dc (GdkDrawable *drawable);
void _gdk_win32_drawable_finish (GdkDrawable *drawable); void _gdk_win32_drawable_finish (GdkDrawable *drawable);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_DRAWABLE_WIN32_H__ */ #endif /* __GDK_DRAWABLE_WIN32_H__ */

8
gdk/win32/gdkpixmap-win32.h
View File

@ -30,9 +30,7 @@
#include <gdk/win32/gdkdrawable-win32.h> #include <gdk/win32/gdkdrawable-win32.h>
#include <gdk/gdkpixmap.h> #include <gdk/gdkpixmap.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/* Pixmap implementation for Win32 /* Pixmap implementation for Win32
*/ */
@ -64,8 +62,6 @@ struct _GdkPixmapImplWin32Class
GType _gdk_pixmap_impl_win32_get_type (void); GType _gdk_pixmap_impl_win32_get_type (void);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_PIXMAP_WIN32_H__ */ #endif /* __GDK_PIXMAP_WIN32_H__ */

8
gdk/win32/gdkwindow-win32.h
View File

@ -29,9 +29,7 @@
#include <gdk/win32/gdkdrawable-win32.h> #include <gdk/win32/gdkdrawable-win32.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
typedef struct _GdkWin32PositionInfo GdkWin32PositionInfo; typedef struct _GdkWin32PositionInfo GdkWin32PositionInfo;
@ -96,8 +94,6 @@ struct _GdkWindowImplWin32Class
GType _gdk_window_impl_win32_get_type (void); GType _gdk_window_impl_win32_get_type (void);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_WINDOW_WIN32_H__ */ #endif /* __GDK_WINDOW_WIN32_H__ */

8
gdk/x11/MwmUtil.h
View File

@ -36,9 +36,7 @@
#include <X11/Xmd.h> #include <X11/Xmd.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif
typedef struct { typedef struct {
unsigned long flags; unsigned long flags;
@ -133,8 +131,6 @@ typedef PropMotifWmInfo PropMwmInfo;
#define PROP_MOTIF_WM_INFO_ELEMENTS 2 #define PROP_MOTIF_WM_INFO_ELEMENTS 2
#define PROP_MWM_INFO_ELEMENTS PROP_MOTIF_WM_INFO_ELEMENTS #define PROP_MWM_INFO_ELEMENTS PROP_MOTIF_WM_INFO_ELEMENTS
#ifdef __cplusplus G_END_DECLS
}
#endif
#endif /* MWMUTIL_H_INCLUDED */ #endif /* MWMUTIL_H_INCLUDED */

8
gdk/x11/gdkdrawable-x11.h
View File

@ -34,9 +34,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/Xrender.h> #include <X11/extensions/Xrender.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/* Drawable implementation for X11 /* Drawable implementation for X11
*/ */
@ -95,8 +93,6 @@ void _gdk_x11_convert_to_format (guchar *src_buf,
void _gdk_x11_drawable_finish (GdkDrawable *drawable); void _gdk_x11_drawable_finish (GdkDrawable *drawable);
void _gdk_x11_drawable_update_size (GdkDrawable *drawable); void _gdk_x11_drawable_update_size (GdkDrawable *drawable);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_DRAWABLE_X11_H__ */ #endif /* __GDK_DRAWABLE_X11_H__ */

8
gdk/x11/gdkpixmap-x11.h
View File

@ -30,9 +30,7 @@
#include <gdk/x11/gdkdrawable-x11.h> #include <gdk/x11/gdkdrawable-x11.h>
#include <gdk/gdkpixmap.h> #include <gdk/gdkpixmap.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/* Pixmap implementation for X11 /* Pixmap implementation for X11
*/ */
@ -65,8 +63,6 @@ struct _GdkPixmapImplX11Class
GType gdk_pixmap_impl_x11_get_type (void); GType gdk_pixmap_impl_x11_get_type (void);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GDK_PIXMAP_X11_H__ */ #endif /* __GDK_PIXMAP_X11_H__ */