X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd77da975b1aeeb52c56d2aacb02beec039b5bc3..e08ee38353a26f5305148257028d8ad0f1fa75cc:/src/gtk1/menu.cpp

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 35a6a05cd0..1d042b817d 100644
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -12,10 +12,14 @@
 #pragma implementation "menuitem.h"
 #endif
 
-#include "wx/menu.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/app.h"
+#include "wx/menu.h"
+
+#if wxUSE_ACCEL
+    #include "wx/accel.h"
+#endif // wxUSE_ACCEL
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
@@ -85,7 +89,7 @@ wxMenuBar::wxMenuBar()
         wxFAIL_MSG( wxT("wxMenuBar creation failed") );
         return;
     }
-    
+
     m_menus.DeleteContents( TRUE );
 
     /* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
@@ -113,7 +117,7 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
 
 #if (GTK_MINOR_VERSION > 0)
     wxWindow *top_frame = win;
-    while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame)) 
+    while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
         top_frame = top_frame->GetParent();
 
     /* support for native hot keys  */
@@ -136,7 +140,7 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
 
 #if (GTK_MINOR_VERSION > 0)
     wxWindow *top_frame = win;
-    while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame)) 
+    while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
         top_frame = top_frame->GetParent();
 
     /* support for native hot keys  */
@@ -158,7 +162,7 @@ void wxMenuBar::SetInvokingWindow( wxWindow *win )
     m_invokingWindow = win;
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
     wxWindow *top_frame = win;
-    while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame)) 
+    while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
         top_frame = top_frame->GetParent();
 
     /* support for native key accelerators indicated by underscroes */
@@ -179,7 +183,7 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
     m_invokingWindow = (wxWindow*) NULL;
 #if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
     wxWindow *top_frame = win;
-    while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame)) 
+    while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
         top_frame = top_frame->GetParent();
 
     /* support for native key accelerators indicated by underscroes */
@@ -195,7 +199,7 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
     }
 }
 
-void wxMenuBar::Append( wxMenu *menu, const wxString &title )
+bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
     m_menus.Append( menu );
 
@@ -257,7 +261,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
     {
        // contrary to the common sense, we must throw out _all_ underscores,
        // (i.e. "Hello__World" => "HelloWorld" and not "Hello_World" as we
-       // might naively think). IMHO it's a bug in GTK+ (VZ) 
+       // might naively think). IMHO it's a bug in GTK+ (VZ)
        while (*pc == wxT('_'))
            pc++;
        tmp << *pc;
@@ -279,6 +283,38 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
     // adding menu later on.
     if (m_invokingWindow)
         wxMenubarSetInvokingWindow( menu, m_invokingWindow );
+
+    return TRUE;
+}
+
+bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
+{
+    if ( !wxMenuBarBase::Insert(pos, menu, title) )
+        return FALSE;
+
+    wxFAIL_MSG(wxT("TODO"));
+
+    return FALSE;
+}
+
+wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
+{
+    if ( !wxMenuBarBase::Replace(pos, menu, title) )
+        return FALSE;
+
+    wxFAIL_MSG(wxT("TODO"));
+
+    return NULL;
+}
+
+wxMenu *wxMenuBar::Remove(size_t pos)
+{
+    if ( !wxMenuBarBase::Remove(pos) )
+        return FALSE;
+
+    wxFAIL_MSG(wxT("TODO"));
+
+    return NULL;
 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
@@ -303,18 +339,6 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
     return wxNOT_FOUND;
 }
 
-wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem ) const
-{
-    if ( menuForItem )
-    {
-        // TODO return the pointer to the menu
-
-        *menuForItem = NULL;
-    }
-
-    return FindItem(itemId);
-}
-
 int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
 {
     wxNode *node = m_menus.First();
@@ -347,7 +371,7 @@ static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
     return result;
 }
 
-wxMenuItem* wxMenuBar::FindItem( int id ) const
+wxMenuItem* wxMenuBar::FindItem( int id, wxMenu **menuForItem ) const
 {
     wxMenuItem* result = 0;
     wxNode *node = m_menus.First();
@@ -358,115 +382,48 @@ wxMenuItem* wxMenuBar::FindItem( int id ) const
         node = node->Next();
     }
 
