AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix complilation error: narrowing conversions in xbm files under wxX11. For discussion, please see ticket 12575

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-09-23 17:44:01 +00:00
parent 24486d69a8
commit 3704547684
7 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/x11/bdiag.xbm
View File

@ -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};

2
src/x11/cdiag.xbm
View File

@ -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};

2
src/x11/cross.xbm
View File

@ -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};

18
src/x11/dcclient.cpp
View File

@ -328,12 +328,18 @@ void wxWindowDCImpl::SetUpDC()
Window xroot = RootWindow( (Display*) m_display, xscreen );
hatch_bitmap = hatches;
hatch_bitmap[0] = XCreateBitmapFromData( (Display*) m_display, xroot, bdiag_bits, bdiag_width, bdiag_height );
hatch_bitmap[1] = XCreateBitmapFromData( (Display*) m_display, xroot, cdiag_bits, cdiag_width, cdiag_height );
hatch_bitmap[2] = XCreateBitmapFromData( (Display*) m_display, xroot, fdiag_bits, fdiag_width, fdiag_height );
hatch_bitmap[3] = XCreateBitmapFromData( (Display*) m_display, xroot, cross_bits, cross_width, cross_height );
hatch_bitmap[4] = XCreateBitmapFromData( (Display*) m_display, xroot, horiz_bits, horiz_width, horiz_height );
hatch_bitmap[5] = XCreateBitmapFromData( (Display*) m_display, xroot, verti_bits, verti_width, verti_height );
hatch_bitmap[0] = XCreateBitmapFromData( (Display*) m_display, xroot,
reinterpret_cast<const char*>(bdiag_bits), bdiag_width, bdiag_height );
hatch_bitmap[1] = XCreateBitmapFromData( (Display*) m_display, xroot,
reinterpret_cast<const char*>(cdiag_bits), cdiag_width, cdiag_height );
hatch_bitmap[2] = XCreateBitmapFromData( (Display*) m_display, xroot,
reinterpret_cast<const char*>(fdiag_bits), fdiag_width, fdiag_height );
hatch_bitmap[3] = XCreateBitmapFromData( (Display*) m_display, xroot,
reinterpret_cast<const char*>(cross_bits), cross_width, cross_height );
hatch_bitmap[4] = XCreateBitmapFromData( (Display*) m_display, xroot,
reinterpret_cast<const char*>(horiz_bits), horiz_width, horiz_height );
hatch_bitmap[5] = XCreateBitmapFromData( (Display*) m_display, xroot,
reinterpret_cast<const char*>(verti_bits), verti_width, verti_height );
}
}

2
src/x11/fdiag.xbm
View File

@ -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};

2
src/x11/horiz.xbm
View File

@ -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};

2
src/x11/verti.xbm
View File

@ -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};