diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-05-11 19:16:19 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-05-11 19:16:19 +0000 |
| commit | dda40ca71a669d7ba39261cb94d78772f5803b42 (patch) | |
| tree | b85adf32e9bc73bd6c6879110e7aa73131eda622 /gtk/gtkcalendar.h | |
| parent | 846972ba1486f694291c788cb113453a40b8104d (diff) | |
| download | gtk+-dda40ca71a669d7ba39261cb94d78772f5803b42.tar.gz | |
Use a GtkAlignment rather than a GtkDrawingArea to draw the swatch in to
2005-05-11 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcolorbutton.c: Use a GtkAlignment rather than a GtkDrawingArea
to draw the swatch in to avoid having an extraneous window.
* gtk/gtkcolorsel.c (color_sample_draw_sample): Actually se tthe
color when !has_opacity.
2005-05-10 Owen Taylor <otaylor@redhat.com>
* gdk/gdkcairo.[ch] gdk/gdkcolor.[ch] gdk/Makefile.am: Add source
files for Cairo convenience functionality.
* gdk/gdkcairo.h (gdk_cairo_rectangle, gdk_cairo_region): Add a
convenience functions to add GdkRectangle, GdkRegion to a cairo path.
* gdk/gdkwindow.c gdk/gdkgc.c gtk/gtkcolorsel.c gtk/gtkiconview.c
gtk/gtkstyle.c: Use gdk_cairo_rectangle/region().
* gdk/gdkcairo.[ch] gdk/gdkdrawable.h gdk/gdkdraw.c: Rename
gdk_drawable_create_cairo_context() to gdk_cairo_create().
* gdk/gdkcairo.c gdk/gdkpixbuf.h gdk/gdkpixbuf-render.c:
Rename gdk_pixbuf_set_as_cairo_source() to
gdk_cairo_set_source_pixbuf().
* gdk/gdkdraw.c gdk/gdkpango.c gtk/gtkcolorsel.c gtk/gtkhruler.c
gtk/gtkhsv.c gtk/gtkiconview.c gtk/gtkstyle.c gtk/gtkvruler.c:
Adjust for renames.
* gdk/gdk.symbols: Update.
* gtk/gtkwidget.c (gtk_widget_queue_shallow_draw): Fix
coordinate system problem that was causing the wrong portions
to be invalidated.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_render)
gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render)
gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_render)
gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_render)
gtk/gtkcellview.c (gtk_cell_view_expose)
gtk/gtkdnd.c (gtk_drag_highlight_expose)
gtk/gtkentry.c (gtk_entry_draw_text)
gtk/gtktextview.c (text_window_invalidate_rect): Some cairoization.
* gtk/gtkcalendar.[ch]: Beat into something roughly resembling
GTK+ style ... use instance-private data and standard names for
private structure, etc. Move function docs inline.
* gtk/gtkcalendar.[ch]: Switch to drawing everything in
expose. Switch drawing to Cairo.
* gtk/gtkcalendar.c (gtk_calendar_freeze): Deprecate
gtk_calendar_freeze/thaw
Diffstat (limited to 'gtk/gtkcalendar.h')
| -rw-r--r-- | gtk/gtkcalendar.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h index 162d814acc..3115e0ee0a 100644 --- a/gtk/gtkcalendar.h +++ b/gtk/gtkcalendar.h @@ -49,6 +49,8 @@ G_BEGIN_DECLS typedef struct _GtkCalendar GtkCalendar; typedef struct _GtkCalendarClass GtkCalendarClass; +typedef struct _GtkCalendarPrivate GtkCalendarPrivate; + typedef enum { GTK_CALENDAR_SHOW_HEADING = 1 << 0, @@ -77,8 +79,8 @@ struct _GtkCalendar GtkCalendarDisplayOptions display_flags; GdkColor marked_date_color[31]; - GdkGC *gc; - GdkGC *xor_gc; + GdkGC *gc; /* unused */ + GdkGC *xor_gc; /* unused */ gint focus_row; gint focus_col; @@ -86,7 +88,7 @@ struct _GtkCalendar gint highlight_row; gint highlight_col; - gpointer private_data; + GtkCalendarPrivate *priv; gchar grow_space [32]; /* Padding for future expansion */ @@ -141,9 +143,10 @@ void gtk_calendar_get_date (GtkCalendar *calendar, guint *year, guint *month, guint *day); +#ifndef GTK_DISABLE_DEPRECATED void gtk_calendar_freeze (GtkCalendar *calendar); void gtk_calendar_thaw (GtkCalendar *calendar); - +#endif G_END_DECLS |