diff options
author | 2016-02-21 11:48:45 +0100 | |
---|---|---|
committer | 2016-02-21 11:48:45 +0100 | |
commit | cc24a339d8c0517259084b5c178d784626ba965c (patch) | |
tree | 9868e9687b5802ae0a3733712a3bbeb3bc75c953 /src/osd/modules/osdwindow.h | |
parent | b5daabda5495dea5c50e17961ecfed2ea8619d76 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'src/osd/modules/osdwindow.h')
-rw-r--r-- | src/osd/modules/osdwindow.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h index be4f016f0f9..d4c2a4101cc 100644 --- a/src/osd/modules/osdwindow.h +++ b/src/osd/modules/osdwindow.h @@ -37,7 +37,9 @@ public: #else m_hwnd(0), m_dc(0), m_focus_hwnd(0), m_resize_state(0), #endif - m_primlist(NULL), + m_primlist(nullptr), + m_index(0), + m_main(nullptr), m_prescale(1) {} virtual ~osd_window() { } @@ -55,12 +57,8 @@ public: #ifdef OSD_SDL virtual osd_dim blit_surface_size() = 0; virtual osd_monitor_info *monitor() const = 0; -#if (SDLMAME_SDL2) virtual SDL_Window *sdl_window() = 0; #else - virtual SDL_Surface *sdl_surface() = 0; -#endif -#else virtual osd_monitor_info *monitor() const = 0; virtual bool win_has_menu() = 0; // FIXME: cann we replace winwindow_video_window_monitor(NULL) with monitor() ? @@ -78,6 +76,8 @@ public: render_primitive_list *m_primlist; osd_window_config m_win_config; + int m_index; + osd_window *m_main; protected: int m_prescale; }; |