* 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/.
*/
+#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_PROGRESS_BAR_H__
#define __GTK_PROGRESS_BAR_H__
#include <gtk/gtkprogress.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
#define GTK_TYPE_PROGRESS_BAR (gtk_progress_bar_get_type ())
-#define GTK_PROGRESS_BAR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBar))
-#define GTK_PROGRESS_BAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
-#define GTK_IS_PROGRESS_BAR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PROGRESS_BAR))
-#define GTK_IS_PROGRESS_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS_BAR))
-#define GTK_PROGRESS_BAR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
+#define GTK_PROGRESS_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBar))
+#define GTK_PROGRESS_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
+#define GTK_IS_PROGRESS_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PROGRESS_BAR))
+#define GTK_IS_PROGRESS_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS_BAR))
+#define GTK_PROGRESS_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
typedef struct _GtkProgressBar GtkProgressBar;
{
GtkProgress progress;
- GtkProgressBarStyle bar_style;
- GtkProgressBarOrientation orientation;
+ GtkProgressBarStyle GSEAL (bar_style);
+ GtkProgressBarOrientation GSEAL (orientation);
- guint blocks;
- gint in_block;
+ guint GSEAL (blocks);
+ gint GSEAL (in_block);
- gint activity_pos;
- guint activity_step;
- guint activity_blocks;
+ gint GSEAL (activity_pos);
+ guint GSEAL (activity_step);
+ guint GSEAL (activity_blocks);
- gfloat pulse_fraction;
-
- guint activity_dir : 1;
+ gdouble GSEAL (pulse_fraction);
+
+ guint GSEAL (activity_dir) : 1;
+ guint GSEAL (ellipsize) : 3;
+ guint GSEAL (dirty) : 1;
};
struct _GtkProgressBarClass
{
GtkProgressClass parent_class;
+
+ /* Padding for future expansion */
+ void (*_gtk_reserved1) (void);
+ void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
};
-GtkType gtk_progress_bar_get_type (void) G_GNUC_CONST;
+GType gtk_progress_bar_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_progress_bar_new (void);
/*
* GtkProgress/GtkProgressBar had serious problems in GTK 1.2.
- *
- * - Only 3 or 4 functions are really needed for 95% of progress
- * interfaces; GtkProgress[Bar] had about 25 functions, and
+ *
+ * - Only 3 or 4 functions are really needed for 95% of progress
+ * interfaces; GtkProgress[Bar] had about 25 functions, and
* didn't even include these 3 or 4.
- * - In activity mode, the API involves setting the adjustment
- * to any random value, just to have the side effect of
+ * - In activity mode, the API involves setting the adjustment
+ * to any random value, just to have the side effect of
* calling the progress bar update function - the adjustment
* is totally ignored in activity mode
- * - You set the activity step as a pixel value, which means to
- * set the activity step you basically need to connect to
+ * - You set the activity step as a pixel value, which means to
+ * set the activity step you basically need to connect to
* size_allocate
- * - There are ctree_set_expander_style()-functions, to randomly
+ * - There are ctree_set_expander_style()-functions, to randomly
* change look-and-feel for no good reason
- * - The split between GtkProgress and GtkProgressBar makes no sense
+ * - The split between GtkProgress and GtkProgressBar makes no sense
* to me whatsoever.
- *
+ *
* This was a big wart on GTK and made people waste lots of time,
* both learning and using the interface.
- *
+ *
* So, I have added what I feel is the correct API, and marked all the
* rest deprecated. However, the changes are 100% backward-compatible and
* should break no existing code.
*
- * The following 5 functions are the new programming interface.
+ * The following 9 functions are the new programming interface.
*/
void gtk_progress_bar_pulse (GtkProgressBar *pbar);
void gtk_progress_bar_set_text (GtkProgressBar *pbar,
const gchar *text);
void gtk_progress_bar_set_fraction (GtkProgressBar *pbar,
- gfloat fraction);
+ gdouble fraction);
void gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar,
- gfloat fraction);
+ gdouble fraction);
void gtk_progress_bar_set_orientation (GtkProgressBar *pbar,
GtkProgressBarOrientation orientation);
-gchar* gtk_progress_bar_get_text (GtkProgressBar *pbar);
-gfloat gtk_progress_bar_get_fraction (GtkProgressBar *pbar);
-gfloat gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
+G_CONST_RETURN gchar* gtk_progress_bar_get_text (GtkProgressBar *pbar);
+gdouble gtk_progress_bar_get_fraction (GtkProgressBar *pbar);
+gdouble gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
GtkProgressBarOrientation gtk_progress_bar_get_orientation (GtkProgressBar *pbar);
+void gtk_progress_bar_set_ellipsize (GtkProgressBar *pbar,
+ PangoEllipsizeMode mode);
+PangoEllipsizeMode gtk_progress_bar_get_ellipsize (GtkProgressBar *pbar);
+
+#ifndef GTK_DISABLE_DEPRECATED
/* Everything below here is deprecated */
GtkWidget* gtk_progress_bar_new_with_adjustment (GtkAdjustment *adjustment);
void gtk_progress_bar_set_activity_blocks (GtkProgressBar *pbar,
guint blocks);
void gtk_progress_bar_update (GtkProgressBar *pbar,
- gfloat percentage);
+ gdouble percentage);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+#endif /* GTK_DISABLE_DEPRECATED */
+G_END_DECLS
#endif /* __GTK_PROGRESS_BAR_H__ */
projects / ~andy / gtk / blobdiff