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

Don't use wxDisplayFactorySingleX11 in wxGTK if wxUSE_DISPLAY==0

Browse Source 
wxDisplay::CreateFactory() shouldn't be defined in this file when
building wxGTK, whether wxUSE_DISPLAY==1 or 0.
This commit is contained in:
Vadim Zeitlin
2018-10-04 16:31:55 +02:00
parent f4c7a31414
commit f704c40207
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/unix/displayx11.cpp
View File

@@ -370,6 +370,7 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))
#endif // !__WXGTK20__ #endif // !__WXGTK20__
#endif // !HAVE_X11_EXTENSIONS_XF86VMODE_H #endif // !HAVE_X11_EXTENSIONS_XF86VMODE_H
#endif // !defined(__WXGTK20__) || defined(GDK_WINDOWING_X11) #endif // !defined(__WXGTK20__) || defined(GDK_WINDOWING_X11)
#endif // wxUSE_DISPLAY
// ============================================================================ // ============================================================================
// wxDisplay::CreateFactory() // wxDisplay::CreateFactory()
@@ -378,21 +379,14 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))
#ifndef __WXGTK20__ #ifndef __WXGTK20__
/* static */ wxDisplayFactory *wxDisplay::CreateFactory() /* static */ wxDisplayFactory *wxDisplay::CreateFactory()
{ {
if ( !XineramaIsActive((Display*)wxGetDisplay()) ) #if wxUSE_DISPLAY
return new wxDisplayFactorySingleX11; if ( XineramaIsActive((Display*)wxGetDisplay()) )
return new wxDisplayFactoryX11;
#endif // wxUSE_DISPLAY
return new wxDisplayFactoryX11;
}
#endif
#else // !wxUSE_DISPLAY
/* static */ wxDisplayFactory *wxDisplay::CreateFactory()
{
return new wxDisplayFactorySingleX11; return new wxDisplayFactorySingleX11;
} }
#endif
#endif // wxUSE_DISPLAY/!wxUSE_DISPLAY
#if !defined(__WXGTK20__) || defined(GDK_WINDOWING_X11) #if !defined(__WXGTK20__) || defined(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)