2006-12-27 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-stage.[ch]: * clutter/clutter-event.[ch]: Revert changes; this is what happens when you keep old tree around.
This commit is contained in:
@ -50,8 +50,7 @@ typedef enum
|
||||
CLUTTER_MOTION,
|
||||
CLUTTER_BUTTON_PRESS,
|
||||
CLUTTER_2BUTTON_PRESS, /* Double click */
|
||||
CLUTTER_BUTTON_RELEASE,
|
||||
CLUTTER_DELETE_EVENT
|
||||
CLUTTER_BUTTON_RELEASE
|
||||
} ClutterEventType;
|
||||
|
||||
#define CLUTTER_TYPE_EVENT (clutter_event_get_type ())
|
||||
@ -65,7 +64,6 @@ typedef struct _ClutterMotionEvent ClutterMotionEvent;
|
||||
|
||||
typedef struct _ClutterInputDevice ClutterInputDevice;
|
||||
|
||||
|
||||
struct _ClutterAnyEvent
|
||||
{
|
||||
ClutterEventType type;
|
||||
|
@ -92,7 +92,6 @@ enum
|
||||
KEY_PRESS_EVENT,
|
||||
KEY_RELEASE_EVENT,
|
||||
MOTION_EVENT,
|
||||
DELETE_EVENT,
|
||||
|
||||
LAST_SIGNAL
|
||||
};
|
||||
@ -833,16 +832,7 @@ clutter_stage_class_init (ClutterStageClass *klass)
|
||||
clutter_marshal_VOID__BOXED,
|
||||
G_TYPE_NONE, 1,
|
||||
CLUTTER_TYPE_EVENT);
|
||||
stage_signals[DELETE_EVENT] =
|
||||
g_signal_new ("delete-event",
|
||||
G_TYPE_FROM_CLASS (gobject_class),
|
||||
G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (ClutterStageClass, delete_event),
|
||||
NULL, NULL,
|
||||
clutter_marshal_VOID__BOXED,
|
||||
G_TYPE_NONE, 1,
|
||||
CLUTTER_TYPE_EVENT);
|
||||
|
||||
|
||||
g_type_class_add_private (gobject_class, sizeof (ClutterStagePrivate));
|
||||
}
|
||||
|
||||
|
@ -97,8 +97,6 @@ struct _ClutterStageClass
|
||||
ClutterKeyEvent *event);
|
||||
void (*motion_event) (ClutterStage *stage,
|
||||
ClutterMotionEvent *event);
|
||||
void (*delete_event) (ClutterStage *stage,
|
||||
ClutterEvent *event);
|
||||
|
||||
/* padding for future expansion */
|
||||
void (*_clutter_stage1) (void);
|
||||
|
Reference in New Issue
Block a user