use simpler color ctor

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index f940e07bdb355389915ca4ca2f7f9650669c9e8f..7af2a52fc83209698e5f0b1de0342ff9929b0410 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -252,9 +252,6 @@ wxVisualAttributes wxControl::GetDefaultAttributes() const
                                              UseGTKStyleBase());
 }
 
                                              UseGTKStyleBase());
 }
 

-
-#define SHIFT (8*(sizeof(short int)-sizeof(char)))
-

 // static
 wxVisualAttributes
 wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
 // static
 wxVisualAttributes
 wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,


@@ -277,17 +274,11 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
         state = GTK_STATE_NORMAL;
 
     // get the style's colours
         state = GTK_STATE_NORMAL;
 
     // get the style's colours

-    attr.colFg = wxColour(style->fg[state].red   >> SHIFT,
-                          style->fg[state].green >> SHIFT,
-                          style->fg[state].blue  >> SHIFT);
+    attr.colFg = wxColour(style->fg[state]);

     if (useBase)
     if (useBase)

-        attr.colBg = wxColour(style->base[state].red   >> SHIFT,
-                              style->base[state].green >> SHIFT,
-                              style->base[state].blue  >> SHIFT);
+        attr.colBg = wxColour(style->base[state]);

     else
     else

-        attr.colBg = wxColour(style->bg[state].red   >> SHIFT,
-                              style->bg[state].green >> SHIFT,
-                              style->bg[state].blue  >> SHIFT);
+        attr.colBg = wxColour(style->bg[state]);

 
     // get the style's font
     if ( !style->font_desc )
 
     // get the style's font
     if ( !style->font_desc )