X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcellrenderertext.h;h=571e90d56fccf49ef1392e50c80a200235e8c03c;hb=ea043cab5718304d9b6170afa2d3f959fc99c718;hp=fef52adf2233ac85841201424e9261b680f77111;hpb=3845ca6eea4ed8c74d302965342bfcd748b79b31;p=~andy%2Fgtk

diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index fef52adf2..571e90d56 100644
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -12,15 +12,17 @@
  * 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_TEXT_H__
 #define __GTK_CELL_RENDERER_TEXT_H__
 
-#include <pango/pango.h>
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcellrenderer.h>
 
 
@@ -34,44 +36,16 @@ G_BEGIN_DECLS
 #define GTK_IS_CELL_RENDERER_TEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_TEXT))
 #define GTK_CELL_RENDERER_TEXT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererTextClass))
 
-typedef struct _GtkCellRendererText      GtkCellRendererText;
-typedef struct _GtkCellRendererTextClass GtkCellRendererTextClass;
+typedef struct _GtkCellRendererText              GtkCellRendererText;
+typedef struct _GtkCellRendererTextPrivate       GtkCellRendererTextPrivate;
+typedef struct _GtkCellRendererTextClass         GtkCellRendererTextClass;
 
 struct _GtkCellRendererText
 {
   GtkCellRenderer parent;
 
   /*< private >*/
-  gchar *text;
-  PangoFontDescription *font;
-  gdouble font_scale;
-  PangoColor foreground;
-  PangoColor background;
-  
-  PangoAttrList *extra_attrs;
-
-  PangoUnderline underline_style;
-
-  gint rise;
-  gint fixed_height_rows;
-
-  guint strikethrough : 1;
-
-  guint editable  : 1;
-
-  guint scale_set : 1;
-  
-  guint foreground_set : 1;
-  guint background_set : 1;
-  
-  guint underline_set : 1;
-
-  guint rise_set : 1;
-  
-  guint strikethrough_set : 1;
-
-  guint editable_set : 1;
-  guint calc_fixed_height : 1;
+  GtkCellRendererTextPrivate *priv;
 };
 
 struct _GtkCellRendererTextClass
@@ -98,5 +72,4 @@ void             gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRende
 
 G_END_DECLS
 
-
 #endif /* __GTK_CELL_RENDERER_TEXT_H__ */