Do without GtkSelectionWindow

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

diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h
index 6ba51b229a4f13b75f8a74d0330f168fbe3be613..7aff9ac6cf27abf753f27673deda900f233debc8 100644 (file)
--- a/gtk/gtkscalebutton.h
+++ b/gtk/gtkscalebutton.h
@@ -21,9 +21,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/>.
  */
 
 /*
@@ -33,13 +31,13 @@
  * 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_BUTTON_H__
 #define __GTK_SCALE_BUTTON_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbutton.h>
 
 G_BEGIN_DECLS
@@ -59,11 +57,8 @@ struct _GtkScaleButton
 {
   GtkButton parent;
 
-  GtkWidget *GSEAL (plus_button);
-  GtkWidget *GSEAL (minus_button);
-
   /*< private >*/
-  GtkScaleButtonPrivate *GSEAL (priv);
+  GtkScaleButtonPrivate *priv;
 };
 
 struct _GtkScaleButtonClass
@@ -81,24 +76,23 @@ struct _GtkScaleButtonClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_scale_button_get_type        (void) G_GNUC_CONST;
-GtkWidget *      gtk_scale_button_new             (GtkIconSize      size,
-                                                   gdouble          min,
-                                                   gdouble          max,
-                                                   gdouble          step,
-                                                   const gchar    **icons);
-void             gtk_scale_button_set_icons       (GtkScaleButton  *button,
-                                                   const gchar    **icons);
-gdouble          gtk_scale_button_get_value       (GtkScaleButton  *button);
-void             gtk_scale_button_set_value       (GtkScaleButton  *button,
-                                                   gdouble          value);
-GtkAdjustment *  gtk_scale_button_get_adjustment  (GtkScaleButton  *button);
-void             gtk_scale_button_set_adjustment  (GtkScaleButton  *button,
-                                                   GtkAdjustment   *adjustment);
-GtkOrientation   gtk_scale_button_get_orientation (GtkScaleButton  *button);
-void             gtk_scale_button_set_orientation (GtkScaleButton  *button,
-                                                   GtkOrientation   orientation);
-GtkWidget *      gtk_scale_button_get_popup      (GtkScaleButton *button);
+GType            gtk_scale_button_get_type         (void) G_GNUC_CONST;
+GtkWidget *      gtk_scale_button_new              (GtkIconSize      size,
+                                                    gdouble          min,
+                                                    gdouble          max,
+                                                    gdouble          step,
+                                                    const gchar    **icons);
+void             gtk_scale_button_set_icons        (GtkScaleButton  *button,
+                                                    const gchar    **icons);
+gdouble          gtk_scale_button_get_value        (GtkScaleButton  *button);
+void             gtk_scale_button_set_value        (GtkScaleButton  *button,
+                                                    gdouble          value);
+GtkAdjustment *  gtk_scale_button_get_adjustment   (GtkScaleButton  *button);
+void             gtk_scale_button_set_adjustment   (GtkScaleButton  *button,
+                                                    GtkAdjustment   *adjustment);
+GtkWidget *      gtk_scale_button_get_plus_button  (GtkScaleButton  *button);
+GtkWidget *      gtk_scale_button_get_minus_button (GtkScaleButton  *button);
+GtkWidget *      gtk_scale_button_get_popup        (GtkScaleButton  *button);
 
 G_END_DECLS