X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkscale.h;h=a54b38e9d77192b6494bae1980a3e793a190597d;hb=3c04597306a918317cb96d6c267fc73a798c04e4;hp=efa33c6d1cd9d6b09573016fa1b5c42797aad049;hpb=e1bb381e164eb3db6e5caa573a3244f198e87786;p=~andy%2Fgtk
diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index efa33c6d1..a54b38e9d 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -12,49 +12,47 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser 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 .
*/
/*
* Modified by the GTK+ Team and others 1997-2000. 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/.
*/
#ifndef __GTK_SCALE_H__
#define __GTK_SCALE_H__
-#include
-#include
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+#include
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define GTK_TYPE_SCALE (gtk_scale_get_type ())
-#define GTK_SCALE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_SCALE, GtkScale))
-#define GTK_SCALE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE, GtkScaleClass))
-#define GTK_IS_SCALE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_SCALE))
-#define GTK_IS_SCALE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCALE))
-#define GTK_SCALE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SCALE, GtkScaleClass))
+#define GTK_SCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE, GtkScale))
+#define GTK_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE, GtkScaleClass))
+#define GTK_IS_SCALE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE))
+#define GTK_IS_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCALE))
+#define GTK_SCALE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCALE, GtkScaleClass))
-typedef struct _GtkScale GtkScale;
-typedef struct _GtkScaleClass GtkScaleClass;
+typedef struct _GtkScale GtkScale;
+typedef struct _GtkScalePrivate GtkScalePrivate;
+typedef struct _GtkScaleClass GtkScaleClass;
struct _GtkScale
{
GtkRange range;
- gint digits;
- guint draw_value : 1;
- guint value_pos : 2;
+ /*< private >*/
+ GtkScalePrivate *priv;
};
struct _GtkScaleClass
@@ -62,37 +60,55 @@ struct _GtkScaleClass
GtkRangeClass parent_class;
gchar* (* format_value) (GtkScale *scale,
- gdouble value);
-
- void (* draw_value) (GtkScale *scale);
-};
-
-GtkType gtk_scale_get_type (void) G_GNUC_CONST;
+ gdouble value);
-void gtk_scale_set_digits (GtkScale *scale,
- gint digits);
-gint gtk_scale_get_digits (GtkScale *scale);
-void gtk_scale_set_draw_value (GtkScale *scale,
- gboolean draw_value);
-gboolean gtk_scale_get_draw_value (GtkScale *scale);
-void gtk_scale_set_value_pos (GtkScale *scale,
- GtkPositionType pos);
-GtkPositionType gtk_scale_get_value_pos (GtkScale *scale);
-
-
-void _gtk_scale_get_value_size (GtkScale *scale,
- gint *width,
- gint *height);
-gchar *_gtk_scale_format_value (GtkScale *scale,
- gdouble value);
+ void (* draw_value) (GtkScale *scale);
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_scale_value_width gtk_scale_get_value_width
-#endif /* GTK_DISABLE_DEPRECATED */
+ void (* get_layout_offsets) (GtkScale *scale,
+ gint *x,
+ gint *y);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+ /* Padding for future expansion */
+ void (*_gtk_reserved1) (void);
+ void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
+};
+GType gtk_scale_get_type (void) G_GNUC_CONST;
+GtkWidget * gtk_scale_new (GtkOrientation orientation,
+ GtkAdjustment *adjustment);
+GtkWidget * gtk_scale_new_with_range (GtkOrientation orientation,
+ gdouble min,
+ gdouble max,
+ gdouble step);
+void gtk_scale_set_digits (GtkScale *scale,
+ gint digits);
+gint gtk_scale_get_digits (GtkScale *scale);
+void gtk_scale_set_draw_value (GtkScale *scale,
+ gboolean draw_value);
+gboolean gtk_scale_get_draw_value (GtkScale *scale);
+GDK_AVAILABLE_IN_3_4
+void gtk_scale_set_has_origin (GtkScale *scale,
+ gboolean has_origin);
+GDK_AVAILABLE_IN_3_4
+gboolean gtk_scale_get_has_origin (GtkScale *scale);
+void gtk_scale_set_value_pos (GtkScale *scale,
+ GtkPositionType pos);
+GtkPositionType gtk_scale_get_value_pos (GtkScale *scale);
+
+PangoLayout * gtk_scale_get_layout (GtkScale *scale);
+void gtk_scale_get_layout_offsets (GtkScale *scale,
+ gint *x,
+ gint *y);
+
+void gtk_scale_add_mark (GtkScale *scale,
+ gdouble value,
+ GtkPositionType position,
+ const gchar *markup);
+void gtk_scale_clear_marks (GtkScale *scale);
+
+
+G_END_DECLS
#endif /* __GTK_SCALE_H__ */