enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

Merge branch 'master' into elm_code 

Conflicts:
	elm_code/lib/elm_code_widget.c
This commit is contained in:
Andy Williams 2015-01-28 00:43:57 +00:00
parent 876faa4eb5 8a9c645353
commit e7be4523b4
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elm_code/lib/Elm_Code.h
View File

@ -4,6 +4,8 @@
#include <Eina.h>
#include <Eo.h>
#include <Elementary.h>
#define ELM_INTERNAL_API_ARGESFSDFEFC
#include <elm_widget.h>
#ifdef EAPI
# undef EAPI

13
legacy/elm_code/lib/elm_code_widget.c
View File

@ -2,14 +2,7 @@
# include "config.h"
#endif
#include <Eo.h>
#include <Evas.h>
#include <Elementary.h>
#define ELM_INTERNAL_API_ARGESFSDFEFC
#include <elm_widget.h>
#include <Elm_Code.h>
#include "elm_code_widget.eo.h"
#include "elm_code_private.h"
typedef struct
@ -458,6 +451,12 @@ _elm_code_widget_event_veto_cb(void *data, Evas_Object *obj EINA_UNUSED,
widget = (Elm_Code_Widget *)data;
pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
if (!pd->editable)
return EINA_FALSE;
widget = (Elm_Code_Widget *)data;
pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
if (!pd->editable)
return EINA_FALSE;