summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/ui/ui.cpp
diff options
context:
space:
mode:
author motoschifo <motoschifo@users.noreply.github.com>2016-02-09 19:12:04 +0100
committer motoschifo <motoschifo@users.noreply.github.com>2016-02-09 19:12:04 +0100
commit8b880ab07f43c80461e9645628da36929076c4d0 (patch)
tree732b0a3bfad727677fbf1d8ff5ccb2cdc7cd939c /src/emu/ui/ui.cpp
parentf736cd5abcea21c8b2c8c4f2d2909952856ac22d (diff)
parent8e30db1e7441983971abaf8fa8c04a8c5475c6b0 (diff)
Merge pull request #2 from mamedev/master
Update to master
Diffstat (limited to 'src/emu/ui/ui.cpp')
-rw-r--r--src/emu/ui/ui.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp
index af60e5de777..c92e700b433 100644
--- a/src/emu/ui/ui.cpp
+++ b/src/emu/ui/ui.cpp
@@ -2621,7 +2621,7 @@ void ui_manager::set_use_natural_keyboard(bool use_natural_keyboard)
// wrap_text
//-------------------------------------------------
-void ui_manager::wrap_text(render_container *container, const char *origs, float x, float y, float origwrapwidth, int &count, std::vector<int> &xstart, std::vector<int> &xend, float text_size)
+int ui_manager::wrap_text(render_container *container, const char *origs, float x, float y, float origwrapwidth, std::vector<int> &xstart, std::vector<int> &xend, float text_size)
{
float lineheight = get_line_height() * text_size;
const char *ends = origs + strlen(origs);
@@ -2630,7 +2630,7 @@ void ui_manager::wrap_text(render_container *container, const char *origs, float
const char *linestart;
float maxwidth = 0;
float aspect = machine().render().ui_aspect(container);
- count = 0;
+ int count = 0;
// loop over lines
while (*s != 0)
@@ -2746,6 +2746,7 @@ void ui_manager::wrap_text(render_container *container, const char *origs, float
break;
}
}
+ return count;
}
//-------------------------------------------------