summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/window.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/sdl/window.h')
-rw-r--r--src/osd/sdl/window.h25
1 files changed, 1 insertions, 24 deletions
diff --git a/src/osd/sdl/window.h b/src/osd/sdl/window.h
index 3de110fe536..bdaaa311330 100644
--- a/src/osd/sdl/window.h
+++ b/src/osd/sdl/window.h
@@ -38,21 +38,14 @@ public:
const osd_window_config *config)
: osd_window(), m_next(NULL),
// Following three are used by input code to defer resizes
-#if (SDLMAME_SDL2)
m_resize_width(0),
m_resize_height(0),
m_last_resize(0),
-#endif
m_minimum_dim(0,0),
m_windowed_dim(0,0),
m_rendered_event(0), m_target(0),
-#if (SDLMAME_SDL2)
m_sdl_window(NULL),
-
-#else
- m_sdlsurf(NULL),
-#endif
- m_machine(a_machine), m_monitor(a_monitor), m_fullscreen(0), m_index(0)
+ m_machine(a_machine), m_monitor(a_monitor), m_fullscreen(0)
{
m_win_config = *config;
m_index = index;
@@ -81,13 +74,9 @@ public:
osd_dim get_size() override
{
-#if (SDLMAME_SDL2)
int w=0; int h=0;
SDL_GetWindowSize(m_sdl_window, &w, &h);
return osd_dim(w,h);
-#else
- return osd_dim(m_sdlsurf->w, m_sdlsurf->h);
-#endif
}
int xy_to_render_target(int x, int y, int *xt, int *yt);
@@ -97,11 +86,7 @@ public:
int fullscreen() const override { return m_fullscreen; }
render_target *target() override { return m_target; }
-#if (SDLMAME_SDL2)
SDL_Window *sdl_window() override { return m_sdl_window; }
-#else
- SDL_Surface *sdl_surface() { return m_sdlsurf; }
-#endif
osd_dim blit_surface_size() override;
int prescale() const { return m_prescale; }
@@ -109,12 +94,10 @@ public:
// Pointer to next window
sdl_window_info * m_next;
-#if (SDLMAME_SDL2)
// These are used in combine resizing events ... #if SDL13_COMBINE_RESIZE
int m_resize_width;
int m_resize_height;
osd_ticks_t m_last_resize;
-#endif
private:
// window handle and info
@@ -129,15 +112,10 @@ private:
osd_event * m_rendered_event;
render_target * m_target;
-#if (SDLMAME_SDL2)
// Needs to be here as well so we can identify window
SDL_Window *m_sdl_window;
// Original display_mode
SDL_DisplayMode m_original_mode;
-#else
- // SDL surface
- SDL_Surface *m_sdlsurf;
-#endif
int m_extra_flags;
@@ -165,7 +143,6 @@ private:
// monitor info
osd_monitor_info * m_monitor;
int m_fullscreen;
- int m_index;
osd_renderer * m_renderer;
// static callbacks ...