Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use simpler color ctor

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-03-10 04:46:18 +00:00
parent 592b9f3da5
commit 7d2aa90eae
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/control.cpp
View File

@@ -252,9 +252,6 @@ wxVisualAttributes wxControl::GetDefaultAttributes() const
UseGTKStyleBase());
}
#define SHIFT (8*(sizeof(short int)-sizeof(char)))
// static
wxVisualAttributes
wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
@@ -277,17 +274,11 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
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)
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
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 )