X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkdrawingarea.h;h=1029b249d0290aa950638c26ebfadcaa8070469d;hb=9d0febc9a64a5bfb0fcfc3a88de4757f6c1ff090;hp=8ba240f451e156ab290967f075a8222896547173;hpb=0176b387c85a150b7d6fdac22be6db627d523217;p=~andy%2Fgtk

diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index 8ba240f45..1029b249d 100644
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@@ -12,37 +12,35 @@
  * 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-2000.  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/.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_DRAWING_AREA_H__
 #define __GTK_DRAWING_AREA_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_DRAWING_AREA            (gtk_drawing_area_get_type ())
-#define GTK_DRAWING_AREA(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingArea))
-#define GTK_DRAWING_AREA_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_DRAWING_AREA, GtkDrawingAreaClass))
-#define GTK_IS_DRAWING_AREA(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_DRAWING_AREA))
-#define GTK_IS_DRAWING_AREA_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DRAWING_AREA))
-#define GTK_DRAWING_AREA_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingAreaClass))
+#define GTK_DRAWING_AREA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingArea))
+#define GTK_DRAWING_AREA_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_DRAWING_AREA, GtkDrawingAreaClass))
+#define GTK_IS_DRAWING_AREA(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_DRAWING_AREA))
+#define GTK_IS_DRAWING_AREA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DRAWING_AREA))
+#define GTK_DRAWING_AREA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingAreaClass))
 
 
 typedef struct _GtkDrawingArea       GtkDrawingArea;
@@ -52,25 +50,25 @@ struct _GtkDrawingArea
 {
   GtkWidget widget;
 
-  gpointer draw_data;
+  /*< private >*/
+  gpointer dummy;
 };
 
 struct _GtkDrawingAreaClass
 {
   GtkWidgetClass parent_class;
-};
 
-
-GtkType    gtk_drawing_area_get_type   (void) G_GNUC_CONST;
-GtkWidget* gtk_drawing_area_new        (void);
-void       gtk_drawing_area_size       (GtkDrawingArea      *darea,
-					gint                 width,
-					gint                 height);
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+GType      gtk_drawing_area_get_type (void) G_GNUC_CONST;
+GtkWidget* gtk_drawing_area_new      (void);
 
+G_END_DECLS
 
 #endif /* __GTK_DRAWING_AREA_H__ */