compilation fix for newer wxGTK

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 5e6b4c8b03f8c6a193878ef3b32ee1e3583984d4..e2b79dbf829a6a1c3f3825aa301afa71a0d562f2 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -63,8 +63,6 @@ wxMenuBar::wxMenuBar( long style )
     }
 
     PostCreation();
     }
 
     PostCreation();

-
-    Show( TRUE );

 }
 
 wxMenuBar::wxMenuBar()
 }
 
 wxMenuBar::wxMenuBar()


@@ -88,8 +86,6 @@ wxMenuBar::wxMenuBar()
     m_widget = GTK_WIDGET(m_menubar);
 
     PostCreation();
     m_widget = GTK_WIDGET(m_menubar);
 
     PostCreation();

-
-    Show( TRUE );

 }
 
 wxMenuBar::~wxMenuBar()
 }
 
 wxMenuBar::~wxMenuBar()


@@ -97,6 +93,91 @@ wxMenuBar::~wxMenuBar()
    // how to destroy a GtkItemFactory ?
 }
 
    // how to destroy a GtkItemFactory ?
 }
 

+static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
+{
+    menu->SetInvokingWindow( (wxWindow*) NULL );
+
+#if (GTK_MINOR_VERSION > 0)
+    wxWindow *top_frame = win;
+    while (top_frame->GetParent()) top_frame = top_frame->GetParent();
+
+    /* support for native hot keys  */
+    gtk_accel_group_detach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
+
+    wxNode *node = menu->GetItems().First();
+    while (node)
+    {
+        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+        if (menuitem->IsSubMenu())
+            wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu(), win );
+        node = node->Next();
+    }
+}
+
+static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
+{
+    menu->SetInvokingWindow( win );
+
+#if (GTK_MINOR_VERSION > 0)
+    wxWindow *top_frame = win;
+    while (top_frame->GetParent())
+       top_frame = top_frame->GetParent();
+
+    /* support for native hot keys  */
+    gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
+
+    wxNode *node = menu->GetItems().First();
+    while (node)
+    {
+        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+        if (menuitem->IsSubMenu())
+            wxMenubarSetInvokingWindow( menuitem->GetSubMenu(), win );
+        node = node->Next();
+    }
+}
+
+void wxMenuBar::SetInvokingWindow( wxWindow *win )
+{
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+    wxWindow *top_frame = win;
+    while (top_frame->GetParent())
+       top_frame = top_frame->GetParent();
+
+    /* support for native key accelerators indicated by underscroes */
+    gtk_accel_group_attach( m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
+
+    wxNode *node = m_menus.First();
+    while (node)
+    {
+        wxMenu *menu = (wxMenu*)node->Data();
+        wxMenubarSetInvokingWindow( menu, win );
+        node = node->Next();
+    }
+}
+
+void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
+{
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+    wxWindow *top_frame = win;
+    while (top_frame->GetParent())
+       top_frame = top_frame->GetParent();
+
+    /* support for native key accelerators indicated by underscroes */
+    gtk_accel_group_detach( m_accel, GTK_OBJECT(top_frame->m_widget) );
+#endif
+
+    wxNode *node = m_menus.First();
+    while (node)
+    {
+        wxMenu *menu = (wxMenu*)node->Data();
+        wxMenubarUnsetInvokingWindow( menu, win );
+        node = node->Next();
+    }
+}
+

 void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
     m_menus.Append( menu );
 void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
     m_menus.Append( menu );


@@ -107,12 +188,16 @@ 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)
             str << _T('_');
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
             str << _T('_');

+        } else 
+       if (*pc == _T('/'))
+       {
+            str << _T('\\');

 #endif
 #endif

-        }
-        str << *pc;
+       }
+        else
+           str << *pc;

     }
 
     /* this doesn't have much effect right now */
     }
 
     /* this doesn't have much effect right now */


@@ -180,7 +265,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

-wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem = NULL) const
+wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem ) const

 {
     if ( menuForItem )
     {
 {
     if ( menuForItem )
     {


@@ -474,18 +559,34 @@ wxMenuItem::wxMenuItem()
 // it's valid for this function to be called even if m_menuItem == NULL
 void wxMenuItem::SetName( const wxString& str )
 {
 // it's valid for this function to be called even if m_menuItem == NULL
 void wxMenuItem::SetName( const wxString& str )
 {

+    /* '\t' is the deliminator indicating a hot key */

     m_text = _T("");
     m_text = _T("");

-    for ( const wxChar *pc = str; *pc != _T('\0'); pc++ )
+    const wxChar *pc = str;
+    for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ )

     {
         if (*pc == _T('&'))
        {
     {
         if (*pc == _T('&'))
        {

-           pc++; /* skip it */

 #if (GTK_MINOR_VERSION > 0)
             m_text << _T('_');
 #if (GTK_MINOR_VERSION > 0)
             m_text << _T('_');

+        } else 
+       if (*pc == _T('/'))      /* we have to filter out slashes ... */
+       {
+            m_text << _T('\\');  /* ... and replace them with back slashes */

 #endif
         }
 #endif
         }

-        m_text << *pc;
+        else
+           m_text << *pc;
+    }
+    
+    /* only GTK 1.2 knows about hot keys */
+    m_hotKey = _T("");
+#if (GTK_MINOR_VERSION > 0)
+    if(*pc == _T('\t'))
+    {
+       pc++;
+       m_hotKey = pc;

     }
     }

+#endif

 
     if (m_menuItem)
     {
 
     if (m_menuItem)
     {


@@ -580,14 +681,66 @@ void wxMenu::AppendSeparator()
     wxMenuItem *mitem = new wxMenuItem();
     mitem->SetId(ID_SEPARATOR);
 
     wxMenuItem *mitem = new wxMenuItem();
     mitem->SetId(ID_SEPARATOR);
 

+#if (GTK_MINOR_VERSION > 0)
+    GtkItemFactoryEntry entry;
+    entry.path = "/sep";
+    entry.callback = (GtkItemFactoryCallback) NULL;
+    entry.callback_action = 0;
+    entry.item_type = "<Separator>";
+    entry.accelerator = (gchar*) NULL;
+    
+    gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
+    
+    /* this will be wrong for more than one separator. do we care? */
+    GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
+#else

     GtkWidget *menuItem = gtk_menu_item_new();
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );
     GtkWidget *menuItem = gtk_menu_item_new();
     gtk_menu_append( GTK_MENU(m_menu), menuItem );
     gtk_widget_show( menuItem );

+#endif

     
     mitem->SetMenuItem(menuItem);
     m_items.Append( mitem );
 }
 
     
     mitem->SetMenuItem(menuItem);
     m_items.Append( mitem );
 }
 

+static char* GetHotKey( const wxString &hotkey, char *hotbuf )
+{
+    if (hotkey.IsEmpty()) return (char*) NULL;
+    
+    switch (hotkey[0])
+    {
+        case _T('a'):   /* Alt */
+       case _T('A'):
+       case _T('m'):   /* Meta */
+       case _T('M'):
+       {
+           strcpy( hotbuf, "<alt>" );
+           wxString last = hotkey.Right(1);
+           strcat( hotbuf, last.mb_str() );
+            return hotbuf;
+       }
+       case _T('c'):    /* Ctrl */
+       case _T('C'):
+       case _T('s'):    /* Strg, yeah man, I'm German */
+       case _T('S'):
+       {
+           strcpy( hotbuf, "<control>" );
+           wxString last = hotkey.Right(1);
+           strcat( hotbuf, last.mb_str() );
+            return hotbuf;
+        }
+       case _T('F'):   /* function keys */
+       {
+           strcpy( hotbuf, hotkey.mb_str() );
+            return hotbuf;
+       }
+       default:
+       {
+       }
+    }
+    return (char*) NULL;
+}
+

 void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
 {
     wxMenuItem *mitem = new wxMenuItem();
 void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
 {
     wxMenuItem *mitem = new wxMenuItem();


@@ -607,7 +760,6 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
     
     GtkItemFactoryEntry entry;
     entry.path = buf;
     
     GtkItemFactoryEntry entry;
     entry.path = buf;

-    entry.accelerator = (gchar*) NULL;

     entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
     entry.callback_action = 0;
     if (checkable)
     entry.callback = (GtkItemFactoryCallback) gtk_menu_clicked_callback;
     entry.callback_action = 0;
     if (checkable)


@@ -615,6 +767,9 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
     else
         entry.item_type = "<Item>";
     
     else
         entry.item_type = "<Item>";
     

+    char hotbuf[50];
+    entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf );
+    

     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
     
     /* in order to get the pointer to the item we need the item text _without_ underscores */
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
     
     /* in order to get the pointer to the item we need the item text _without_ underscores */


@@ -629,8 +784,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() )
-                                    : gtk_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( mitem->GetText().mb_str() );

                                    
     gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
                         GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
                                    
     gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
                         GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),


@@ -654,16 +809,48 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
     m_items.Append( mitem );
 }
 
     m_items.Append( mitem );
 }
 

-void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxString &helpStr )
+void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr )

 {
     wxMenuItem *mitem = new wxMenuItem();
     mitem->SetId(id);
 {
     wxMenuItem *mitem = new wxMenuItem();
     mitem->SetId(id);

-    mitem->SetText(text);
+    mitem->SetText(item);

     mitem->SetHelp(helpStr);
 
     mitem->SetHelp(helpStr);
 

+#if (GTK_MINOR_VERSION > 0)
+    /* text has "_" instead of "&" after mitem->SetText() */ 
+    wxString text( mitem->GetText() );
+    
+    /* local buffer in multibyte form */
+    char buf[200];
+    strcpy( buf, "/" );
+    strcat( buf, text.mb_str() );
+    
+    GtkItemFactoryEntry entry;
+    entry.path = buf;
+    entry.callback = (GtkItemFactoryCallback) 0;
+    entry.callback_action = 0;
+    entry.item_type = "<Branch>";
+    
+    gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
+    
+    /* in order to get the pointer to the item we need the item text _without_ underscores */
+    wxString s = _T("<main>/");
+    for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
+    {
+        if (*pc == _T('_')) pc++; /* skip it */
+        s << *pc;
+    }
+    
+    GtkWidget *menuItem = gtk_item_factory_get_item( m_factory, s.mb_str() );
+    
+#else
+

     GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str());
     GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText().mbc_str());

-    mitem->SetMenuItem(menuItem);
-    mitem->SetSubMenu(subMenu);
+    
+    gtk_menu_append( GTK_MENU(m_menu), menuItem );
+    gtk_widget_show( menuItem );
+    
+#endif    

 
     gtk_signal_connect( GTK_OBJECT(menuItem), "select",
                         GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
 
     gtk_signal_connect( GTK_OBJECT(menuItem), "select",
                         GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),


@@ -674,8 +861,10 @@ void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxStri
                         (gpointer*)this );
 
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
                         (gpointer*)this );
 
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );

-    gtk_menu_append( GTK_MENU(m_menu), menuItem );
-    gtk_widget_show( menuItem );
+    
+    mitem->SetMenuItem(menuItem);
+    mitem->SetSubMenu(subMenu);
+

     m_items.Append( mitem );
 }
 
     m_items.Append( mitem );
 }