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

Fixed gtk 1.0.6 corruped menu entry names.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-04-28 14:06:09 +00:00
parent 72a16063d3
commit d38ceae8b9
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/menu.cpp
View File

@@ -107,11 +107,11 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
{ {
if (*pc == _T('&')) if (*pc == _T('&'))
{ {
pc++; /* skip it */
#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
str << _T('_'); str << _T('_');
#endif #endif
} }
else
str << *pc; str << *pc;
} }
@@ -479,11 +479,11 @@ void wxMenuItem::SetName( const wxString& str )
{ {
if (*pc == _T('&')) if (*pc == _T('&'))
{ {
pc++; /* skip it */
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
m_text << _T('_'); m_text << _T('_');
#endif #endif
} }
else
m_text << *pc; m_text << *pc;
} }
@@ -629,8 +629,8 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
#else #else
GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label( item.mb_str() ) GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() )
: gtk_menu_item_new_with_label( item.mb_str() ); : gtk_menu_item_new_with_label( mitem->GetText().mb_str() );
gtk_signal_connect( GTK_OBJECT(menuItem), "activate", gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),

8
src/gtk1/menu.cpp
View File

@@ -107,11 +107,11 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
{ {
if (*pc == _T('&')) if (*pc == _T('&'))
{ {
pc++; /* skip it */
#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0) #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
str << _T('_'); str << _T('_');
#endif #endif
} }
else
str << *pc; str << *pc;
} }
@@ -479,11 +479,11 @@ void wxMenuItem::SetName( const wxString& str )
{ {
if (*pc == _T('&')) if (*pc == _T('&'))
{ {
pc++; /* skip it */
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
m_text << _T('_'); m_text << _T('_');
#endif #endif
} }
else
m_text << *pc; m_text << *pc;
} }
@@ -629,8 +629,8 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
#else #else
GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label( item.mb_str() ) GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label( mitem->GetText().mb_str() )
: gtk_menu_item_new_with_label( item.mb_str() ); : gtk_menu_item_new_with_label( mitem->GetText().mb_str() );
gtk_signal_connect( GTK_OBJECT(menuItem), "activate", gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),