-    return result;
-}
-
-void wxMenuBar::Check( int id, bool check )
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_RET( item, wxT("wxMenuBar::Check: no such item") );
-
-    item->Check(check);
-}
-
-bool wxMenuBar::IsChecked( int id ) const
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsChecked: no such item") );
-
-    return item->IsChecked();
-}
-
-void wxMenuBar::Enable( int id, bool enable )
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_RET( item, wxT("wxMenuBar::Enable: no such item") );
-
-    item->Enable(enable);
-}
-
-bool wxMenuBar::IsEnabled( int id ) const
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsEnabled: no such item") );
-
-    return item->IsEnabled();
-}
-
-wxString wxMenuBar::GetLabel( int id ) const
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetLabel: no such item") );
-
-    return item->GetText();
-}
-
-void wxMenuBar::SetLabel( int id, const wxString &label )
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_RET( item, wxT("wxMenuBar::SetLabel: no such item") );
+    if ( menuForItem )
+    {
+        *menuForItem = result ? result->GetMenu() : (wxMenu *)NULL;
+    }
 
-    item->SetText( label );
+    return result;
 }
 
-void wxMenuBar::EnableTop( int pos, bool flag )
+void wxMenuBar::EnableTop( size_t pos, bool flag )
 {
-    wxNode *node = m_menus.Nth( pos );
+    wxMenuList::Node *node = m_menus.Item( pos );
 
     wxCHECK_RET( node, wxT("menu not found") );
 
-    wxMenu* menu = (wxMenu*)node->Data();
+    wxMenu* menu = node->GetData();
 
     if (menu->m_owner)
         gtk_widget_set_sensitive( menu->m_owner, flag );
 }
 
-wxString wxMenuBar::GetLabelTop( int pos ) const
+wxString wxMenuBar::GetLabelTop( size_t pos ) const
 {
-    wxNode *node = m_menus.Nth( pos );
+    wxMenuList::Node *node = m_menus.Item( pos );
 
     wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") );
 
-    wxMenu* menu = (wxMenu*)node->Data();
+    wxMenu* menu = node->GetData();
 
     return menu->GetTitle();
 }
 
-void wxMenuBar::SetLabelTop( int pos, const wxString& label )
+void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
 {
-    wxNode *node = m_menus.Nth( pos );
+    wxMenuList::Node *node = m_menus.Item( pos );
 
     wxCHECK_RET( node, wxT("menu not found") );
 
-    wxMenu* menu = (wxMenu*)node->Data();
+    wxMenu* menu = node->GetData();
 
     menu->SetTitle( label );
 }
 
-void wxMenuBar::SetHelpString( int id, const wxString& helpString )
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_RET( item, wxT("wxMenuBar::SetHelpString: no such item") );
-
-    item->SetHelp( helpString );
-}
-
-wxString wxMenuBar::GetHelpString( int id ) const
-{
-    wxMenuItem* item = FindMenuItemById( id );
-
-    wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetHelpString: no such item") );
-
-    return item->GetHelp();
-}
-
 //-----------------------------------------------------------------------------
 // "activate"
 //-----------------------------------------------------------------------------
@@ -488,15 +445,17 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 
     if (item->IsCheckable())
     {
-        if (item->GetCheckedFlag() == item->IsChecked())
+        bool isReallyChecked = item->IsChecked();
+        if ( item->wxMenuItemBase::IsChecked() == isReallyChecked )
         {
             /* the menu item has been checked by calling wxMenuItem->Check() */
             return;
         }
         else
         {
-            /* the user pressed on the menu item -> report */
-            item->SetCheckedFlag(item->IsChecked());  /* make consistent again */
+            /* the user pressed on the menu item -> report and make consistent
+             * again */
+            item->wxMenuItemBase::Check(isReallyChecked);
         }
     }
 
@@ -573,16 +532,37 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
 
