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

respect GTK+'s theme tooltip colour settings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-14 13:27:26 +00:00
parent 6db6859926
commit 1543645813
4 changed files with 0 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/gtk/tbargtk.h
View File

@@ -64,9 +64,6 @@ public:
GtkToolbar *m_toolbar; GtkToolbar *m_toolbar;
GdkColor *m_fg;
GdkColor *m_bg;
bool m_blockEvent; bool m_blockEvent;
void OnInternalIdle(); void OnInternalIdle();

3
include/wx/gtk1/tbargtk.h
View File

@@ -64,9 +64,6 @@ public:
GtkToolbar *m_toolbar; GtkToolbar *m_toolbar;
GdkColor *m_fg;
GdkColor *m_bg;
bool m_blockEvent; bool m_blockEvent;
void OnInternalIdle(); void OnInternalIdle();

32
src/gtk/tbargtk.cpp
View File

@@ -269,8 +269,6 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
void wxToolBar::Init() void wxToolBar::Init()
{ {
m_fg =
m_bg = (GdkColor *)NULL;
m_toolbar = (GtkToolbar *)NULL; m_toolbar = (GtkToolbar *)NULL;
m_blockEvent = FALSE; m_blockEvent = FALSE;
m_defaultWidth = 32; m_defaultWidth = 32;
@@ -279,8 +277,6 @@ void wxToolBar::Init()
wxToolBar::~wxToolBar() wxToolBar::~wxToolBar()
{ {
delete m_fg;
delete m_bg;
} }
bool wxToolBar::Create( wxWindow *parent, bool wxToolBar::Create( wxWindow *parent,
@@ -343,34 +339,6 @@ bool wxToolBar::Create( wxWindow *parent,
gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE ); gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
#endif #endif
m_fg = new GdkColor;
m_fg->red = 0;
m_fg->green = 0;
m_fg->blue = 0;
wxColour fg(0,0,0);
fg.CalcPixel( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ) );
m_fg->pixel = fg.GetPixel();
m_bg = new GdkColor;
m_bg->red = 65535;
m_bg->green = 65535;
m_bg->blue = 49980;
wxColour bg(255,255,196);
bg.CalcPixel( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ) );
m_bg->pixel = bg.GetPixel();
gtk_tooltips_force_window( GTK_TOOLBAR(m_toolbar)->tooltips );
GtkStyle *g_style =
gtk_style_copy(
gtk_widget_get_style(
GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) );
g_style->bg[GTK_STATE_NORMAL] = *m_bg;
gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );
PostCreation(size); PostCreation(size);

32
src/gtk1/tbargtk.cpp
View File

@@ -269,8 +269,6 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
void wxToolBar::Init() void wxToolBar::Init()
{ {
m_fg =
m_bg = (GdkColor *)NULL;
m_toolbar = (GtkToolbar *)NULL; m_toolbar = (GtkToolbar *)NULL;
m_blockEvent = FALSE; m_blockEvent = FALSE;
m_defaultWidth = 32; m_defaultWidth = 32;
@@ -279,8 +277,6 @@ void wxToolBar::Init()
wxToolBar::~wxToolBar() wxToolBar::~wxToolBar()
{ {
delete m_fg;
delete m_bg;
} }
bool wxToolBar::Create( wxWindow *parent, bool wxToolBar::Create( wxWindow *parent,
@@ -343,34 +339,6 @@ bool wxToolBar::Create( wxWindow *parent,
gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE ); gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
#endif #endif
m_fg = new GdkColor;
m_fg->red = 0;
m_fg->green = 0;
m_fg->blue = 0;
wxColour fg(0,0,0);
fg.CalcPixel( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ) );
m_fg->pixel = fg.GetPixel();
m_bg = new GdkColor;
m_bg->red = 65535;
m_bg->green = 65535;
m_bg->blue = 49980;
wxColour bg(255,255,196);
bg.CalcPixel( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ) );
m_bg->pixel = bg.GetPixel();
gtk_tooltips_force_window( GTK_TOOLBAR(m_toolbar)->tooltips );
GtkStyle *g_style =
gtk_style_copy(
gtk_widget_get_style(
GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) );
g_style->bg[GTK_STATE_NORMAL] = *m_bg;
gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );
PostCreation(size); PostCreation(size);