brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2006-12-27 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* 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:
Emmanuele Bassi 2006-12-27 18:25:43 +00:00
parent 89de2fa269
commit 0033b539b8
7 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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.
2006-12-27 Emmanuele Bassi <ebassi@openedhand.com> 2006-12-27 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-color.h: * clutter/clutter-color.h:

4
clutter/clutter-event.h
View File

@ -50,8 +50,7 @@ typedef enum
CLUTTER_MOTION, CLUTTER_MOTION,
CLUTTER_BUTTON_PRESS, CLUTTER_BUTTON_PRESS,
CLUTTER_2BUTTON_PRESS, /* Double click */ CLUTTER_2BUTTON_PRESS, /* Double click */
CLUTTER_BUTTON_RELEASE, CLUTTER_BUTTON_RELEASE
CLUTTER_DELETE_EVENT
} ClutterEventType; } ClutterEventType;
#define CLUTTER_TYPE_EVENT (clutter_event_get_type ()) #define CLUTTER_TYPE_EVENT (clutter_event_get_type ())
@ -65,7 +64,6 @@ typedef struct _ClutterMotionEvent ClutterMotionEvent;
typedef struct _ClutterInputDevice ClutterInputDevice; typedef struct _ClutterInputDevice ClutterInputDevice;
struct _ClutterAnyEvent struct _ClutterAnyEvent
{ {
ClutterEventType type; ClutterEventType type;

10
clutter/clutter-stage.c
View File

@ -92,7 +92,6 @@ enum
KEY_PRESS_EVENT, KEY_PRESS_EVENT,
KEY_RELEASE_EVENT, KEY_RELEASE_EVENT,
MOTION_EVENT, MOTION_EVENT,
DELETE_EVENT,
LAST_SIGNAL LAST_SIGNAL
}; };
@ -833,15 +832,6 @@ clutter_stage_class_init (ClutterStageClass *klass)
clutter_marshal_VOID__BOXED, clutter_marshal_VOID__BOXED,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_EVENT); 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)); g_type_class_add_private (gobject_class, sizeof (ClutterStagePrivate));
} }

2
clutter/clutter-stage.h
View File

@ -97,8 +97,6 @@ struct _ClutterStageClass
ClutterKeyEvent *event); ClutterKeyEvent *event);
void (*motion_event) (ClutterStage *stage, void (*motion_event) (ClutterStage *stage,
ClutterMotionEvent *event); ClutterMotionEvent *event);
void (*delete_event) (ClutterStage *stage,
ClutterEvent *event);
/* padding for future expansion */ /* padding for future expansion */
void (*_clutter_stage1) (void); void (*_clutter_stage1) (void);

4
configure.ac
View File

@ -2,8 +2,8 @@
# An odd micro number indicates in-progress development, (eg. from CVS) # An odd micro number indicates in-progress development, (eg. from CVS)
# An even micro number indicates a released version. # An even micro number indicates a released version.
m4_define([clutter_major_version], [0]) m4_define([clutter_major_version], [0])
m4_define([clutter_minor_version], [2]) m4_define([clutter_minor_version], [1])
m4_define([clutter_micro_version], [0]) m4_define([clutter_micro_version], [1])
m4_define([clutter_version], m4_define([clutter_version],
[clutter_major_version.clutter_minor_version.clutter_micro_version]) [clutter_major_version.clutter_minor_version.clutter_micro_version])

1
doc/reference/tmpl/clutter-event.sgml
View File

@ -29,7 +29,6 @@ Windowing events handled by Clutter.
@CLUTTER_BUTTON_PRESS: @CLUTTER_BUTTON_PRESS:
@CLUTTER_2BUTTON_PRESS: @CLUTTER_2BUTTON_PRESS:
@CLUTTER_BUTTON_RELEASE: @CLUTTER_BUTTON_RELEASE:
@CLUTTER_DELETE_EVENT:
<!-- ##### STRUCT ClutterAnyEvent ##### --> <!-- ##### STRUCT ClutterAnyEvent ##### -->
<para> <para>

9
doc/reference/tmpl/clutter-stage.sgml
View File

@ -53,14 +53,6 @@ Macro evaluating to the height of the #ClutterStage
@clutterstage: the object which received the signal. @clutterstage: the object which received the signal.
@arg1: @arg1:
<!-- ##### SIGNAL ClutterStage::delete-event ##### -->
<para>
</para>
@clutterstage: the object which received the signal.
@arg1:
<!-- ##### SIGNAL ClutterStage::input-event ##### --> <!-- ##### SIGNAL ClutterStage::input-event ##### -->
<para> <para>
@ -125,7 +117,6 @@ Macro evaluating to the height of the #ClutterStage
@key_press_event: @key_press_event:
@key_release_event: @key_release_event:
@motion_event: @motion_event:
@delete_event:
@_clutter_stage1: @_clutter_stage1:
@_clutter_stage2: @_clutter_stage2:
@_clutter_stage3: @_clutter_stage3: