X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8601b2e15bf924d4be6b7843064028e514a71ec8..66010e8d0d04c180c51203f9ed7e2c26c78eff25:/src/x11/colour.cpp diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp index e10c2f486b..7431369b7f 100644 --- a/src/x11/colour.cpp +++ b/src/x11/colour.cpp @@ -93,8 +93,8 @@ void wxColourRefData::FreeColour() if (!m_colormap) return; #if !wxUSE_NANOX - if ((wxTheApp->m_visualType == GrayScale) || - (wxTheApp->m_visualType == PseudoColor)) + if ((wxTheApp->m_visualInfo->m_visualType == GrayScale) || + (wxTheApp->m_visualInfo->m_visualType == PseudoColor)) { int idx = m_color.pixel; colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1; @@ -116,8 +116,8 @@ void wxColourRefData::AllocColour( WXColormap cmap ) FreeColour(); #if !wxUSE_NANOX - if ((wxTheApp->m_visualType == GrayScale) || - (wxTheApp->m_visualType == PseudoColor)) + if ((wxTheApp->m_visualInfo->m_visualType == GrayScale) || + (wxTheApp->m_visualInfo->m_visualType == PseudoColor)) { m_hasPixel = XAllocColor( wxGlobalDisplay(), (Colormap) cmap, &m_color ); int idx = m_color.pixel; @@ -160,7 +160,7 @@ void wxColour::InitFromName( const wxString &colourName ) wxNode *node = (wxNode *) NULL; if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) { - wxColour *col = (wxColour*)node->Data(); + wxColour *col = (wxColour*)node->GetData(); UnRef(); if (col) Ref( *col ); }