X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgtk-custom-hruler.h;h=5213e3030ca45d73cf846211dbf3e95c41ae35bf;hb=fcbb78b010a53686d1c350864d731a73bd204956;hp=a8c3affeb198543561365d03b253e33a7b7de227;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/gtk-custom-hruler.h b/gtk2_ardour/gtk-custom-hruler.h
index a8c3affeb1..5213e3030c 100644
--- a/gtk2_ardour/gtk-custom-hruler.h
+++ b/gtk2_ardour/gtk-custom-hruler.h
@@ -21,7 +21,7 @@
  * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 /* modified by andreas meyer <hexx3000@gmx.de> */
@@ -34,14 +34,12 @@
 #include "gtk-custom-ruler.h"
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
-#define GTK_CUSTOM_HRULER(obj)          GTK_CHECK_CAST (obj, gtk_custom_hruler_get_type (), GtkCustomHRuler)
-#define GTK_CUSTOM_HRULER_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_custom_hruler_get_type (), GtkCustomHRulerClass)
-#define GTK_IS_CUSTOM_HRULER(obj)       GTK_CHECK_TYPE (obj, gtk_custom_hruler_get_type ())
+#define GTK_CUSTOM_HRULER(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_custom_hruler_get_type (), GtkCustomHRuler)
+#define GTK_CUSTOM_HRULER_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, gtk_custom_hruler_get_type (), GtkCustomHRulerClass)
+#define GTK_IS_CUSTOM_HRULER(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_custom_hruler_get_type ())
 
 
 typedef struct _GtkCustomHRuler       GtkCustomHRuler;
@@ -58,13 +56,11 @@ struct _GtkCustomHRulerClass
 };
 
 
-guint      gtk_custom_hruler_get_type (void);
+GType      gtk_custom_hruler_get_type (void);
 GtkWidget* gtk_custom_hruler_new      (void);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_CUSTOM_HRULER_H__ */