X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkprogressbar.h;h=9ae044b49cdea82c962597427519a14eb3ddbc29;hb=b5ee44b419a5daa01605af8cd419b03d9e21926c;hp=c2fe308d74b4957e91690d4675354f085c860b43;hpb=5e0dfed135c715346e6bf40df3eab501771ab9fd;p=~andy%2Fgtk

diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index c2fe308d7..9ae044b49 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.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,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_PROGRESS_BAR_H__
+#define __GTK_PROGRESS_BAR_H__
+
 #if !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/gtkwidget.h>
 
 G_BEGIN_DECLS
@@ -43,58 +41,27 @@ G_BEGIN_DECLS
 #define GTK_PROGRESS_BAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
 
 
-typedef struct _GtkProgressBar       GtkProgressBar;
-typedef struct _GtkProgressBarClass  GtkProgressBarClass;
-
-typedef enum
-{
-  GTK_PROGRESS_LEFT_TO_RIGHT,
-  GTK_PROGRESS_RIGHT_TO_LEFT,
-  GTK_PROGRESS_BOTTOM_TO_TOP,
-  GTK_PROGRESS_TOP_TO_BOTTOM
-} GtkProgressBarOrientation;
+typedef struct _GtkProgressBar              GtkProgressBar;
+typedef struct _GtkProgressBarPrivate       GtkProgressBarPrivate;
+typedef struct _GtkProgressBarClass         GtkProgressBarClass;
 
 struct _GtkProgressBar
 {
   GtkWidget parent;
 
-  GdkPixmap     *GSEAL (offscreen_pixmap);
-
-  GtkProgressBarOrientation GSEAL (orientation);
-
-  guint GSEAL (blocks);
-  gint  GSEAL (in_block);
-
-  gint  GSEAL (activity_pos);
-  guint GSEAL (activity_step);
-  guint GSEAL (activity_blocks);
-
-  gdouble GSEAL (pulse_fraction);
-
-  guint GSEAL (activity_dir) : 1;
-  guint GSEAL (ellipsize) : 3;
-  guint GSEAL (dirty) : 1;
-  guint GSEAL (activity_mode) : 1;
-  guint GSEAL (show_text) : 1;
+  /*< private >*/
+  GtkProgressBarPrivate *priv;
 };
 
 struct _GtkProgressBarClass
 {
   GtkWidgetClass parent_class;
 
-  void (* paint)            (GtkProgressBar *progress);
-  void (* update)           (GtkProgressBar *progress);
-  void (* act_mode_enter)   (GtkProgressBar *progress);
-
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-  void (*_gtk_reserved8) (void);
 };
 
 
@@ -109,14 +76,14 @@ void       gtk_progress_bar_set_fraction         (GtkProgressBar *pbar,
 
 void       gtk_progress_bar_set_pulse_step       (GtkProgressBar *pbar,
                                                   gdouble         fraction);
-void       gtk_progress_bar_set_orientation      (GtkProgressBar *pbar,
-                                                  GtkProgressBarOrientation orientation);
+void       gtk_progress_bar_set_inverted         (GtkProgressBar *pbar,
+                                                  gboolean        inverted);
 
-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);
+const 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);
+gboolean           gtk_progress_bar_get_inverted    (GtkProgressBar *pbar);
 void               gtk_progress_bar_set_ellipsize (GtkProgressBar     *pbar,
                                                    PangoEllipsizeMode  mode);
 PangoEllipsizeMode gtk_progress_bar_get_ellipsize (GtkProgressBar     *pbar);