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

Committing in .

Browse Source 
Update of OpenVMS compile support

 Modified Files:
 	wxWidgets/setup.h_vms wxWidgets/src/common/descrip.mms
 	wxWidgets/src/generic/descrip.mms
 	wxWidgets/src/gtk/descrip.mms wxWidgets/src/unix/descrip.mms
 	wxWidgets/src/unix/displayx11.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen
2006-02-20 13:47:08 +00:00
parent 1fb33bdb46
commit 088af5898e
6 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/unix/displayx11.cpp
View File

@@ -33,11 +33,13 @@
* Xlibint.h conflicts with a function declaration in wx/list.h. */
extern "C" {
#include <X11/Xlib.h>
#ifndef __VMS
#include <X11/Xlibint.h>
#include <X11/extensions/Xinerama.h>
# include <X11/extensions/Xinerama.h>
#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
#include <X11/extensions/xf86vmode.h>
#endif
#endif
}
class wxDisplayUnixPriv
@@ -51,7 +53,8 @@ size_t wxDisplayBase::GetCount()
{
Display *disp = (Display*)wxGetDisplay();
if ( XineramaIsActive(disp) )
#ifndef __VMS
if ( XineramaIsActive(disp) )
{
XineramaScreenInfo *screenarr;
int numscreens;
@@ -60,6 +63,7 @@ size_t wxDisplayBase::GetCount()
return numscreens;
}
else
#endif
{
return 1;
}
@@ -69,7 +73,8 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
{
Display *disp = (Display*)wxGetDisplay();
if ( XineramaIsActive(disp) )
#ifndef __VMS
if ( XineramaIsActive(disp) )
{
int which_screen = -1;
XineramaScreenInfo *screenarr;
@@ -92,7 +97,8 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
return which_screen;
}
else
{
#endif
{
wxSize size = wxGetDisplaySize();
if (p.x >= 0 &&
p.x < size.GetWidth() &&
@@ -110,7 +116,8 @@ wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisp
{
Display *disp = (Display*)wxGetDisplay();
if ( XineramaIsActive(disp) )
#ifndef __VMS
if ( XineramaIsActive(disp) )
{
XineramaScreenInfo *screenarr;
int numscreens;
@@ -122,7 +129,8 @@ wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisp
XFree(screenarr);
}
else
{
#endif
{
wxSize size = wxGetDisplaySize();
m_priv->m_rect = wxRect(0, 0, size.GetWidth(), size.GetHeight());
m_priv->m_depth = wxDisplayDepth();