diff options
| author | StapleButter <thetotalworm@gmail.com> | 2017-10-30 03:21:12 +0100 | 
|---|---|---|
| committer | StapleButter <thetotalworm@gmail.com> | 2017-10-30 03:21:12 +0100 | 
| commit | b8706c29c7549ffc04ee815ce0dd98cb5c01fbab (patch) | |
| tree | 4ba58e65514fbdfd202ce3d618e30f8618a96b4d | |
| parent | 7e18b9f195d870d039a372443aeaa16613e479ca (diff) | |
make it betterer
| -rw-r--r-- | src/libui_sdl/libui/ui.h | 2 | ||||
| -rw-r--r-- | src/libui_sdl/libui/windows/menu.cpp | 4 | 
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libui_sdl/libui/ui.h b/src/libui_sdl/libui/ui.h index 31ca5a9..f76f218 100644 --- a/src/libui_sdl/libui/ui.h +++ b/src/libui_sdl/libui/ui.h @@ -273,7 +273,7 @@ _UI_EXTERN uiMenuItem *uiMenuAppendCheckItem(uiMenu *m, const char *name);  _UI_EXTERN uiMenuItem *uiMenuAppendQuitItem(uiMenu *m);  _UI_EXTERN uiMenuItem *uiMenuAppendPreferencesItem(uiMenu *m);  _UI_EXTERN uiMenuItem *uiMenuAppendAboutItem(uiMenu *m); -_UI_EXTERN uiMenuItem *uiMenuAppendSubmenu(uiMenu *m, const char *name, uiMenu* child); +_UI_EXTERN uiMenuItem *uiMenuAppendSubmenu(uiMenu *m, uiMenu* child);  _UI_EXTERN void uiMenuAppendSeparator(uiMenu *m);  _UI_EXTERN uiMenu *uiNewMenu(const char *name); diff --git a/src/libui_sdl/libui/windows/menu.cpp b/src/libui_sdl/libui/windows/menu.cpp index 2310e61..1f721b6 100644 --- a/src/libui_sdl/libui/windows/menu.cpp +++ b/src/libui_sdl/libui/windows/menu.cpp @@ -160,7 +160,7 @@ static uiMenuItem *newItem(uiMenu *m, int type, const char *name)  	return item;  } -uiMenuItem *uiMenuAppendSubmenu(uiMenu *m, const char *name, uiMenu* child) +uiMenuItem *uiMenuAppendSubmenu(uiMenu *m, uiMenu* child)  {  	uiMenuItem *item; @@ -178,7 +178,7 @@ uiMenuItem *uiMenuAppendSubmenu(uiMenu *m, const char *name, uiMenu* child)  	m->len++;  	item->type = typeSubmenu; -    item->name = toUTF16(name); +    item->name = child->name;      item->popupchild = child;      child->ischild = TRUE;  |