diff options
author | 2015-05-02 19:41:03 +0200 | |
---|---|---|
committer | 2015-05-02 19:41:03 +0200 | |
commit | cc3b682e52bf097d31db78032aad01d6a0b12e94 (patch) | |
tree | 860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /src/emu/ui/filemngr.h | |
parent | 7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff) | |
parent | a649a95488e1fc85813dda747dc74c596496bd1c (diff) |
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/emu/ui/filemngr.h')
-rw-r--r-- | src/emu/ui/filemngr.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/ui/filemngr.h b/src/emu/ui/filemngr.h index a2d7fbca74f..dbc4c72e50d 100644 --- a/src/emu/ui/filemngr.h +++ b/src/emu/ui/filemngr.h @@ -16,8 +16,8 @@ class ui_menu_file_manager : public ui_menu { public: - astring current_directory; - astring current_file; + std::string current_directory; + std::string current_file; device_image_interface *selected_device; static void force_file_manager(running_machine &machine, render_container *container, const char *warnings); @@ -28,10 +28,10 @@ public: virtual void handle(); virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2); - void fill_image_line(device_image_interface *img, astring &instance, astring &filename); + void fill_image_line(device_image_interface *img, std::string &instance, std::string &filename); private: - astring m_warnings; + std::string m_warnings; bool m_curr_selected; }; |