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

Expand tabs, identation/whitespace fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2005-08-08 09:50:13 +00:00
parent 86e69fa54a
commit 88d197753d
8 changed files with 124 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gtk/menu.cpp
View File

@@ -350,7 +350,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
{ {
gtk_widget_add_accelerator (menu->m_owner, gtk_widget_add_accelerator (menu->m_owner,
"activate_item", "activate_item",
m_accel,//gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)), m_accel, //gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)),
accel_key, accel_key,
GDK_MOD1_MASK, GDK_MOD1_MASK,
GTK_ACCEL_LOCKED); GTK_ACCEL_LOCKED);
@@ -1209,6 +1209,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
(gpointer)this ); (gpointer)this );
} }
#ifndef __WXGTK20__ #ifndef __WXGTK20__
guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) ); guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
if (accel_key != GDK_VoidSymbol) if (accel_key != GDK_VoidSymbol)

3
src/gtk1/menu.cpp
View File

@@ -350,7 +350,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
{ {
gtk_widget_add_accelerator (menu->m_owner, gtk_widget_add_accelerator (menu->m_owner,
"activate_item", "activate_item",
m_accel,//gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)), m_accel, //gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)),
accel_key, accel_key,
GDK_MOD1_MASK, GDK_MOD1_MASK,
GTK_ACCEL_LOCKED); GTK_ACCEL_LOCKED);
@@ -1209,6 +1209,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
(gpointer)this ); (gpointer)this );
} }
#ifndef __WXGTK20__ #ifndef __WXGTK20__
guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) ); guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
if (accel_key != GDK_VoidSymbol) if (accel_key != GDK_VoidSymbol)