summaryrefslogtreecommitdiff
path: root/eel/eel-canvas.h
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-11-22 15:02:51 -0500
committerlukefromdc <[email protected]>2016-11-22 15:02:51 -0500
commit276eb145ce96d5f75f8d3901daf6310f60ddbb81 (patch)
tree544f41e76c9a91973867065696fc2e414ca60170 /eel/eel-canvas.h
parent969e4d021fe49654fe6e5ee7e88c920fec126505 (diff)
downloadcaja-276eb145ce96d5f75f8d3901daf6310f60ddbb81.tar.bz2
caja-276eb145ce96d5f75f8d3901daf6310f60ddbb81.tar.xz
move to GTK+3 (>= 3.14), drop libunique, GTK+2 code, and --with-gtk build option
*Remove GTK_VERSION_CHECK (3, 0, 0) and libunique selectors *Remove GTK2 and libunique specific code. *Leaves selector for specific GTK3 versions. *Remove #DEFINES for vbox/hbox previously required for GTK2 compatability *Keep vbox in caja-spatial-window.c, it is necessary for the desktop to work *spatial-window vbox issue at https://github.com/mate-desktop/caja/issues/591
Diffstat (limited to 'eel/eel-canvas.h')
-rw-r--r--eel/eel-canvas.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/eel/eel-canvas.h b/eel/eel-canvas.h
index b168aed8..d26d3daf 100644
--- a/eel/eel-canvas.h
+++ b/eel/eel-canvas.h
@@ -38,9 +38,7 @@
#define EEL_CANVAS_H
#include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(3, 0, 0)
#include <gtk/gtk-a11y.h>
-#endif
#include <gdk/gdk.h>
#include <stdarg.h>
@@ -162,11 +160,7 @@ extern "C" {
* coordinates of the drawable, a temporary pixmap, where things get
* drawn. (width, height) are the dimensions of the drawable.
*/
-#if GTK_CHECK_VERSION(3,0,0)
void (* draw) (EelCanvasItem *item, cairo_t *cr, cairo_region_t *region);
-#else
- void (* draw) (EelCanvasItem *item, GdkDrawable *drawable, GdkEventExpose *expose);
-#endif
/* Calculate the distance from an item to the specified point. It also
* returns a canvas item which is the item itself in the case of the
@@ -265,7 +259,6 @@ extern "C" {
* XGrabPointer().
*/
#endif
-#if GTK_CHECK_VERSION (3, 0, 0)
GdkGrabStatus eel_canvas_item_grab (EelCanvasItem *item,
GdkEventMask event_mask,
GdkCursor *cursor,
@@ -274,10 +267,6 @@ extern "C" {
#else
guint32 etime);
#endif
-#else
- int eel_canvas_item_grab (EelCanvasItem *item, unsigned int event_mask,
- GdkCursor *cursor, guint32 etime);
-#endif
#if GTK_CHECK_VERSION(3, 20, 0)
/* Ungrabs the seat -- the specified item must be the same that was passed to
@@ -466,11 +455,7 @@ extern "C" {
/* Draw the background for the area given.
*/
void (* draw_background) (EelCanvas *canvas,
-#if GTK_CHECK_VERSION(3,0,0)
cairo_t *cr);
-#else
- int x, int y, int width, int height);
-#endif
/* Private Virtual methods for groping the canvas inside matecomponent */
void (* request_update) (EelCanvas *canvas);
@@ -558,7 +543,6 @@ extern "C" {
void eel_canvas_world_to_window (EelCanvas *canvas,
double worldx, double worldy, double *winx, double *winy);
-#if GTK_CHECK_VERSION(3, 0, 0)
GType eel_canvas_accessible_get_type (void);
typedef struct _EelCanvasAccessible EelCanvasAccessible;
@@ -573,7 +557,6 @@ extern "C" {
{
GtkContainerAccessibleClass parent_class;
};
-#endif
#ifdef __cplusplus
}