diff --git a/source/blender/editors/include/UI_interface_c.hh b/source/blender/editors/include/UI_interface_c.hh index b6b5a2bba10..413900a7e81 100644 --- a/source/blender/editors/include/UI_interface_c.hh +++ b/source/blender/editors/include/UI_interface_c.hh @@ -1496,15 +1496,6 @@ int UI_text_colorid_from_report_type(int type); int UI_icon_from_event_type(short event_type, short event_value); int UI_icon_from_keymap_item(const wmKeyMapItem *kmi, int r_icon_mod[4]); -uiBut *uiDefPulldownBut(uiBlock *block, - uiBlockCreateFunc func, - void *arg, - const char *str, - int x, - int y, - short width, - short height, - const char *tip); uiBut *uiDefMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, @@ -1566,19 +1557,6 @@ uiBut *uiDefIconBlockBut(uiBlock *block, short width, short height, const char *tip); -/** - * Block button containing both string label and icon. - */ -uiBut *uiDefIconTextBlockBut(uiBlock *block, - uiBlockCreateFunc func, - void *arg, - int icon, - const char *str, - int x, - int y, - short width, - short height, - const char *tip); /** * \param arg: A pointer to string/name, use #UI_but_func_search_set() below to make this work. diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index 25a7344a5fc..525def4ffc1 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -6120,23 +6120,6 @@ uiBut *uiDefBlockButN(uiBlock *block, return but; } -uiBut *uiDefPulldownBut(uiBlock *block, - uiBlockCreateFunc func, - void *arg, - const char *str, - int x, - int y, - short width, - short height, - const char *tip) -{ - uiBut *but = ui_def_but( - block, UI_BTYPE_PULLDOWN, 0, str, x, y, width, height, arg, 0.0, 0.0, 0.0, 0.0, tip); - but->block_create_func = func; - ui_but_update(but); - return but; -} - uiBut *uiDefMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, @@ -6201,34 +6184,6 @@ uiBut *uiDefIconMenuBut(uiBlock *block, return but; } -uiBut *uiDefIconTextBlockBut(uiBlock *block, - uiBlockCreateFunc func, - void *arg, - int icon, - const char *str, - int x, - int y, - short width, - short height, - const char *tip) -{ - uiBut *but = ui_def_but( - block, UI_BTYPE_BLOCK, 0, str, x, y, width, height, arg, 0.0, 0.0, 0.0, 0.0, tip); - - /* XXX temp, old menu calls pass on icon arrow, which is now UI_BUT_ICON_SUBMENU flag */ - if (icon != ICON_RIGHTARROW_THIN) { - ui_def_but_icon(but, icon, 0); - but->drawflag |= UI_BUT_ICON_LEFT; - } - but->flag |= UI_HAS_ICON; - ui_but_submenu_enable(block, but); - - but->block_create_func = func; - ui_but_update(but); - - return but; -} - uiBut *uiDefIconBlockBut(uiBlock *block, uiBlockCreateFunc func, void *arg,