From fac4253c6f9c86d1aee264311b82404cd425ca10 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 2 May 1999 09:19:44 +0000 Subject: [PATCH] mini-bugs in wxMenu (it now converts / to \ in the menu text) toolbar tips are yellow again typo in dcclient git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/dcclient.cpp | 4 ++-- src/gtk/menu.cpp | 11 +++++++++-- src/gtk/tbargtk.cpp | 33 +++++++++++++++++++++++++++++++++ src/gtk1/dcclient.cpp | 4 ++-- src/gtk1/menu.cpp | 11 +++++++++-- src/gtk1/tbargtk.cpp | 33 +++++++++++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 8 deletions(-) diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index 918e0a52db..34eb8de724 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -631,13 +631,13 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, { /* we HAVE TO use the direct way for memory dcs that have mask since the XCopyArea doesn't know - about masks and */ + about masks */ use_bitmap_method = TRUE; } else if (memDC->m_selected.GetDepth() == 1) { /* we HAVE TO use the direct way for memory dcs - that are bitmaps because XCopyArea doesn't copy + that are bitmaps because XCopyArea doesn't cope with different bit depths */ use_bitmap_method = TRUE; } diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index b66fc7b9fb..aa5e5d9c43 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -109,8 +109,12 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title ) { #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) str << _T('_'); + } else + if (*pc == _T('/')) + { + str << _T('\\'); #endif - } + } else str << *pc; } @@ -483,6 +487,10 @@ void wxMenuItem::SetName( const wxString& str ) { #if (GTK_MINOR_VERSION > 0) m_text << _T('_'); + } else + if (*pc == _T('/')) + { + m_text << _T('\\'); #endif } else @@ -664,7 +672,6 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool wxString s = _T("
/"); for ( const wxChar *pc = text; *pc != _T('\0'); pc++ ) { - if (*pc == _T('\t')) break; if (*pc == _T('_')) pc++; /* skip it */ s << *pc; } diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 46ca5bad1f..0f80c3f2a9 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -70,7 +70,18 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), tb->m_fg->green = 0; tb->m_fg->blue = 0; gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg ); + +#if (GTK_MINOR_VERSION > 0) + GtkStyle *g_style = + gtk_style_copy( + gtk_widget_get_style( + GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window ) ); + + g_style->fg[GTK_STATE_NORMAL] = *tb->m_fg; + gtk_widget_set_style( GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window, g_style ); +#else gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg ); +#endif } } else @@ -81,7 +92,17 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), tb->m_fg->green = 33000; tb->m_fg->blue = 33000; gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg ); +#if (GTK_MINOR_VERSION > 0) + GtkStyle *g_style = + gtk_style_copy( + gtk_widget_get_style( + GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window ) ); + + g_style->fg[GTK_STATE_NORMAL] = *tb->m_fg; + gtk_widget_set_style( GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window, g_style ); +#else gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg ); +#endif } } @@ -161,7 +182,19 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, m_bg->blue = 50000; gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_bg ); +#if (GTK_MINOR_VERSION > 0) + 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 ); +#else gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, m_bg, m_fg ); +#endif m_xMargin = 0; m_yMargin = 0; diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp index 918e0a52db..34eb8de724 100644 --- a/src/gtk1/dcclient.cpp +++ b/src/gtk1/dcclient.cpp @@ -631,13 +631,13 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, { /* we HAVE TO use the direct way for memory dcs that have mask since the XCopyArea doesn't know - about masks and */ + about masks */ use_bitmap_method = TRUE; } else if (memDC->m_selected.GetDepth() == 1) { /* we HAVE TO use the direct way for memory dcs - that are bitmaps because XCopyArea doesn't copy + that are bitmaps because XCopyArea doesn't cope with different bit depths */ use_bitmap_method = TRUE; } diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index b66fc7b9fb..aa5e5d9c43 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -109,8 +109,12 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title ) { #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) str << _T('_'); + } else + if (*pc == _T('/')) + { + str << _T('\\'); #endif - } + } else str << *pc; } @@ -483,6 +487,10 @@ void wxMenuItem::SetName( const wxString& str ) { #if (GTK_MINOR_VERSION > 0) m_text << _T('_'); + } else + if (*pc == _T('/')) + { + m_text << _T('\\'); #endif } else @@ -664,7 +672,6 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool wxString s = _T("
/"); for ( const wxChar *pc = text; *pc != _T('\0'); pc++ ) { - if (*pc == _T('\t')) break; if (*pc == _T('_')) pc++; /* skip it */ s << *pc; } diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index 46ca5bad1f..0f80c3f2a9 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/tbargtk.cpp @@ -70,7 +70,18 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), tb->m_fg->green = 0; tb->m_fg->blue = 0; gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg ); + +#if (GTK_MINOR_VERSION > 0) + GtkStyle *g_style = + gtk_style_copy( + gtk_widget_get_style( + GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window ) ); + + g_style->fg[GTK_STATE_NORMAL] = *tb->m_fg; + gtk_widget_set_style( GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window, g_style ); +#else gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg ); +#endif } } else @@ -81,7 +92,17 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), tb->m_fg->green = 33000; tb->m_fg->blue = 33000; gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg ); +#if (GTK_MINOR_VERSION > 0) + GtkStyle *g_style = + gtk_style_copy( + gtk_widget_get_style( + GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window ) ); + + g_style->fg[GTK_STATE_NORMAL] = *tb->m_fg; + gtk_widget_set_style( GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window, g_style ); +#else gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg ); +#endif } } @@ -161,7 +182,19 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, m_bg->blue = 50000; gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_bg ); +#if (GTK_MINOR_VERSION > 0) + 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 ); +#else gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, m_bg, m_fg ); +#endif m_xMargin = 0; m_yMargin = 0; -- 2.45.2