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

Don't use X11-only GDK functions in wxGTK/Win32 build.

Browse Source 
Add GDK_WINDOWING_X11 checks to allow compiling wxGTK display code under
Win32.

Closes #16270.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-17 12:29:54 +00:00
parent da4ca22383
commit 0d54910b43
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/display.cpp
View File

@@ -26,7 +26,9 @@ GdkWindow* wxGetTopLevelGDK();
#if !(wxUSE_LIBHILDON || wxUSE_LIBHILDON2) #if !(wxUSE_LIBHILDON || wxUSE_LIBHILDON2)
#ifdef GDK_WINDOWING_X11
void wxGetWorkAreaX11(Screen* screen, int& x, int& y, int& width, int& height); void wxGetWorkAreaX11(Screen* screen, int& x, int& y, int& width, int& height);
#endif
#ifndef __WXGTK3__ #ifndef __WXGTK3__
static inline int wx_gdk_screen_get_primary_monitor(GdkScreen* screen) static inline int wx_gdk_screen_get_primary_monitor(GdkScreen* screen)
@@ -175,10 +177,12 @@ bool wxDisplayImplGTK::IsPrimary() const
return gdk_screen_get_primary_monitor(m_screen) == int(m_index); return gdk_screen_get_primary_monitor(m_screen) == int(m_index);
} }
#ifdef GDK_WINDOWING_X11
wxArrayVideoModes wxXF86VidMode_GetModes(const wxVideoMode& mode, Display* pDisplay, int nScreen); wxArrayVideoModes wxXF86VidMode_GetModes(const wxVideoMode& mode, Display* pDisplay, int nScreen);
wxVideoMode wxXF86VidMode_GetCurrentMode(Display* display, int nScreen); wxVideoMode wxXF86VidMode_GetCurrentMode(Display* display, int nScreen);
bool wxXF86VidMode_ChangeMode(const wxVideoMode& mode, Display* display, int nScreen); bool wxXF86VidMode_ChangeMode(const wxVideoMode& mode, Display* display, int nScreen);
wxArrayVideoModes wxX11_GetModes(const wxDisplayImpl* impl, const wxVideoMode& modeMatch, Display* display); wxArrayVideoModes wxX11_GetModes(const wxDisplayImpl* impl, const wxVideoMode& modeMatch, Display* display);
#endif
wxArrayVideoModes wxDisplayImplGTK::GetModes(const wxVideoMode& mode) const wxArrayVideoModes wxDisplayImplGTK::GetModes(const wxVideoMode& mode) const
{ {
@@ -196,7 +200,9 @@ wxArrayVideoModes wxDisplayImplGTK::GetModes(const wxVideoMode& mode) const
modes = wxX11_GetModes(this, mode, display); modes = wxX11_GetModes(this, mode, display);
#endif #endif
} }
#endif // GDK_WINDOWING_X11 #else
wxUnusedVar(mode);
#endif
return modes; return modes;
} }