separator: Don't use padding and borders wrongly

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

diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h
index 433bca50bdb2c7a2f76ef42f8c65ea4a8d25fe9c..0a7a4f6951067de5a6acee04eefb4daf81b9238a 100644 (file)
--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@@ -12,38 +12,39 @@
  * 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_PIXBUF_H__
 #define __GTK_CELL_RENDERER_PIXBUF_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcellrenderer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_CELL_RENDERER_PIXBUF                  (gtk_cell_renderer_pixbuf_get_type ())
-#define GTK_CELL_RENDERER_PIXBUF(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbuf))
-#define GTK_CELL_RENDERER_PIXBUF_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass))
-#define GTK_IS_CELL_RENDERER_PIXBUF(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF))
-#define GTK_IS_CELL_RENDERER_PIXBUF_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXBUF))
-#define GTK_CELL_RENDERER_PIXBUF_GET_CLASS(obj)         (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass))
+#define GTK_CELL_RENDERER_PIXBUF(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbuf))
+#define GTK_CELL_RENDERER_PIXBUF_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass))
+#define GTK_IS_CELL_RENDERER_PIXBUF(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF))
+#define GTK_IS_CELL_RENDERER_PIXBUF_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXBUF))
+#define GTK_CELL_RENDERER_PIXBUF_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXBUF, GtkCellRendererPixbufClass))
 
-typedef struct _GtkCellRendererPixbuf GtkCellRendererPixbuf;
-typedef struct _GtkCellRendererPixbufClass GtkCellRendererPixbufClass;
+typedef struct _GtkCellRendererPixbuf              GtkCellRendererPixbuf;
+typedef struct _GtkCellRendererPixbufPrivate       GtkCellRendererPixbufPrivate;
+typedef struct _GtkCellRendererPixbufClass         GtkCellRendererPixbufClass;
 
 struct _GtkCellRendererPixbuf
 {
   GtkCellRenderer parent;
 
-  GdkPixbuf *pixbuf;
-  GdkPixbuf *pixbuf_expander_open;
-  GdkPixbuf *pixbuf_expander_closed;
+  /*< private >*/
+  GtkCellRendererPixbufPrivate *priv;
 };
 
 struct _GtkCellRendererPixbufClass
@@ -57,11 +58,11 @@ struct _GtkCellRendererPixbufClass
   void (*_gtk_reserved4) (void);
 };
 
-GtkType          gtk_cell_renderer_pixbuf_get_type (void);
+GType            gtk_cell_renderer_pixbuf_get_type (void) G_GNUC_CONST;
 GtkCellRenderer *gtk_cell_renderer_pixbuf_new      (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
+
 
 #endif /* __GTK_CELL_RENDERER_PIXBUF_H__ */