2011-10-07 [colin] 3.7.10cvs23

[claws.git] / src / gtk / gtkshruler.h

diff --git a/src/gtk/gtkshruler.h b/src/gtk/gtkshruler.h
index bf7e0cde5002fd60c3756088f890a5d65fec33aa..c1182e5b4d9feee3503bc21ea16a64fcad63b0c3 100644 (file)
--- a/src/gtk/gtkshruler.h
+++ b/src/gtk/gtkshruler.h
@@ -1,10 +1,10 @@
 /* GTKSHRuler
 /* GTKSHRuler

- * Copyright (C) 2000-2004 Alfons Hoogervorst & The Sylpheed Claws Team
+ * Copyright (C) 2000-2011 Alfons Hoogervorst & The Claws Mail Team

  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either

- * version 2 of the License, or (at your option) any later version.
+ * version 3 of the License, or (at your option) any later version.

  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -12,9 +12,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public

- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.

  */
 
 #ifndef __GTK_SHRULER_H__
  */
 
 #ifndef __GTK_SHRULER_H__


@@ -22,17 +20,18 @@
 
 
 #include <gdk/gdk.h>
 
 
 #include <gdk/gdk.h>

-#include <gtk/gtkhruler.h>
+#include <gtk/gtk.h>

 
 

+#if !GTK_CHECK_VERSION(2,24,0)

 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 

-#define GTK_SHRULER(obj)            (GTK_CHECK_CAST ((obj), gtk_shruler_get_type (), GtkSHRuler))
-#define GTK_SHRULER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), gtk_shruler_get_type (), GtkSHRulerClass))
-#define GTK_IS_SHRULER(obj)         (GTK_CHECK_TYPE ((obj), gtk_shruler_get_type ()))
+#define GTK_SHRULER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), gtk_shruler_get_type (), GtkSHRuler))
+#define GTK_SHRULER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), gtk_shruler_get_type (), GtkSHRulerClass))
+#define GTK_IS_SHRULER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), gtk_shruler_get_type ()))

 
 
 typedef struct _GtkSHRuler        GtkSHRuler;
 
 
 typedef struct _GtkSHRuler        GtkSHRuler;


@@ -51,9 +50,6 @@ struct _GtkSHRulerClass
 
 GType      gtk_shruler_get_type (void);
 GtkWidget* gtk_shruler_new      (void);
 
 GType      gtk_shruler_get_type (void);
 GtkWidget* gtk_shruler_new      (void);

-void       gtk_shruler_set_pos  (GtkSHRuler *ruler,
-                                gfloat      pos);
-

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }


@@ -61,3 +57,4 @@ void       gtk_shruler_set_pos  (GtkSHRuler *ruler,
 
 
 #endif /* __GTK_SHRULER_H__ */
 
 
 #endif /* __GTK_SHRULER_H__ */

+#endif