X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcellrendereraccel.h;h=80391d7300192c7235b7f4e620443e6a9d94901c;hb=d97861bd8b338c3d25d7ffb5496edee9eee9bfbb;hp=d9fd1d1108b461590b07326fecddc71c45d75f93;hpb=080889e0740c8c6991b46052fb66fca08e118a8e;p=~andy%2Fgtk

diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h
index d9fd1d110..80391d730 100644
--- a/gtk/gtkcellrendereraccel.h
+++ b/gtk/gtkcellrendereraccel.h
@@ -12,27 +12,30 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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/>.
  */
 
 #ifndef __GTK_CELL_RENDERER_ACCEL_H__
 #define __GTK_CELL_RENDERER_ACCEL_H__
 
-#include "gtkcellrenderertext.h"
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtkcellrenderertext.h>
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_CELL_RENDERER_ACCEL		(gtk_cell_renderer_accel_get_type ())
-#define GTK_CELL_RENDERER_ACCEL(obj)		(GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccel))
-#define GTK_CELL_RENDERER_ACCEL_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
-#define GTK_IS_CELL_RENDERER_ACCEL(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_ACCEL))
-#define GTK_IS_CELL_RENDERER_ACCEL_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_ACCEL))
-#define GTK_CELL_RENDERER_ACCEL_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
+#define GTK_TYPE_CELL_RENDERER_ACCEL            (gtk_cell_renderer_accel_get_type ())
+#define GTK_CELL_RENDERER_ACCEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccel))
+#define GTK_CELL_RENDERER_ACCEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
+#define GTK_IS_CELL_RENDERER_ACCEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_ACCEL))
+#define GTK_IS_CELL_RENDERER_ACCEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_ACCEL))
+#define GTK_CELL_RENDERER_ACCEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
 
-typedef struct _GtkCellRendererAccel      GtkCellRendererAccel;
-typedef struct _GtkCellRendererAccelClass GtkCellRendererAccelClass;
+typedef struct _GtkCellRendererAccel              GtkCellRendererAccel;
+typedef struct _GtkCellRendererAccelPrivate       GtkCellRendererAccelPrivate;
+typedef struct _GtkCellRendererAccelClass         GtkCellRendererAccelClass;
 
 
 typedef enum
@@ -47,14 +50,7 @@ struct _GtkCellRendererAccel
   GtkCellRendererText parent;
 
   /*< private >*/
-  guint accel_key;
-  GdkModifierType accel_mods;
-  guint keycode;
-  GtkCellRendererAccelMode accel_mode;
-
-  GtkWidget *edit_widget;
-  GtkWidget *grab_widget;
-  GtkWidget *sizing_label;
+  GtkCellRendererAccelPrivate *priv;
 };
 
 struct _GtkCellRendererAccelClass