added wxGetX11Display() returning the pointer of the correct type, unlike the old wxGetDisplay()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
cf9a878b54
commit
e4e83f385a
@ -669,18 +669,11 @@ void WXDLLEXPORT wxGetMousePosition( int* x, int* y );
|
|||||||
WXDLLIMPEXP_CORE wxString wxGetDisplayName();
|
WXDLLIMPEXP_CORE wxString wxGetDisplayName();
|
||||||
#endif // X or GTK+
|
#endif // X or GTK+
|
||||||
|
|
||||||
#ifdef __X__
|
// use this function instead of the functions above in implementation code
|
||||||
|
inline struct _XDisplay *wxGetX11Display()
|
||||||
#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
|
{
|
||||||
// The resulting warnings are switched off here
|
return (_XDisplay *)wxGetDisplay();
|
||||||
#pragma message disable nosimpint
|
}
|
||||||
#endif
|
|
||||||
// #include <X11/Xlib.h>
|
|
||||||
#ifdef __VMS__
|
|
||||||
#pragma message enable nosimpint
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif //__X__
|
|
||||||
|
|
||||||
#endif // wxUSE_GUI
|
#endif // wxUSE_GUI
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user