trunk/src/emu/ui/custui.cpp
| r253180 | r253181 | |
|---|
| 141 | 141 | ui_menu_font_ui::ui_menu_font_ui(running_machine &machine, render_container *container) : ui_menu(machine, container) |
| 142 | 142 | { |
| 143 | 143 | emu_options &moptions = machine.options(); |
| 144 | | #ifdef OSD_WINDOWS |
| 144 | #ifdef UI_WINDOWS |
| 145 | 145 | |
| 146 | 146 | std::string name(moptions.ui_font()); |
| 147 | 147 | list(); |
| r253180 | r253181 | |
|---|
| 180 | 180 | |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | | #ifdef OSD_WINDOWS |
| 183 | #ifdef UI_WINDOWS |
| 184 | 184 | //------------------------------------------------- |
| 185 | 185 | // fonts enumerator CALLBACK |
| 186 | 186 | //------------------------------------------------- |
| r253180 | r253181 | |
|---|
| 227 | 227 | std::string error_string; |
| 228 | 228 | emu_options &moptions = machine().options(); |
| 229 | 229 | |
| 230 | | #ifdef OSD_WINDOWS |
| 230 | #ifdef UI_WINDOWS |
| 231 | 231 | std::string name(m_fonts[m_actual]); |
| 232 | 232 | if (m_fonts[m_actual] != "default") |
| 233 | 233 | { |
| r253180 | r253181 | |
|---|
| 273 | 273 | } |
| 274 | 274 | break; |
| 275 | 275 | |
| 276 | | #ifdef OSD_WINDOWS |
| 276 | #ifdef UI_WINDOWS |
| 277 | 277 | |
| 278 | 278 | case MUI_FNT: |
| 279 | 279 | if (m_event->iptkey == IPT_UI_LEFT || m_event->iptkey == IPT_UI_RIGHT) |
| r253180 | r253181 | |
|---|
| 313 | 313 | UINT32 arrow_flags; |
| 314 | 314 | std::string tmptxt; |
| 315 | 315 | |
| 316 | | #ifdef OSD_WINDOWS |
| 316 | #ifdef UI_WINDOWS |
| 317 | 317 | // add fonts option |
| 318 | 318 | arrow_flags = get_arrow_flags(0, m_fonts.size() - 1, m_actual); |
| 319 | 319 | std::string name(m_fonts[m_actual]); |
trunk/src/emu/ui/dsplmenu.cpp
| r253180 | r253181 | |
|---|
| 15 | 15 | #include "ui/selector.h" |
| 16 | 16 | #include "ui/utils.h" |
| 17 | 17 | |
| 18 | | #if defined(OSD_WINDOWS) && !defined(OSD_SDL) |
| 18 | #if defined(UI_WINDOWS) && !defined(UI_SDL) |
| 19 | 19 | #include "../osd/windows/winmain.h" |
| 20 | 20 | #else |
| 21 | 21 | #include "../osd/modules/lib/osdobj_common.h" |
| r253180 | r253181 | |
|---|
| 24 | 24 | ui_menu_display_options::video_modes ui_menu_display_options::m_video[] = { |
| 25 | 25 | { "auto", "Auto" }, |
| 26 | 26 | { "opengl", "OpenGL" }, |
| 27 | | #if defined(OSD_WINDOWS) && !defined(OSD_SDL) |
| 27 | #if defined(UI_WINDOWS) && !defined(UI_SDL) |
| 28 | 28 | { "d3d", "Direct3D" }, |
| 29 | 29 | { "gdi", "GDI" }, |
| 30 | 30 | { "ddraw", "DirectDraw" } |
| r253180 | r253181 | |
|---|
| 37 | 37 | ui_menu_display_options::dspl_option ui_menu_display_options::m_options[] = { |
| 38 | 38 | { 0, nullptr, nullptr }, |
| 39 | 39 | { 0, "Video Mode", OSDOPTION_VIDEO }, |
| 40 | | #if defined(OSD_WINDOWS) && !defined(OSD_SDL) |
| 40 | #if defined(UI_WINDOWS) && !defined(UI_SDL) |
| 41 | 41 | { 0, "Hardware Stretch", WINOPTION_HWSTRETCH }, |
| 42 | 42 | { 0, "Triple Buffering", WINOPTION_TRIPLEBUFFER }, |
| 43 | 43 | { 0, "HLSL", WINOPTION_HLSL_ENABLE }, |
| r253180 | r253181 | |
|---|
| 60 | 60 | |
| 61 | 61 | ui_menu_display_options::ui_menu_display_options(running_machine &machine, render_container *container) : ui_menu(machine, container) |
| 62 | 62 | { |
| 63 | | #if defined(OSD_WINDOWS) && !defined(OSD_SDL) |
| 63 | #if defined(UI_WINDOWS) && !defined(UI_SDL) |
| 64 | 64 | windows_options &options = downcast<windows_options &>(machine.options()); |
| 65 | 65 | #else |
| 66 | 66 | osd_options &options = downcast<osd_options &>(machine.options()); |