X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkscale.h;h=a54b38e9d77192b6494bae1980a3e793a190597d;hb=1865b9a1116d166c9abc5c75f5d01270574007c5;hp=16b34267f7cb67edc7b32cf4d0ae60dced7cc348;hpb=133ebd1c4740d03e43ca00b200ab524f46e2a07d;p=~andy%2Fgtk

diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index 16b34267f..a54b38e9d 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -12,9 +12,7 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,15 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_SCALE_H__
 #define __GTK_SCALE_H__
 
 
-#include <gdk/gdk.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkrange.h>
 
 
@@ -46,16 +43,16 @@ G_BEGIN_DECLS
 #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 GSEAL(digits);
-  guint GSEAL(draw_value : 1);
-  guint GSEAL(value_pos : 2);
+  /*< private >*/
+  GtkScalePrivate *priv;
 };
 
 struct _GtkScaleClass
@@ -70,35 +67,46 @@ struct _GtkScaleClass
   void (* get_layout_offsets) (GtkScale *scale,
                                gint     *x,
                                gint     *y);
+
   /* 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;
-
-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);
-
-PangoLayout     *gtk_scale_get_layout        (GtkScale        *scale);
-void            gtk_scale_get_layout_offsets (GtkScale        *scale,
-					      gint            *x,
-					      gint            *y);
-void    _gtk_scale_clear_layout    (GtkScale        *scale);
-
-void    _gtk_scale_get_value_size  (GtkScale        *scale,
-                                    gint            *width,
-                                    gint            *height);
-gchar  *_gtk_scale_format_value    (GtkScale        *scale,
-                                    gdouble          value);
+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