-; (defclass progress widget
-; :slots
-; ((activity-mode :read-method :arg :type boolean)
-; (show-text :read-method :arg :type boolean)
-; (text-xalign :access-method :arg :type single-float)
-; (text-yalign :access-method :arg :type single-float)
-; ;; slots not accessible through the arg mechanism
-; (format-string :type string)
-; (adjustment :type adjustment)
-; (percentage :c-reader "gtk_progress_get_current_percentage"
-; :type single-float)
-; (value :type single-float)
-; (text :c-reader "gtk_progress_get_current_text"
-; :read-only t :type string)))
-
-; (defclass progress-bar progress
-; :slots
-; ((adjustment :c-writer "gtk_progress_set_adjustment"
-; :read-method :arg :type adjustment)
-; (orientation :read-method :arg :type progress-bar-orientation)
-; (bar-style :read-method :arg :accessor progress-bar-style
-; :type progress-bar-style)
-; (activity-step :read-method :arg :type unsigned-int)
-; (activity-blocks :read-method :arg :type unsigned-int)
-; (discrete-blocks :read-method :arg :type unsigned-int)))
+(defclass progress (widget)
+ ((activity-mode
+ :allocation :param
+ :accessor progress-activity-mode-p
+ :initarg :activity-mode
+ :type boolean)
+ (show-text
+ :allocation :param
+ :accessor progress-show-text-p
+ :initarg :show-text
+ :type boolean)
+ (text-xalign
+ :allocation :param
+ :accessor progress-text-xalign
+ :initarg :text-xalign
+ :type single-float)
+ (text-yalign
+ :allocation :param
+ :accessor progress-text-yalign
+ :initarg :text-yalign
+ :type single-float)
+ (format-string
+ :allocation :virtual
+ :location ("gtk_progress_get_format_string"
+ "gtk_progress_set_format_string")
+ :accessor progress-format-string
+ :initarg :format-string
+ :type string)
+ (adjustment
+ :allocation :virtual
+ :location ("gtk_progress_get_adjustment"
+ "gtk_progress_set_adjustment")
+ :accessor progress-adjustment
+ :initarg :adjustment
+ :type adjustment)
+ (percentage
+ :allocation :virtual
+ :location ("gtk_progress_get_current_percentage"
+ "gtk_progress_set_percentage")
+ :accessor progress-percentage
+ :initarg :percentage
+ :type single-float)
+ (value
+ :allocation :virtual
+ :location ("gtk_progress_get_value" "gtk_progress_set_value")
+ :accessor progress-value
+ :initarg :value
+ :type single-float)
+ (text
+ :allocation :virtual
+ :location ("gtk_progress_get_current_text")
+ :reader progress-text
+ :type string))
+ (:metaclass widget-class)
+ (:alien-name "GtkProgress"))
+
+
+(defclass progress-bar (progress)
+ ((orientation
+ :allocation :param
+ :accessor progress-bar-orientation
+ :initarg :orientation
+ :type progress-bar-orientation)
+ (bar-style
+ :allocation :param
+ :accessor progress-bar-style
+ :initarg :bar-style
+ :type progress-bar-style)
+ (activity-step
+ :allocation :param
+ :accessor progress-bar-activity-step
+ :initarg :activity-step
+ :type unsigned-int)
+ (activity-blocks
+ :allocation :param
+ :accessor progress-bar-activity-blocks
+ :initarg :activity-blocks
+ :type unsigned-int)
+ (discrete-blocks
+ :allocation :param
+ :accessor progress-bar-discrete-blocks
+ :initarg :discrete-blocks
+ :type unsigned-int)
+ (fraction
+ :allocation :param
+ :accessor progress-bar-fraction
+ :initarg :fraction
+ :type single-float)
+ (pulse-step
+ :allocation :param
+ :accessor progress-bar-pulse-step
+ :initarg :pulse-step
+ :type single-float)
+ (text
+ :allocation :virtual
+ :location ("gtk_progress_get_current_text" "gtk_progress_bar_set_text")
+ :accessor progress-bar-text
+ :type string))
+ (:metaclass widget-class)
+ (:alien-name "GtkProgressBar"))