Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_colordialog.c ewl_enums.h ewl_events.h ewl_filedialog.c
ewl_filelist.c ewl_filepicker.c
Log Message:
- API break
- Remove Ewl_Dialog_Event, Ewl_Filepicker_Event and Ewl_Filelist_Event and
make them all use the generic Ewl_Event_Action_Response event structure
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_colordialog.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ewl_colordialog.c 6 Feb 2007 13:42:16 -0000 1.27
+++ ewl_colordialog.c 3 Mar 2007 02:26:45 -0000 1.28
@@ -337,7 +337,7 @@
static void
ewl_colordialog_respond(Ewl_Colordialog *cd, unsigned int response)
{
- Ewl_Dialog_Event cd_ev;
+ Ewl_Event_Action_Response cd_ev;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("cd", cd);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- ewl_enums.h 7 Feb 2007 04:03:27 -0000 1.70
+++ ewl_enums.h 3 Mar 2007 02:26:45 -0000 1.71
@@ -593,9 +593,9 @@
*/
enum Ewl_Filelist_Event_Type
{
- EWL_FILELIST_EVENT_TYPE_DIR_CHANGE,
- EWL_FILELIST_EVENT_TYPE_SELECTION_CHANGE,
- EWL_FILELIST_EVENT_TYPE_FILE_SELECTED
+ EWL_FILELIST_EVENT_DIR_CHANGE,
+ EWL_FILELIST_EVENT_SELECTION_CHANGE,
+ EWL_FILELIST_EVENT_FILE_SELECTED
};
/**
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_events.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_events.h 3 Mar 2007 01:58:19 -0000 1.24
+++ ewl_events.h 3 Mar 2007 02:26:45 -0000 1.25
@@ -237,42 +237,16 @@
};
/**
- * The Ewl_Dialog_Evenet type
+ * The Ewl_Event_Action_Response type
*/
-typedef struct Ewl_Dialog_Event Ewl_Dialog_Event;
+typedef struct Ewl_Event_Action_Response Ewl_Event_Action_Response;
/**
- * Stores the reponse from a dialog
+ * Stores the reponse from a user action
*/
-struct Ewl_Dialog_Event
+struct Ewl_Event_Action_Response
{
- unsigned int response; /**< The response ID from the dialog */
-};
-
-/**
- * The Ewl_Filepicker_Event type
- */
-typedef struct Ewl_Filepicker_Event Ewl_Filepicker_Event;
-
-/**
- * Contains the filepicker response
- */
-struct Ewl_Filepicker_Event
-{
- unsigned int response; /**< The filepicker response */
-};
-
-/**
- * The Ewl_Filelist_Event type
- */
-typedef struct Ewl_Filelist_Event Ewl_Filelist_Event;
-
-/**
- * Contains the filelist event type
- */
-struct Ewl_Filelist_Event
-{
- Ewl_Filelist_Event_Type type; /**< The type of event */
+ unsigned int response; /**< The response ID */
};
unsigned int ewl_ev_modifiers_get(void);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filedialog.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ewl_filedialog.c 3 Mar 2007 01:58:19 -0000 1.32
+++ ewl_filedialog.c 3 Mar 2007 02:26:45 -0000 1.33
@@ -457,7 +457,7 @@
static void
ewl_filedialog_respond(Ewl_Filedialog *fd, unsigned int response)
{
- Ewl_Dialog_Event ev;
+ Ewl_Event_Action_Response ev;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -473,7 +473,7 @@
void *data)
{
Ewl_Filedialog *fd;
- Ewl_Filepicker_Event *e;
+ Ewl_Event_Action_Response *e;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_filelist.c 3 Mar 2007 01:58:19 -0000 1.25
+++ ewl_filelist.c 3 Mar 2007 02:26:45 -0000 1.26
@@ -50,7 +50,7 @@
void
ewl_filelist_directory_set(Ewl_Filelist *fl, const char *dir)
{
- Ewl_Filelist_Event ev_data;
+ Ewl_Event_Action_Response ev_data;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("fl", fl);
@@ -60,7 +60,7 @@
fl->directory = strdup(dir);
if (fl->dir_change) fl->dir_change(fl);
- ev_data.type = EWL_FILELIST_EVENT_TYPE_DIR_CHANGE;
+ ev_data.response = EWL_FILELIST_EVENT_DIR_CHANGE;
ewl_callback_call_with_event_data(EWL_WIDGET(fl),
EWL_CALLBACK_VALUE_CHANGED, &ev_data);
@@ -505,13 +505,13 @@
void
ewl_filelist_selected_files_change_notify(Ewl_Filelist *fl)
{
- Ewl_Filelist_Event ev_data;
+ Ewl_Event_Action_Response ev_data;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("fl", fl);
DCHECK_TYPE("fl", fl, EWL_FILELIST_TYPE);
- ev_data.type = EWL_FILELIST_EVENT_TYPE_SELECTION_CHANGE;
+ ev_data.response = EWL_FILELIST_EVENT_SELECTION_CHANGE;
ewl_callback_call_with_event_data(EWL_WIDGET(fl),
EWL_CALLBACK_VALUE_CHANGED, &ev_data);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filepicker.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_filepicker.c 6 Feb 2007 13:42:17 -0000 1.24
+++ ewl_filepicker.c 3 Mar 2007 02:26:45 -0000 1.25
@@ -575,7 +575,7 @@
{
Ewl_Filepicker *fp;
Ewl_Filelist *fl;
- Ewl_Filelist_Event *e;
+ Ewl_Event_Action_Response *e;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -586,7 +586,7 @@
e = ev;
/* XXX need to correctly deal with multiselect files in here */
- if (e->type == EWL_FILELIST_EVENT_TYPE_DIR_CHANGE)
+ if (e->response == EWL_FILELIST_EVENT_DIR_CHANGE)
{
char *dir;
@@ -596,7 +596,7 @@
FREE(dir);
}
- else if (e->type == EWL_FILELIST_EVENT_TYPE_SELECTION_CHANGE)
+ else if (e->response == EWL_FILELIST_EVENT_SELECTION_CHANGE)
ewl_text_text_set(EWL_TEXT(fp->file_entry),
ewl_filelist_selected_file_get(fl));
@@ -609,7 +609,7 @@
{
Ewl_Filepicker *fp;
Ewl_Stock *s;
- Ewl_Filepicker_Event e;
+ Ewl_Event_Action_Response e;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs