Committing in .
Changes to get the libraries cleanly compiled on VMS Modified Files: wxWindows/setup.h_vms wxWindows/src/common/image.cpp wxWindows/src/motif/dcclient.cpp ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
27
setup.h_vms
27
setup.h_vms
@@ -27,6 +27,9 @@
|
|||||||
|
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
|
/* fill in with the string wxGetOsDescription() will return */
|
||||||
|
#define WXWIN_OS_DESCRIPTION "OpenVMS"
|
||||||
|
|
||||||
/* Define to `int' if <sys/types.h> doesn't define. */
|
/* Define to `int' if <sys/types.h> doesn't define. */
|
||||||
#undef gid_t
|
#undef gid_t
|
||||||
|
|
||||||
@@ -102,6 +105,9 @@
|
|||||||
#undef STRICT
|
#undef STRICT
|
||||||
#undef WINVER
|
#undef WINVER
|
||||||
|
|
||||||
|
/* enable rich edit not on VMS (Win32 Only) */
|
||||||
|
#define wxUSE_RICHEDIT 0
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Supports bool type
|
* Supports bool type
|
||||||
*/
|
*/
|
||||||
@@ -119,6 +125,10 @@
|
|||||||
* Use libjpeg
|
* Use libjpeg
|
||||||
*/
|
*/
|
||||||
#define wxUSE_LIBJPEG 1
|
#define wxUSE_LIBJPEG 1
|
||||||
|
/*
|
||||||
|
* Use libtiff
|
||||||
|
*/
|
||||||
|
#define wxUSE_LIBTIFF 1
|
||||||
/*
|
/*
|
||||||
* Use iODBC
|
* Use iODBC
|
||||||
*/
|
*/
|
||||||
@@ -267,6 +277,10 @@
|
|||||||
* Use this control
|
* Use this control
|
||||||
*/
|
*/
|
||||||
#define wxUSE_SPINBTN 1
|
#define wxUSE_SPINBTN 1
|
||||||
|
/*
|
||||||
|
* Use this control
|
||||||
|
*/
|
||||||
|
#define wxUSE_SPINCTRL 1
|
||||||
/*
|
/*
|
||||||
* Use this control
|
* Use this control
|
||||||
*/
|
*/
|
||||||
@@ -618,14 +632,17 @@
|
|||||||
/* Define if you have pthread_cancel */
|
/* Define if you have pthread_cancel */
|
||||||
#undef HAVE_PTHREAD_CANCEL
|
#undef HAVE_PTHREAD_CANCEL
|
||||||
|
|
||||||
|
/* Define if you have shl_load() */
|
||||||
|
#undef HAVE_SHL_LOAD
|
||||||
|
|
||||||
/* Define if you have all functions to set thread priority */
|
/* Define if you have all functions to set thread priority */
|
||||||
#undef HAVE_THREAD_PRIORITY_FUNCTIONS
|
#undef HAVE_THREAD_PRIORITY_FUNCTIONS
|
||||||
|
|
||||||
/* Define if you can specify exit functions to a thread */
|
/* Define if you can specify exit functions to a thread */
|
||||||
#undef HAVE_THREAD_CLEANUP_FUNCTIONS
|
#undef HAVE_THREAD_CLEANUP_FUNCTIONS
|
||||||
|
|
||||||
/* Define if you have shl_load() */
|
/* Define if you have timegm() function */
|
||||||
#undef HAVE_SHL_LOAD
|
#undef HAVE_TIMEGM
|
||||||
|
|
||||||
/* Define if you have vsnprintf() */
|
/* Define if you have vsnprintf() */
|
||||||
#undef HAVE_VSNPRINTF
|
#undef HAVE_VSNPRINTF
|
||||||
@@ -678,6 +695,9 @@
|
|||||||
/* Define if you have strtok_r function. */
|
/* Define if you have strtok_r function. */
|
||||||
#undef HAVE_STRTOK_R
|
#undef HAVE_STRTOK_R
|
||||||
|
|
||||||
|
/* Define if you have thr_setconcurrency function */
|
||||||
|
#undef HaVE_THR_SETCONCURRENCY
|
||||||
|
|
||||||
/* Define if you have the uname function. */
|
/* Define if you have the uname function. */
|
||||||
#define HAVE_UNAME
|
#define HAVE_UNAME
|
||||||
|
|
||||||
@@ -714,4 +734,7 @@
|
|||||||
/* Define if you have the <wcstr.h> header file. */
|
/* Define if you have the <wcstr.h> header file. */
|
||||||
#undef HAVE_WCSTR_H
|
#undef HAVE_WCSTR_H
|
||||||
|
|
||||||
|
/* Define this if you are using gtk and gdk contains support for X11R6 XIM */
|
||||||
|
#undef HAVE_XIM
|
||||||
|
|
||||||
#endif /* __WX_SETUP_H__ */
|
#endif /* __WX_SETUP_H__ */
|
||||||
|
|||||||
@@ -692,7 +692,7 @@ bool wxImageHandler::CanRead( const wxString& name )
|
|||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
return FALSE;
|
// return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // wxUSE_STREAMS
|
#endif // wxUSE_STREAMS
|
||||||
|
|||||||
@@ -1267,7 +1267,6 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
|
|||||||
{
|
{
|
||||||
// draw black pixels, ignore white ones (i.e. transparent b/g)
|
// draw black pixels, ignore white ones (i.e. transparent b/g)
|
||||||
if (image.GetRed(sx, sy) == 0)
|
if (image.GetRed(sx, sy) == 0)
|
||||||
{
|
|
||||||
{
|
{
|
||||||
DrawPoint(x1 + maxx - rx, cy + y1 - ry);
|
DrawPoint(x1 + maxx - rx, cy + y1 - ry);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user