show the standard wxWin fonts (modified patch 530698)

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

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index f989be7f44a6f32aeb7e9375dd72e3190cf47dad..cf8431a8cc19e7dee3d20340a589b9903a6675ed 100644 (file)
--- a/src/x11/colour.cpp
+++ b/src/x11/colour.cpp
@@ -35,6 +35,13 @@ public:
         m_colormap = (WXColormap *) NULL;
         m_hasPixel = FALSE;
     }
+    wxColourRefData(const wxColourRefData& data):
+        wxObjectRefData()
+    {
+        m_color = data.m_color;
+        m_colormap = data.m_colormap;
+        m_hasPixel = data.m_hasPixel;
+    }
     
     ~wxColourRefData()
     {
@@ -137,9 +144,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
 wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
 {
     m_refData = new wxColourRefData();
+#if wxUSE_NANOX
+    M_COLDATA->m_color.red = ((unsigned short)red) ;
+    M_COLDATA->m_color.green = ((unsigned short)green) ;
+    M_COLDATA->m_color.blue = ((unsigned short)blue) ;
+#else    
     M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
     M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
     M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
+#endif
     M_COLDATA->m_color.pixel = 0;
 }
 
@@ -209,9 +222,15 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
     AllocExclusive();
     
     m_refData = new wxColourRefData();
+#if wxUSE_NANOX
+    M_COLDATA->m_color.red = ((unsigned short)red) ;
+    M_COLDATA->m_color.green = ((unsigned short)green) ;
+    M_COLDATA->m_color.blue = ((unsigned short)blue) ;
+#else
     M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
     M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
     M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
+#endif
     M_COLDATA->m_color.pixel = 0;
 }
 
@@ -219,21 +238,33 @@ unsigned char wxColour::Red() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
 
+#if wxUSE_NANOX
+    return (unsigned char) M_COLDATA->m_color.red ;
+#else
     return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
+#endif
 }
 
 unsigned char wxColour::Green() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
 
+#if wxUSE_NANOX
+    return (unsigned char) M_COLDATA->m_color.green ;
+#else
     return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
+#endif
 }
 
 unsigned char wxColour::Blue() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
 
+#if wxUSE_NANOX
+    return (unsigned char) M_COLDATA->m_color.blue ;
+#else
     return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
+#endif
 }
 
 void wxColour::CalcPixel( WXColormap cmap )