diff --git a/src/motif/bdiag.xbm b/src/motif/bdiag.xbm index 9ff0a1822f..6b3ba001e9 100644 --- a/src/motif/bdiag.xbm +++ b/src/motif/bdiag.xbm @@ -1,6 +1,6 @@ #define bdiag_width 16 #define bdiag_height 16 -static char bdiag_bits[] = { +static unsigned char bdiag_bits[] = { 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01}; diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp index a04c74e4cb..feb64ecb15 100644 --- a/src/motif/bmpmotif.cpp +++ b/src/motif/bmpmotif.cpp @@ -232,7 +232,7 @@ Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap ) { - static char stipple_data[] = + static unsigned char stipple_data[] = { 0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA, @@ -259,7 +259,9 @@ XCreateInsensitivePixmap( Display *display, Pixmap pixmap ) /* Get the stipple pixmap to be used to 'gray-out' the argument pixmap. */ - stipple = XCreateBitmapFromData( display, pixmap, stipple_data, 16, 16 ); + stipple = XCreateBitmapFromData( display, pixmap, + reinterpret_cast(stipple_data), + 16, 16 ); if ( 0 != stipple ) { gc = XCreateGC( display, pixmap, (XtGCMask)0, NULL ); diff --git a/src/motif/cdiag.xbm b/src/motif/cdiag.xbm index 15dc7ba86d..e0502f2303 100644 --- a/src/motif/cdiag.xbm +++ b/src/motif/cdiag.xbm @@ -1,6 +1,6 @@ #define cdiag_width 16 #define cdiag_height 16 -static char cdiag_bits[] = { +static unsigned char cdiag_bits[] = { 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81}; diff --git a/src/motif/cross.xbm b/src/motif/cross.xbm index b07cbe7fcd..916ee76e3a 100644 --- a/src/motif/cross.xbm +++ b/src/motif/cross.xbm @@ -1,6 +1,6 @@ #define cross_width 15 #define cross_height 15 -static char cross_bits[] = { +static unsigned char cross_bits[] = { 0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10}; diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp index 2f401b0a35..a259100ee7 100644 --- a/src/motif/dcclient.cpp +++ b/src/motif/dcclient.cpp @@ -1653,35 +1653,35 @@ void wxWindowDCImpl::SetPen( const wxPen &pen ) if (bdiag == (Pixmap) 0) bdiag = XCreateBitmapFromData ((Display*) m_display, RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)), - bdiag_bits, bdiag_width, bdiag_height); + reinterpret_cast(bdiag_bits), bdiag_width, bdiag_height); myStipple = bdiag; break; case wxFDIAGONAL_HATCH: if (fdiag == (Pixmap) 0) fdiag = XCreateBitmapFromData ((Display*) m_display, RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)), - fdiag_bits, fdiag_width, fdiag_height); + reinterpret_cast(fdiag_bits), fdiag_width, fdiag_height); myStipple = fdiag; break; case wxCROSS_HATCH: if (cross == (Pixmap) 0) cross = XCreateBitmapFromData ((Display*) m_display, RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)), - cross_bits, cross_width, cross_height); + reinterpret_cast(cross_bits), cross_width, cross_height); myStipple = cross; break; case wxHORIZONTAL_HATCH: if (horiz == (Pixmap) 0) horiz = XCreateBitmapFromData ((Display*) m_display, RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)), - horiz_bits, horiz_width, horiz_height); + reinterpret_cast(horiz_bits), horiz_width, horiz_height); myStipple = horiz; break; case wxVERTICAL_HATCH: if (verti == (Pixmap) 0) verti = XCreateBitmapFromData ((Display*) m_display, RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)), - verti_bits, verti_width, verti_height); + reinterpret_cast(verti_bits), verti_width, verti_height); myStipple = verti; break; case wxCROSSDIAG_HATCH: @@ -1689,7 +1689,7 @@ void wxWindowDCImpl::SetPen( const wxPen &pen ) if (cdiag == (Pixmap) 0) cdiag = XCreateBitmapFromData ((Display*) m_display, RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)), - cdiag_bits, cdiag_width, cdiag_height); + reinterpret_cast(cdiag_bits), cdiag_width, cdiag_height); myStipple = cdiag; break; } @@ -1824,35 +1824,35 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush ) if (bdiag == (Pixmap) 0) bdiag = XCreateBitmapFromData ((Display*) m_display, RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)), - bdiag_bits, bdiag_width, bdiag_height); + reinterpret_cast(bdiag_bits), bdiag_width, bdiag_height); myStipple = bdiag; break; case wxFDIAGONAL_HATCH: if (fdiag == (Pixmap) 0) fdiag = XCreateBitmapFromData ((Display*) m_display, RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)), - fdiag_bits, fdiag_width, fdiag_height); + reinterpret_cast(fdiag_bits), fdiag_width, fdiag_height); myStipple = fdiag; break; case wxCROSS_HATCH: if (cross == (Pixmap) 0) cross = XCreateBitmapFromData ((Display*) m_display, RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)), - cross_bits, cross_width, cross_height); + reinterpret_cast(cross_bits), cross_width, cross_height); myStipple = cross; break; case wxHORIZONTAL_HATCH: if (horiz == (Pixmap) 0) horiz = XCreateBitmapFromData ((Display*) m_display, RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)), - horiz_bits, horiz_width, horiz_height); + reinterpret_cast(horiz_bits), horiz_width, horiz_height); myStipple = horiz; break; case wxVERTICAL_HATCH: if (verti == (Pixmap) 0) verti = XCreateBitmapFromData ((Display*) m_display, RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)), - verti_bits, verti_width, verti_height); + reinterpret_cast(verti_bits), verti_width, verti_height); myStipple = verti; break; case wxCROSSDIAG_HATCH: @@ -1860,7 +1860,7 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush ) if (cdiag == (Pixmap) 0) cdiag = XCreateBitmapFromData ((Display*) m_display, RootWindow ((Display*) m_display, DefaultScreen ((Display*) m_display)), - cdiag_bits, cdiag_width, cdiag_height); + reinterpret_cast(cdiag_bits), cdiag_width, cdiag_height); myStipple = cdiag; break; } diff --git a/src/motif/fdiag.xbm b/src/motif/fdiag.xbm index 67d3b4732a..76aa9f28b4 100644 --- a/src/motif/fdiag.xbm +++ b/src/motif/fdiag.xbm @@ -1,6 +1,6 @@ #define fdiag_width 16 #define fdiag_height 16 -static char fdiag_bits[] = { +static unsigned char fdiag_bits[] = { 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80}; diff --git a/src/motif/horiz.xbm b/src/motif/horiz.xbm index ff3309bcc4..f4a31c6e9d 100644 --- a/src/motif/horiz.xbm +++ b/src/motif/horiz.xbm @@ -1,6 +1,6 @@ #define horiz_width 15 #define horiz_height 15 -static char horiz_bits[] = { +static unsigned char horiz_bits[] = { 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00}; diff --git a/src/motif/verti.xbm b/src/motif/verti.xbm index 2dd9dc4c05..b71941e82e 100644 --- a/src/motif/verti.xbm +++ b/src/motif/verti.xbm @@ -1,6 +1,6 @@ #define verti_width 15 #define verti_height 15 -static char verti_bits[] = { +static unsigned char verti_bits[] = { 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10};