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

compilation fixes after last checkin

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-16 04:30:53 +00:00
parent 22d679f369
commit 547308b8e6
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/unix/displayx11.cpp
View File

@@ -84,8 +84,9 @@ private:
class WXDLLEXPORT wxDisplayImplX11 : public wxDisplayImpl class WXDLLEXPORT wxDisplayImplX11 : public wxDisplayImpl
{ {
public: public:
wxDisplayImplX11(const XineramaScreenInfo& info) wxDisplayImplX11(size_t n, const XineramaScreenInfo& info)
: m_rect(info.x_org, info.y_org, info.width, info.height) : wxDisplayImpl(n),
m_rect(info.x_org, info.y_org, info.width, info.height)
{ {
} }
@@ -147,7 +148,7 @@ wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(size_t n)
{ {
ScreensInfo screens; ScreensInfo screens;
return n < screens.GetCount() ? new wxDisplayImplX11(screens[n]) : NULL; return n < screens.GetCount() ? new wxDisplayImplX11(n, screens[n]) : NULL;
} }
// ============================================================================ // ============================================================================
@@ -300,10 +301,12 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
/* static */ wxDisplayFactory *wxDisplay::CreateFactory() /* static */ wxDisplayFactory *wxDisplay::CreateFactory()
{ {
Display *disp = (Display*)wxGetDisplay(); if ( XineramaIsActive((Display*)wxGetDisplay()) )
{
return new wxDisplayFactoryX11;
}
return XineramaIsActive(disp) ? new wxDisplayFactoryX11 return new wxDisplayFactorySingle;
: new wxDisplayFactorySingle;
} }
#endif /* wxUSE_DISPLAY */ #endif /* wxUSE_DISPLAY */