From b8706c29c7549ffc04ee815ce0dd98cb5c01fbab Mon Sep 17 00:00:00 2001
From: StapleButter <thetotalworm@gmail.com>
Date: Mon, 30 Oct 2017 03:21:12 +0100
Subject: make it betterer
---
src/libui_sdl/libui/ui.h | 2 +-
src/libui_sdl/libui/windows/menu.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'src/libui_sdl')
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;
--
cgit v1.2.3