Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename helper display function to use wx naming convention

Browse Source 
Don't pretend to be a GDK function, even if it's only a thin wrapper for
a GDK macro.
This commit is contained in:
Vadim Zeitlin
2018-10-05 18:52:30 +02:00
parent 5e6e7aa769
commit 86ba770cd0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/display.cpp
View File

@@ -141,7 +141,7 @@ bool wxDisplayImplGTK::ChangeMode(const wxVideoMode& WXUNUSED(mode))
#ifdef __WXGTK3__ #ifdef __WXGTK3__
static inline bool gdk_is_x11_screen(GdkScreen* screen) static inline bool wxIsX11GDKScreen(GdkScreen* screen)
{ {
return GDK_IS_X11_SCREEN(screen); return GDK_IS_X11_SCREEN(screen);
} }
@@ -159,7 +159,7 @@ static inline int wx_gdk_screen_get_primary_monitor(GdkScreen* screen)
} }
#define gdk_screen_get_primary_monitor wx_gdk_screen_get_primary_monitor #define gdk_screen_get_primary_monitor wx_gdk_screen_get_primary_monitor
static inline bool gdk_is_x11_screen(GdkScreen* WXUNUSED(screen)) static inline bool wxIsX11GDKScreen(GdkScreen* WXUNUSED(screen))
{ {
return true; return true;
} }
@@ -178,7 +178,7 @@ wx_gdk_screen_get_monitor_workarea(GdkScreen* screen, int monitor, GdkRectangle*
{ {
gdk_screen_get_monitor_geometry(screen, monitor, dest); gdk_screen_get_monitor_geometry(screen, monitor, dest);
#ifdef wxGTK_HAVE_X11_DISPLAY #ifdef wxGTK_HAVE_X11_DISPLAY
if ( gdk_is_x11_screen(screen) ) if ( wxIsX11GDKScreen(screen) )
{ {
GdkRectangle rect = { 0, 0, 0, 0 }; GdkRectangle rect = { 0, 0, 0, 0 };
wxGetWorkAreaX11(GDK_SCREEN_XSCREEN(screen), wxGetWorkAreaX11(GDK_SCREEN_XSCREEN(screen),
@@ -279,7 +279,7 @@ wxArrayVideoModes wxDisplayImplGTK::GetModes(const wxVideoMode& mode) const
{ {
wxArrayVideoModes modes; wxArrayVideoModes modes;
#ifdef wxGTK_HAVE_X11_DISPLAY #ifdef wxGTK_HAVE_X11_DISPLAY
if ( gdk_is_x11_screen(m_screen) ) if ( wxIsX11GDKScreen(m_screen) )
{ {
Display* display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(m_screen)); Display* display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(m_screen));
#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
@@ -299,7 +299,7 @@ wxVideoMode wxDisplayImplGTK::GetCurrentMode() const
{ {
wxVideoMode mode; wxVideoMode mode;
#if defined(wxGTK_HAVE_X11_DISPLAY) && defined(HAVE_X11_EXTENSIONS_XF86VMODE_H) #if defined(wxGTK_HAVE_X11_DISPLAY) && defined(HAVE_X11_EXTENSIONS_XF86VMODE_H)
if ( gdk_is_x11_screen(m_screen) ) if ( wxIsX11GDKScreen(m_screen) )
{ {
Display* display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(m_screen)); Display* display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(m_screen));
int nScreen = gdk_x11_screen_get_screen_number(m_screen); int nScreen = gdk_x11_screen_get_screen_number(m_screen);
@@ -313,7 +313,7 @@ bool wxDisplayImplGTK::ChangeMode(const wxVideoMode& mode)
{ {
bool success = false; bool success = false;
#if defined(wxGTK_HAVE_X11_DISPLAY) && defined(HAVE_X11_EXTENSIONS_XF86VMODE_H) #if defined(wxGTK_HAVE_X11_DISPLAY) && defined(HAVE_X11_EXTENSIONS_XF86VMODE_H)
if ( gdk_is_x11_screen(m_screen) ) if ( wxIsX11GDKScreen(m_screen) )
{ {
Display* display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(m_screen)); Display* display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(m_screen));
int nScreen = gdk_x11_screen_get_screen_number(m_screen); int nScreen = gdk_x11_screen_get_screen_number(m_screen);