Tue Mar 16 17:43:33 1999 Tim Janik <timj@gtk.org>

[~andy/gtk] / gtk / gtkprogressbar.h

diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index 8cb0c2336d091517afcb4056afc9f260b29d8dd9..5a5d9d1fc26984cf2886679697ee4711f355f8fb 100644 (file)
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -16,12 +16,20 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * 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/. 
+ */
+
 #ifndef __GTK_PROGRESS_BAR_H__
 #define __GTK_PROGRESS_BAR_H__
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtkprogress.h>
 
 
 #ifdef __cplusplus
@@ -29,32 +37,67 @@ extern "C" {
 #endif /* __cplusplus */
 
 
-#define GTK_PROGRESS_BAR(obj)          GTK_CHECK_CAST (obj, gtk_progress_bar_get_type (), GtkProgressBar)
-#define GTK_PROGRESS_BAR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_progress_bar_get_type (), GtkProgressBarClass)
-#define GTK_IS_PROGRESS_BAR(obj)       GTK_CHECK_TYPE (obj, gtk_progress_bar_get_type ())
+#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))
 
 
 typedef struct _GtkProgressBar       GtkProgressBar;
 typedef struct _GtkProgressBarClass  GtkProgressBarClass;
 
+typedef enum
+{
+  GTK_PROGRESS_CONTINUOUS,
+  GTK_PROGRESS_DISCRETE
+} GtkProgressBarStyle;
+
+typedef enum
+{
+  GTK_PROGRESS_LEFT_TO_RIGHT,
+  GTK_PROGRESS_RIGHT_TO_LEFT,
+  GTK_PROGRESS_BOTTOM_TO_TOP,
+  GTK_PROGRESS_TOP_TO_BOTTOM
+} GtkProgressBarOrientation;
+
 struct _GtkProgressBar
 {
-  GtkWidget widget;
+  GtkProgress progress;
+
+  GtkProgressBarStyle bar_style;
+  GtkProgressBarOrientation orientation;
+
+  guint blocks;
+  gint  in_block;
 
-  GdkPixmap *offscreen_pixmap;
-  gfloat percentage;
+  gint  activity_pos;
+  guint activity_step;
+  guint activity_blocks;
+  guint activity_dir : 1;
 };
 
 struct _GtkProgressBarClass
 {
-  GtkWidgetClass parent_class;
+  GtkProgressClass parent_class;
 };
 
 
-guint      gtk_progress_bar_get_type (void);
-GtkWidget* gtk_progress_bar_new      (void);
-void       gtk_progress_bar_update   (GtkProgressBar *pbar,
-                                     gfloat          percentage);
+GtkType    gtk_progress_bar_get_type             (void);
+GtkWidget* gtk_progress_bar_new                  (void);
+GtkWidget* gtk_progress_bar_new_with_adjustment  (GtkAdjustment  *adjustment);
+void       gtk_progress_bar_set_bar_style        (GtkProgressBar *pbar,
+                                                 GtkProgressBarStyle style);
+void       gtk_progress_bar_set_discrete_blocks  (GtkProgressBar *pbar,
+                                                 guint           blocks);
+void       gtk_progress_bar_set_activity_step    (GtkProgressBar *pbar,
+                                                  guint           step);
+void       gtk_progress_bar_set_activity_blocks  (GtkProgressBar *pbar,
+                                                 guint           blocks);
+void       gtk_progress_bar_set_orientation      (GtkProgressBar *pbar,
+                                                 GtkProgressBarOrientation orientation);
+void       gtk_progress_bar_update               (GtkProgressBar *pbar,
+                                                 gfloat          percentage);
 
 
 #ifdef __cplusplus