-wxMenuItem::wxMenuItem()
+wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
+                                int id,
+                                const wxString& name,
+                                const wxString& help,
+                                bool isCheckable,
+                                wxMenu *subMenu)
 {
-    m_id = ID_SEPARATOR;
-    m_isCheckMenu = FALSE;
+    return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+}
+
+wxMenuItem::wxMenuItem(wxMenu *parentMenu,
+                       int id,
+                       const wxString& text,
+                       const wxString& help,
+                       bool isCheckable,
+                       wxMenu *subMenu)
+{
+    m_id = id;
+    m_isCheckable = isCheckable;
     m_isChecked = FALSE;
     m_isEnabled = TRUE;
-    m_subMenu = (wxMenu *) NULL;
+    m_subMenu = subMenu;
+    m_parentMenu = parentMenu;
+    m_help = help;
+
     m_menuItem = (GtkWidget *) NULL;
+
+    // call it after initializing m_menuItem to NULL
+    DoSetText(text);
 }
 
 wxMenuItem::~wxMenuItem()
@@ -591,10 +571,10 @@ wxMenuItem::~wxMenuItem()
 }
 
 // it's valid for this function to be called even if m_menuItem == NULL
-void wxMenuItem::SetName( const wxString& str )
+void wxMenuItem::DoSetText( const wxString& str )
 {
     /* '\t' is the deliminator indicating a hot key */
-    m_text = wxT("");
+    m_text.Empty();
     const wxChar *pc = str;
     for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ )
     {
@@ -639,9 +619,10 @@ void wxMenuItem::Check( bool check )
 
     wxCHECK_RET( IsCheckable(), wxT("Can't check uncheckable item!") )
 
-    if (check == m_isChecked) return;
+    if (check == m_isChecked)
+        return;
 
-    m_isChecked = check;
+    wxMenuItemBase::Check( check );
     gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
 }
 
@@ -650,18 +631,17 @@ void wxMenuItem::Enable( bool enable )
     wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
 
     gtk_widget_set_sensitive( m_menuItem, enable );
-    m_isEnabled = enable;
+    wxMenuItemBase::Enable( enable );
 }
 
 bool wxMenuItem::IsChecked() const
 {
     wxCHECK_MSG( m_menuItem, FALSE, wxT("invalid menu item") );
 
-    wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
-
-    bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0;
+    wxCHECK_MSG( IsCheckable(), FALSE,
+                 wxT("can't get state of uncheckable item!") );
 
-    return bIsChecked;
+    return ((GtkCheckMenuItem*)m_menuItem)->active != 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -727,14 +707,14 @@ wxMenu::~wxMenu()
     while (node)
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
-	wxMenu *submenu = item->GetSubMenu();
-	if (submenu)
-	   delete submenu;
+        wxMenu *submenu = item->GetSubMenu();
+        if (submenu)
+           delete submenu;
         node = node->Next();
     }
 
    gtk_widget_destroy( m_menu );
-   
+
    gtk_object_unref( GTK_OBJECT(m_factory) );
 }
 
@@ -751,8 +731,7 @@ const wxString wxMenu::GetTitle() const
 
 void wxMenu::AppendSeparator()
 {
-    wxMenuItem *mitem = new wxMenuItem();
-    mitem->SetId(ID_SEPARATOR);
+    wxMenuItem *mitem = new wxMenuItem(this, wxID_SEPARATOR);
 
 #if (GTK_MINOR_VERSION > 0)
     GtkItemFactoryEntry entry;
@@ -776,53 +755,72 @@ void wxMenu::AppendSeparator()
     m_items.Append( mitem );
 }
 
