Place the search icon in the primary slot of the entry

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

diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index ba07df8cbb9741ca611733dd19f90504d54f8988..c7746bd9cea34eefe3197a3498f425b579e81fe4 100644 (file)
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -12,53 +12,58 @@
  * 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-2000.  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/.
  */
 
 #ifndef __GTK_FIXED_H__
 #define __GTK_FIXED_H__
 
 
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
+#include <gtk/gtkcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
 
+G_BEGIN_DECLS
 
 #define GTK_TYPE_FIXED                  (gtk_fixed_get_type ())
-#define GTK_FIXED(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_FIXED, GtkFixed))
-#define GTK_FIXED_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_FIXED, GtkFixedClass))
-#define GTK_IS_FIXED(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_FIXED))
-#define GTK_IS_FIXED_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FIXED))
-#define GTK_FIXED_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_FIXED, GtkFixedClass))
+#define GTK_FIXED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FIXED, GtkFixed))
+#define GTK_FIXED_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FIXED, GtkFixedClass))
+#define GTK_IS_FIXED(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FIXED))
+#define GTK_IS_FIXED_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FIXED))
+#define GTK_FIXED_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FIXED, GtkFixedClass))
 
-
-typedef struct _GtkFixed        GtkFixed;
-typedef struct _GtkFixedClass   GtkFixedClass;
-typedef struct _GtkFixedChild   GtkFixedChild;
+typedef struct _GtkFixed              GtkFixed;
+typedef struct _GtkFixedPrivate       GtkFixedPrivate;
+typedef struct _GtkFixedClass         GtkFixedClass;
+typedef struct _GtkFixedChild         GtkFixedChild;
 
 struct _GtkFixed
 {
   GtkContainer container;
 
-  GList *children;
+  /*< private >*/
+  GtkFixedPrivate *priv;
 };
 
 struct _GtkFixedClass
 {
   GtkContainerClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 struct _GtkFixedChild
@@ -69,7 +74,7 @@ struct _GtkFixedChild
 };
 
 
-GtkType    gtk_fixed_get_type          (void) G_GNUC_CONST;
+GType      gtk_fixed_get_type          (void) G_GNUC_CONST;
 GtkWidget* gtk_fixed_new               (void);
 void       gtk_fixed_put               (GtkFixed       *fixed,
                                         GtkWidget      *widget,
@@ -79,13 +84,8 @@ void       gtk_fixed_move              (GtkFixed       *fixed,
                                         GtkWidget      *widget,
                                         gint            x,
                                         gint            y);
-void       gtk_fixed_set_has_window    (GtkFixed       *fixed,
-                                       gboolean        has_window);
-gboolean   gtk_fixed_get_has_window    (GtkFixed       *fixed);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+G_END_DECLS
 
 #endif /* __GTK_FIXED_H__ */