X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcheckmenuitem.h;h=c793bcd8d3af8a74b1c4ebdd77f2ca34d5bbeb5c;hb=af0007d0d89309838fb55cc62c76793b574fa40a;hp=3572b7708aa2d16055f550d3433925559875c894;hpb=545b40a1b306cf2603d2a845eda320624e901683;p=~andy%2Fgtk

diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index 3572b7708..c793bcd8d 100644
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@@ -12,30 +12,28 @@
  * 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/.
  */
 
-#ifndef __GTK_MENU_CHECK_ITEM_H__
-#define __GTK_MENU_CHECK_ITEM_H__
+#ifndef __GTK_CHECK_MENU_ITEM_H__
+#define __GTK_CHECK_MENU_ITEM_H__
 
 
-#include <gdk/gdk.h>
-#include <gtk/gtkmenuitem.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
+#include <gtk/gtkmenuitem.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
 
+G_BEGIN_DECLS
 
 #define GTK_TYPE_CHECK_MENU_ITEM            (gtk_check_menu_item_get_type ())
 #define GTK_CHECK_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItem))
@@ -45,26 +43,25 @@ extern "C" {
 #define GTK_CHECK_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItemClass))
 
 
-typedef struct _GtkCheckMenuItem       GtkCheckMenuItem;
-typedef struct _GtkCheckMenuItemClass  GtkCheckMenuItemClass;
+typedef struct _GtkCheckMenuItem              GtkCheckMenuItem;
+typedef struct _GtkCheckMenuItemPrivate       GtkCheckMenuItemPrivate;
+typedef struct _GtkCheckMenuItemClass         GtkCheckMenuItemClass;
 
 struct _GtkCheckMenuItem
 {
   GtkMenuItem menu_item;
-  
-  guint active : 1;
-  guint always_show_toggle : 1;
-  guint inconsistent : 1;
-  guint draw_as_radio : 1;
+
+  /*< private >*/
+  GtkCheckMenuItemPrivate *priv;
 };
 
 struct _GtkCheckMenuItemClass
 {
   GtkMenuItemClass parent_class;
-  
+
   void (* toggled)	  (GtkCheckMenuItem *check_menu_item);
   void (* draw_indicator) (GtkCheckMenuItem *check_menu_item,
-			   GdkRectangle	    *area);
+			   cairo_t          *cr);
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
@@ -87,19 +84,15 @@ void       gtk_check_menu_item_set_inconsistent  (GtkCheckMenuItem *check_menu_i
 						  gboolean          setting);
 gboolean   gtk_check_menu_item_get_inconsistent  (GtkCheckMenuItem *check_menu_item);
 void       gtk_check_menu_item_set_draw_as_radio (GtkCheckMenuItem *check_menu_item,
-						  gboolean          draw_radio_indicator);
+						  gboolean          draw_as_radio);
 gboolean   gtk_check_menu_item_get_draw_as_radio (GtkCheckMenuItem *check_menu_item);
-    
 
-#ifndef GTK_DISABLE_DEPRECATED
-void	   gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
-						gboolean	  always);
-#define	gtk_check_menu_item_set_state		gtk_check_menu_item_set_active
-#endif
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+/* private */
+void       _gtk_check_menu_item_set_active       (GtkCheckMenuItem *check_menu_item,
+                                                  gboolean          is_active);
+
 
+G_END_DECLS
 
 #endif /* __GTK_CHECK_MENU_ITEM_H__ */