X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcombo.h;h=31655af3a432991e84f49dca73b373ef4786b88d;hb=10862a344aa8fb44e6045343ddf65eb0d14cc1b2;hp=70f9b4846615f16291094e0be94c503d4981e4b7;hpb=c77265d3a7326bbe184c14bd85eed17712905e31;p=~andy%2Fgtk

diff --git a/gtk/gtkcombo.h b/gtk/gtkcombo.h
index 70f9b4846..31655af3a 100644
--- a/gtk/gtkcombo.h
+++ b/gtk/gtkcombo.h
@@ -24,15 +24,15 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #ifndef __GTK_SMART_COMBO_H__
 #define __GTK_SMART_COMBO_H__
 
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkitem.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_COMBO              (gtk_combo_get_type ())
 #define GTK_COMBO(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO, GtkCombo))
@@ -48,14 +48,21 @@ typedef struct _GtkComboClass	GtkComboClass;
 /* you should access only the entry and list fields directly */
 struct _GtkCombo {
 	GtkHBox hbox;
+  
+        /*< public >*/
 	GtkWidget *entry;
+	
+        /*< private >*/
 	GtkWidget *button;
 	GtkWidget *popup;
 	GtkWidget *popwin;
+	
+        /*< public >*/
 	GtkWidget *list;
 
+        /*< private >*/
 	guint entry_change_id;
-	guint list_change_id;
+	guint list_change_id;	/* unused */
 
 	guint value_in_list:1;
 	guint ok_if_empty:1;
@@ -104,10 +111,8 @@ void       gtk_combo_set_popdown_strings   (GtkCombo*    combo,
 
 void       gtk_combo_disable_activate      (GtkCombo*    combo);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_SMART_COMBO_H__ */
 
-
+#endif /* GTK_DISABLE_DEPRECATED */