diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-11-09 23:20:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-11 01:06:54 +0300 |
commit | 5c6e3337801b493926210e96237be2b495fc5d1b (patch) | |
tree | 5ca4bd778c2d552a7eaf0645c3c1bc6be86d9e5d /source/blender/makesrna | |
parent | 2b107beffd9b408ac1464288d07ee96214c09a30 (diff) |
UI Refactor T41640
Make the UI API more consistent and reduce confusion with some naming.
mainly:
- API function calls
- enum values
some internal static functions have been left for now
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_wm_api.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 3c39308e7dc..3b97508dd67 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -587,7 +587,7 @@ static void rna_Event_tilt_get(PointerRNA *ptr, float *values) static PointerRNA rna_PopupMenu_layout_get(PointerRNA *ptr) { struct uiPopupMenu *pup = ptr->data; - uiLayout *layout = uiPupMenuLayout(pup); + uiLayout *layout = UI_popup_menu_layout(pup); PointerRNA rptr; RNA_pointer_create(ptr->id.data, &RNA_UILayout, layout, &rptr); @@ -598,7 +598,7 @@ static PointerRNA rna_PopupMenu_layout_get(PointerRNA *ptr) static PointerRNA rna_PieMenu_layout_get(PointerRNA *ptr) { struct uiPieMenu *pie = ptr->data; - uiLayout *layout = uiPieMenuLayout(pie); + uiLayout *layout = UI_pie_menu_layout(pie); PointerRNA rptr; RNA_pointer_create(ptr->id.data, &RNA_UILayout, layout, &rptr); diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index ad638f2187c..e819d331124 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -298,7 +298,7 @@ static PointerRNA rna_PupMenuBegin(bContext *C, const char *title, int icon) PointerRNA r_ptr; void *data; - data = (void *)uiPupMenuBegin(C, title, icon); + data = (void *)UI_popup_menu_begin(C, title, icon); RNA_pointer_create(NULL, &RNA_UIPopupMenu, data, &r_ptr); @@ -307,7 +307,7 @@ static PointerRNA rna_PupMenuBegin(bContext *C, const char *title, int icon) static void rna_PupMenuEnd(bContext *C, PointerRNA *handle) { - uiPupMenuEnd(C, handle->data); + UI_popup_menu_end(C, handle->data); } /* pie menu wrapper */ @@ -316,7 +316,7 @@ static PointerRNA rna_PieMenuBegin(bContext *C, const char *title, int icon, Poi PointerRNA r_ptr; void *data; - data = (void *)uiPieMenuBegin(C, title, icon, event->data); + data = (void *)UI_pie_menu_begin(C, title, icon, event->data); RNA_pointer_create(NULL, &RNA_UIPieMenu, data, &r_ptr); @@ -325,7 +325,7 @@ static PointerRNA rna_PieMenuBegin(bContext *C, const char *title, int icon, Poi static void rna_PieMenuEnd(bContext *C, PointerRNA *handle) { - uiPieMenuEnd(C, handle->data); + UI_pie_menu_end(C, handle->data); } #else @@ -462,7 +462,7 @@ void RNA_api_wm(StructRNA *srna) rna_generic_op_invoke(func, WM_GEN_INVOKE_EVENT | WM_GEN_INVOKE_RETURN); - /* wrap uiPupMenuBegin */ + /* wrap UI_popup_menu_begin */ func = RNA_def_function(srna, "pupmenu_begin__internal", "rna_PupMenuBegin"); RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT); parm = RNA_def_string(func, "title", NULL, 0, "", ""); @@ -474,7 +474,7 @@ void RNA_api_wm(StructRNA *srna) RNA_def_property_flag(parm, PROP_RNAPTR | PROP_NEVER_NULL); RNA_def_function_return(func, parm); - /* wrap uiPupMenuEnd */ + /* wrap UI_popup_menu_end */ func = RNA_def_function(srna, "pupmenu_end__internal", "rna_PupMenuEnd"); RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT); parm = RNA_def_pointer(func, "menu", "UIPopupMenu", "", ""); |