Nano-X changes: removed spurious -O for Nano-X configuration;
got colour working in Nano-X (uses 8 bit RGB values, not 16 bit); now sets font background mode correctly; window management call correction git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -381,10 +381,16 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
|
||||
if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour))
|
||||
return NULL;
|
||||
|
||||
#if wxUSE_NANOX
|
||||
unsigned char r = (unsigned char)(xcolour.red);
|
||||
unsigned char g = (unsigned char)(xcolour.green);
|
||||
unsigned char b = (unsigned char)(xcolour.blue);
|
||||
#else
|
||||
unsigned char r = (unsigned char)(xcolour.red >> 8);
|
||||
unsigned char g = (unsigned char)(xcolour.green >> 8);
|
||||
unsigned char b = (unsigned char)(xcolour.blue >> 8);
|
||||
|
||||
#endif
|
||||
|
||||
wxColour *col = new wxColour(r, g, b);
|
||||
Append(colour, col);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user