call gdk_flush() after showing the menu so we can definitely grab on it.

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

diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index b3904fa45fb0ea1c6a1e1e77890d69a90389e19a..e85888c6e1d4f16d6be3e496bc189f2725315e59 100644 (file)
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -2,40 +2,43 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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.
  */
+
+/*
+ * 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/. 
+ */
+
 #ifndef __GTK_ASPECT_FRAME_H__
 #define __GTK_ASPECT_FRAME_H__
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
 #include <gtk/gtkframe.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_ASPECT_FRAME            (gtk_aspect_frame_get_type ())
-#define GTK_ASPECT_FRAME(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrame))
-#define GTK_ASPECT_FRAME_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
-#define GTK_IS_ASPECT_FRAME(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_ASPECT_FRAME))
-#define GTK_IS_ASPECT_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASPECT_FRAME))
-
+#define GTK_ASPECT_FRAME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrame))
+#define GTK_ASPECT_FRAME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
+#define GTK_IS_ASPECT_FRAME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ASPECT_FRAME))
+#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;
@@ -48,33 +51,30 @@ struct _GtkAspectFrame
   gfloat xalign;
   gfloat yalign;
   gfloat ratio;
-  gint obey_child;
+  gboolean obey_child;
 
   GtkAllocation center_allocation;
 };
 
 struct _GtkAspectFrameClass
 {
-  GtkBinClass parent_class;
+  GtkFrameClass parent_class;
 };
 
 
-GtkType    gtk_aspect_frame_get_type   (void);
-GtkWidget* gtk_aspect_frame_new        (const gchar       *label,
-                                       gfloat             xalign,
-                                       gfloat             yalign,
-                                       gfloat             ratio,
-                                       gint               obey_child);
-void       gtk_aspect_frame_set        (GtkAspectFrame      *aspect_frame,
-                                       gfloat             xalign,
-                                       gfloat             yalign,
-                                       gfloat             ratio,
-                                       gint               obey_child);
-
+GType      gtk_aspect_frame_get_type   (void) G_GNUC_CONST;
+GtkWidget* gtk_aspect_frame_new        (const gchar     *label,
+                                       gfloat           xalign,
+                                       gfloat           yalign,
+                                       gfloat           ratio,
+                                       gboolean         obey_child);
+void       gtk_aspect_frame_set        (GtkAspectFrame  *aspect_frame,
+                                       gfloat           xalign,
+                                       gfloat           yalign,
+                                       gfloat           ratio,
+                                       gboolean         obey_child);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+G_END_DECLS
 
 #endif /* __GTK_ASPECT_FRAME_H__ */