AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed wrong tooltip colour -- don't mess with widget styles, use the defaults and let GTK+ do its job

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2004-06-03 18:40:13 +00:00
parent 217b71400f
commit bbce0c0ce6
3 changed files with 5 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changes.txt
View File

@ -104,6 +104,11 @@ Unix:
- wxTaskBarIcon now supports freedesktop.org System Tray protocol - wxTaskBarIcon now supports freedesktop.org System Tray protocol
- security fixes to wxSingleInstanceChecker - security fixes to wxSingleInstanceChecker
wxGTK:
- fixed wrong colour of tooltips under some themes
2.5.2 2.5.2
----- -----

25
src/gtk/tooltip.cpp
View File

@ -23,15 +23,11 @@
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
extern GdkFont *GtkGetDefaultGuiFont();
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL; static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
static GdkColor ss_bg;
static GdkColor ss_fg;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxToolTip // wxToolTip
@ -58,27 +54,6 @@ void wxToolTip::Apply( wxWindow *win )
if (!ss_tooltips) if (!ss_tooltips)
{ {
ss_tooltips = gtk_tooltips_new(); ss_tooltips = gtk_tooltips_new();
ss_fg.red = 0;
ss_fg.green = 0;
ss_fg.blue = 0;
gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_fg );
ss_bg.red = 65535;
ss_bg.green = 65535;
ss_bg.blue = 50000;
gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg );
gtk_tooltips_force_window( ss_tooltips );
GtkStyle *g_style =
gtk_style_copy(
gtk_widget_get_style( ss_tooltips->tip_window ) );
g_style->fg[GTK_STATE_NORMAL] = ss_fg;
g_style->bg[GTK_STATE_NORMAL] = ss_bg;
gtk_widget_set_style( ss_tooltips->tip_window, g_style );
} }
m_window = win; m_window = win;

25
src/gtk1/tooltip.cpp
View File

@ -23,15 +23,11 @@
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
extern GdkFont *GtkGetDefaultGuiFont();
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL; static GtkTooltips *ss_tooltips = (GtkTooltips*) NULL;
static GdkColor ss_bg;
static GdkColor ss_fg;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxToolTip // wxToolTip
@ -58,27 +54,6 @@ void wxToolTip::Apply( wxWindow *win )
if (!ss_tooltips) if (!ss_tooltips)
{ {
ss_tooltips = gtk_tooltips_new(); ss_tooltips = gtk_tooltips_new();
ss_fg.red = 0;
ss_fg.green = 0;
ss_fg.blue = 0;
gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_fg );
ss_bg.red = 65535;
ss_bg.green = 65535;
ss_bg.blue = 50000;
gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg );
gtk_tooltips_force_window( ss_tooltips );
GtkStyle *g_style =
gtk_style_copy(
gtk_widget_get_style( ss_tooltips->tip_window ) );
g_style->fg[GTK_STATE_NORMAL] = ss_fg;
g_style->bg[GTK_STATE_NORMAL] = ss_bg;
gtk_widget_set_style( ss_tooltips->tip_window, g_style );
} }
m_window = win; m_window = win;