merge from master branch's latest code.

[apps/core/preloaded/ciss.git] / include / ciss-widget.h

diff --git a/include/ciss-widget.h b/include/ciss-widget.h
index 9ee668b..c450d0f 100644 (file)
--- a/include/ciss-widget.h
+++ b/include/ciss-widget.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _CISS_MMI_VIEW_UTILS_H_
-#define _CISS_MMI_VIEW_UTILS_H_
+#ifndef _CISS_WIDGET_H_
+#define _CISS_WIDGET_H_
 
 #include <Elementary.h>
 #include <vconf.h>
@@ -49,29 +49,24 @@ enum {
        CISS_ICON_TYPE_OTHERS,
 };
 
-Evas_Object *_ciss_create_noti_popup(Evas_Object *parent,
-                       char *strtitle, char *strmsg, double t_timeout,void *data);
-Evas_Object *_ciss_create_error_popup(Evas_Object *parent,
-                       ciss_err_t ciss_error, double t_timeout,void *data);
+Evas_Object *_ciss_create_noti_popup(Evas_Object *parent, char *strtitle, char *strmsg, double t_timeout,void *data);
+Evas_Object *_ciss_create_error_popup(Evas_Object *parent, ciss_err_t ciss_error, double t_timeout,void *data);
 Evas_Object *_ciss_create_popup(Evas_Object *parent, char *msg);
 Evas_Object *_ciss_create_win(const char *name);
-Evas_Object *_ciss_create_layout_main( Evas_Object* parent);
+Evas_Object *_ciss_create_conformant(Evas_Object *parent);
+Evas_Object *_ciss_create_layout_main(Evas_Object *parent);
 Evas_Object *_ciss_create_bg(Evas_Object *parent);
-Evas_Object *_ciss_create_navi_control_bar(Evas_Object *parent,
-                       char *label1, Evas_Smart_Cb cb1,
-                       char *label2, Evas_Smart_Cb cb2,
-                       void *data, Elm_Object_Item *navi_it,
-                       Elm_Object_Item ** c_item);
-Evas_Object *_ciss_create_title_btn(Evas_Object *parent,
-               const char *text, Evas_Smart_Cb func, void *data);
+Evas_Object *_ciss_create_navi_control_bar(Evas_Object *parent, char *label1, Evas_Smart_Cb cb1, char *label2, Evas_Smart_Cb cb2, void *data, Elm_Object_Item *navi_it, Elm_Object_Item **c_item);
+Evas_Object *_ciss_create_title_btn(Evas_Object *parent, const char *text, Evas_Smart_Cb func, void *data);
 void _ciss_remove_naviframe(Evas_Object *nf);
 
-/*Callback Functions */
+/* Callback Functions */
 Eina_Bool _ciss_on_end_key_down(void *data, int type, void *event);
-Evas_Object * _ciss_create_result_genlist(const char *result_str, int str_len, Evas_Object *nf, void *data);
+Evas_Object *_ciss_create_result_genlist(const char *result_str, int str_len, Evas_Object *nf, void *data);
 void _ciss_geinlist_item_class_new(void *data);
 void _ciss_geinlist_item_class_free(void *data);
 void _ciss_create_genlist_separator_no_line(Evas_Object *genlist, void *data);
 void _ciss_create_genlist_underline(Evas_Object *genlist, void *data);
-#endif
+
+#endif /* _CISS_WIDGET_H_ */