Added rc and def files for new samples

[wxWidgets.git] / src / gtk / menu.cpp

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index f5662e116a5ba097fb9e0cc676cefd6b3bf9c897..fd67e5ee803f1de0d7f934f924ec7ce7c1b94094 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -488,9 +488,9 @@ void wxMenuItem::SetName( const wxString& str )
 #if (GTK_MINOR_VERSION > 0)
             m_text << _T('_');
         } else 
-       if (*pc == _T('/'))
+       if (*pc == _T('/'))      /* we have to filter out slashes ... */
        {
-            m_text << _T('\\');
+            m_text << _T('\\');  /* ... and replace them with back slashes */
 #endif
         }
         else
@@ -500,8 +500,11 @@ void wxMenuItem::SetName( const wxString& str )
     /* only GTK 1.2 know about hot keys */
     m_hotKey = _T("");
 #if (GTK_MINOR_VERSION > 0)
-    pc++;
-    m_hotKey = pc;
+    if(*pc == _T('\t'))
+    {
+       pc++;
+       m_hotKey = pc;
+    }
 #endif
 
     if (m_menuItem)
@@ -674,6 +677,12 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
                entry.accelerator = hotbuf;
               break;
            }
+           case _T('F'):   /* function keys */
+           {
+              strcpy( hotbuf, hotkey.mb_str() );
+               entry.accelerator = hotbuf;
+              break;
+           }
            default:
            {
            }