Revert "combobox: Don't special-case RTL child positions anymore"

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

diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index 3de843b47aa9a9aacb151f2ef9fca6d00ad47ac3..c79f211b2aa516b1c8cfb08b74910a7da5d34016 100644 (file)
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -12,29 +12,27 @@
  * 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/>.
  */
 
 /*
  * Modified by the GTK+ Team and others 1997-2001.  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_ASPECT_FRAME_H__
 #define __GTK_ASPECT_FRAME_H__
 
 
-#include <gdk/gdk.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkframe.h>
 
+
 G_BEGIN_DECLS
 
 #define GTK_TYPE_ASPECT_FRAME            (gtk_aspect_frame_get_type ())
@@ -44,25 +42,27 @@ G_BEGIN_DECLS
 #define GTK_IS_ASPECT_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASPECT_FRAME))
 #define GTK_ASPECT_FRAME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
 
-
-typedef struct _GtkAspectFrame       GtkAspectFrame;
-typedef struct _GtkAspectFrameClass  GtkAspectFrameClass;
+typedef struct _GtkAspectFrame              GtkAspectFrame;
+typedef struct _GtkAspectFramePrivate       GtkAspectFramePrivate;
+typedef struct _GtkAspectFrameClass         GtkAspectFrameClass;
 
 struct _GtkAspectFrame
 {
   GtkFrame frame;
 
-  gfloat xalign;
-  gfloat yalign;
-  gfloat ratio;
-  gboolean obey_child;
-
-  GtkAllocation center_allocation;
+  /*< private >*/
+  GtkAspectFramePrivate *priv;
 };
 
 struct _GtkAspectFrameClass
 {
   GtkFrameClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };