1. more accurate conversion from 8-bit wx color to 16-bit GDK color
2. eliminate possiblity of wxColour RGB values changing depending on colormap 3. don't allow non-const pointer access to internal GdkColor git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -3897,7 +3897,7 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
|
||||
|
||||
if ( m_foregroundColour.Ok() )
|
||||
{
|
||||
GdkColor *fg = m_foregroundColour.GetColor();
|
||||
const GdkColor *fg = m_foregroundColour.GetColor();
|
||||
|
||||
style->fg[GTK_STATE_NORMAL] = *fg;
|
||||
style->color_flags[GTK_STATE_NORMAL] = GTK_RC_FG;
|
||||
@@ -3911,7 +3911,7 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
|
||||
|
||||
if ( m_backgroundColour.Ok() )
|
||||
{
|
||||
GdkColor *bg = m_backgroundColour.GetColor();
|
||||
const GdkColor *bg = m_backgroundColour.GetColor();
|
||||
|
||||
style->bg[GTK_STATE_NORMAL] = *bg;
|
||||
style->base[GTK_STATE_NORMAL] = *bg;
|
||||
|
Reference in New Issue
Block a user