OS/2 updates to catch the port up with the rest of the library.

[wxWidgets.git] / src / x11 / colour.cpp

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index e10c2f486b903121fc35db0a8ae3615d711ed371..7431369b7ff7d27a43015b4e753c1487bb6be2b5 100644 (file)
--- 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 (!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;
     {
         int idx = m_color.pixel;
         colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;


@@ -116,8 +116,8 @@ void wxColourRefData::AllocColour( WXColormap cmap )
     FreeColour();
 
 #if !wxUSE_NANOX
     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;
     {
         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)) )
     {
     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 );
     }
         UnRef();
         if (col) Ref( *col );
     }