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

linking fixes after last checkin

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

12
src/unix/displayx11.cpp
View File

@@ -171,7 +171,7 @@ wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(size_t n)
#define wxCVM2(v, dc) wxVideoMode(v.hdisplay, v.vdisplay, DefaultDepth((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay())), wxCRR2(v,dc)) #define wxCVM2(v, dc) wxVideoMode(v.hdisplay, v.vdisplay, DefaultDepth((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay())), wxCRR2(v,dc))
#define wxCVM(v) wxCVM2(v, v.dotclock) #define wxCVM(v) wxCVM2(v, v.dotclock)
wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
{ {
//Convenience... //Convenience...
Display* pDisplay = (Display*) wxGetDisplay(); //default display Display* pDisplay = (Display*) wxGetDisplay(); //default display
@@ -205,7 +205,7 @@ wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
return Modes; return Modes;
} }
wxVideoMode wxDisplay::GetCurrentMode() const wxVideoMode wxDisplayImplX11::GetCurrentMode() const
{ {
XF86VidModeModeLine VM; XF86VidModeModeLine VM;
int nDotClock; int nDotClock;
@@ -215,7 +215,7 @@ wxVideoMode wxDisplay::GetCurrentMode() const
return wxCVM2(VM, nDotClock); return wxCVM2(VM, nDotClock);
} }
bool wxDisplay::ChangeMode(const wxVideoMode& mode) bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
{ {
XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :)) XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
int nNumModes; //Number of modes enumerated.... int nNumModes; //Number of modes enumerated....
@@ -264,7 +264,7 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
#else // !HAVE_X11_EXTENSIONS_XF86VMODE_H #else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
{ {
int count_return; int count_return;
int* depths = XListDepths((Display*)wxGetDisplay(), 0, &count_return); int* depths = XListDepths((Display*)wxGetDisplay(), 0, &count_return);
@@ -281,13 +281,13 @@ wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
return modes; return modes;
} }
wxVideoMode wxDisplay::GetCurrentMode() const wxVideoMode wxDisplayImplX11::GetCurrentMode() const
{ {
// Not implemented // Not implemented
return wxVideoMode(); return wxVideoMode();
} }
bool wxDisplay::ChangeMode(const wxVideoMode& mode) bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
{ {
// Not implemented // Not implemented
return false; return false;