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

Apply patch for querying tooltip colours.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2005-07-16 06:59:57 +00:00
parent c4e8770615
commit c05cc2c727
2 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/gtk/settings.cpp
View File

@@ -44,7 +44,9 @@ struct wxSystemObjects
m_colHighlightText, m_colHighlightText,
m_colListBox, m_colListBox,
m_colBtnText, m_colBtnText,
m_colMenuItemHighlight; m_colMenuItemHighlight,
m_colTooltip,
m_colTooltipText;
wxFont m_fontSystem; wxFont m_fontSystem;
}; };
@@ -140,6 +142,18 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
return ok; return ok;
} }
static void GetTooltipColors()
{
GtkTooltips* tooltips = gtk_tooltips_new();
gtk_tooltips_force_window(tooltips);
gtk_widget_ensure_style(tooltips->tip_window);
GdkColor c = tooltips->tip_window->style->bg[GTK_STATE_NORMAL];
gs_objects.m_colTooltip = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT);
c = tooltips->tip_window->style->fg[GTK_STATE_NORMAL];
gs_objects.m_colTooltipText = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT);
gtk_object_sink(wx_reinterpret_cast(GtkObject*, tooltips));
}
wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
{ {
switch (index) switch (index)
@@ -238,7 +252,6 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
case wxSYS_COLOUR_CAPTIONTEXT: case wxSYS_COLOUR_CAPTIONTEXT:
case wxSYS_COLOUR_INACTIVECAPTIONTEXT: case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
case wxSYS_COLOUR_BTNTEXT: case wxSYS_COLOUR_BTNTEXT:
case wxSYS_COLOUR_INFOTEXT:
if (!gs_objects.m_colBtnText.Ok()) if (!gs_objects.m_colBtnText.Ok())
{ {
int red, green, blue; int red, green, blue;
@@ -258,11 +271,17 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
} }
return gs_objects.m_colBtnText; return gs_objects.m_colBtnText;
// this (as well as wxSYS_COLOUR_INFOTEXT above) is used for
// tooltip windows - Robert, please change this code to use the
// real GTK tooltips when/if you can (TODO)
case wxSYS_COLOUR_INFOBK: case wxSYS_COLOUR_INFOBK:
return wxColour(255, 255, 225); if (!gs_objects.m_colTooltip.Ok()) {
GetTooltipColors();
}
return gs_objects.m_colTooltip;
case wxSYS_COLOUR_INFOTEXT:
if (!gs_objects.m_colTooltipText.Ok()) {
GetTooltipColors();
}
return gs_objects.m_colTooltipText;
case wxSYS_COLOUR_HIGHLIGHTTEXT: case wxSYS_COLOUR_HIGHLIGHTTEXT:
if (!gs_objects.m_colHighlightText.Ok()) if (!gs_objects.m_colHighlightText.Ok())

31
src/gtk1/settings.cpp
View File

@@ -44,7 +44,9 @@ struct wxSystemObjects
m_colHighlightText, m_colHighlightText,
m_colListBox, m_colListBox,
m_colBtnText, m_colBtnText,
m_colMenuItemHighlight; m_colMenuItemHighlight,
m_colTooltip,
m_colTooltipText;
wxFont m_fontSystem; wxFont m_fontSystem;
}; };
@@ -140,6 +142,18 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
return ok; return ok;
} }
static void GetTooltipColors()
{
GtkTooltips* tooltips = gtk_tooltips_new();
gtk_tooltips_force_window(tooltips);
gtk_widget_ensure_style(tooltips->tip_window);
GdkColor c = tooltips->tip_window->style->bg[GTK_STATE_NORMAL];
gs_objects.m_colTooltip = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT);
c = tooltips->tip_window->style->fg[GTK_STATE_NORMAL];
gs_objects.m_colTooltipText = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT);
gtk_object_sink(wx_reinterpret_cast(GtkObject*, tooltips));
}
wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
{ {
switch (index) switch (index)
@@ -238,7 +252,6 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
case wxSYS_COLOUR_CAPTIONTEXT: case wxSYS_COLOUR_CAPTIONTEXT:
case wxSYS_COLOUR_INACTIVECAPTIONTEXT: case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
case wxSYS_COLOUR_BTNTEXT: case wxSYS_COLOUR_BTNTEXT:
case wxSYS_COLOUR_INFOTEXT:
if (!gs_objects.m_colBtnText.Ok()) if (!gs_objects.m_colBtnText.Ok())
{ {
int red, green, blue; int red, green, blue;
@@ -258,11 +271,17 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
} }
return gs_objects.m_colBtnText; return gs_objects.m_colBtnText;
// this (as well as wxSYS_COLOUR_INFOTEXT above) is used for
// tooltip windows - Robert, please change this code to use the
// real GTK tooltips when/if you can (TODO)
case wxSYS_COLOUR_INFOBK: case wxSYS_COLOUR_INFOBK:
return wxColour(255, 255, 225); if (!gs_objects.m_colTooltip.Ok()) {
GetTooltipColors();
}
return gs_objects.m_colTooltip;
case wxSYS_COLOUR_INFOTEXT:
if (!gs_objects.m_colTooltipText.Ok()) {
GetTooltipColors();
}
return gs_objects.m_colTooltipText;
case wxSYS_COLOUR_HIGHLIGHTTEXT: case wxSYS_COLOUR_HIGHLIGHTTEXT:
if (!gs_objects.m_colHighlightText.Ok()) if (!gs_objects.m_colHighlightText.Ok())