-#if (GTK_MINOR_VERSION > 0)
-static char* GetHotKey( const wxString &hotkey, char *hotbuf )
+#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL
+static wxString GetHotKey( const wxMenuItem& item )
 {
-    if (hotkey.IsEmpty()) return (char*) NULL;
+    wxString hotkey;
+
+    // as wxGetAccelFromString() looks for TAB, insert a dummy one here
+    wxString label;
+    label << wxT('\t') << item.GetHotKey();
 
-    switch (hotkey[0])
+    // but if the hotkey is empty don't do anything
+    if ( label.length() > 1 )
     {
-        case wxT('a'):   /* Alt */
-        case wxT('A'):
-        case wxT('m'):   /* Meta */
-        case wxT('M'):
-        {
-            strcpy( hotbuf, "<alt>" );
-            wxString last = hotkey.Right(1);
-            strcat( hotbuf, last.mb_str() );
-            return hotbuf;
-        }
-        case wxT('c'):    /* Ctrl */
-        case wxT('C'):
-        case wxT('s'):    /* Strg, yeah man, I'm German */
-        case wxT('S'):
-        {
-            strcpy( hotbuf, "<control>" );
-            wxString last = hotkey.Right(1);
-            strcat( hotbuf, last.mb_str() );
-            return hotbuf;
-        }
-        case wxT('F'):   /* function keys */
-        {
-            strcpy( hotbuf, hotkey.mb_str() );
-            return hotbuf;
-        }
-        default:
+        wxAcceleratorEntry *accel = wxGetAccelFromString(label);
+        if ( accel )
         {
+            int flags = accel->GetFlags();
+            if ( flags & wxACCEL_ALT )
+                hotkey += wxT("<alt>");
+            if ( flags & wxACCEL_CTRL )
+                hotkey += wxT("<control>");
+            if ( flags & wxACCEL_SHIFT )
+                hotkey += wxT("<shift>");
+
+            int code = accel->GetKeyCode();
+            switch ( code )
+            {
+                case WXK_F1:
+                case WXK_F2:
+                case WXK_F3:
+                case WXK_F4:
+                case WXK_F5:
+                case WXK_F6:
+                case WXK_F7:
+                case WXK_F8:
+                case WXK_F9:
+                case WXK_F10:
+                case WXK_F11:
+                case WXK_F12:
+                    hotkey << wxT('F') << code - WXK_F1 + 1;
+                    break;
+
+                // if there are any other keys wxGetAccelFromString() may return,
+                // we should process them here
+
+                default:
+                    if ( wxIsalnum(code) )
+                    {
+                        hotkey << (wxChar)code;
+
+                        break;
+                    }
+
+                    wxFAIL_MSG( wxT("unknown keyboard accel") );
+            }
+
+            delete accel;
         }
     }
-    return (char*) NULL;
+
+    return hotkey;
 }
-#endif
+#endif // wxUSE_ACCEL
 
 void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
 {
-    wxMenuItem *mitem = new wxMenuItem();
-    mitem->SetId(id);
-    mitem->SetText(item);
-    mitem->SetHelp(helpStr);
-    mitem->SetCheckable(checkable);
+    wxMenuItem *mitem = new wxMenuItem(this, id, item, helpStr, checkable);
 
 #if (GTK_MINOR_VERSION > 0)
     /* text has "_" instead of "&" after mitem->SetText() */
@@ -842,8 +840,16 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
     else
         entry.item_type = "<Item>";
 
-    char hotbuf[50];
-    entry.accelerator = GetHotKey( mitem->GetHotKey(), hotbuf );
+#if wxUSE_ACCEL
+    // due to an apparent bug in GTK+, we have to use a static buffer here -
+    // otherwise GTK+ 1.2.2 manages to override the memory we pass to it
+    // somehow! (VZ)
+    static char s_accel[32]; // must be big enough for <control><alt><shift>F12
+    strncpy(s_accel, GetHotKey(*mitem).mb_str(), WXSIZEOF(s_accel));
+    entry.accelerator = s_accel;
+#else
+    entry.accelerator = NULL;
+#endif
 
     gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
 
@@ -886,10 +892,7 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
 
 void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxString &helpStr )
 {
-    wxMenuItem *mitem = new wxMenuItem();
-    mitem->SetId(id);
-    mitem->SetText(item);
-    mitem->SetHelp(helpStr);
+    wxMenuItem *mitem = new wxMenuItem(this, id, item, helpStr, FALSE, subMenu);
 
 #if (GTK_MINOR_VERSION > 0)
     /* text has "_" instead of "&" after mitem->SetText() */
@@ -938,7 +941,6 @@ void wxMenu::Append( int id, const wxString &item, wxMenu *subMenu, const wxStri
     gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), subMenu->m_menu );
 
     mitem->SetMenuItem(menuItem);
-    mitem->SetSubMenu(subMenu);
 
     m_items.Append( mitem );
 }
@@ -988,8 +990,8 @@ void wxMenu::Delete( int id )
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->GetId() == id)
         {
-	    gtk_widget_destroy( item->GetMenuItem() );
-	    m_items.DeleteNode( node );
+            gtk_widget_destroy( item->GetMenuItem() );
+            m_items.DeleteNode( node );
             return;
         }
         node = node->Next();