don't compute (and mainly don't cache) our best size until we have created the radio...

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 993c2881bddf02f8d7163e1753210af4ac5ce3ff..ff7cac5e428c85ea6073fec6eca5027589620282 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -17,6 +17,7 @@
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/bitmap.h"
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/bitmap.h"

+    #include "wx/app.h"

 #endif
 
 #include "wx/accel.h"
 #endif
 
 #include "wx/accel.h"


@@ -920,7 +921,6 @@ void wxMenuItem::DoSetText( const wxString& str )
 {
     m_text.Empty();
     m_text = GTKProcessMenuItemLabel(str, &m_hotKey);
 {
     m_text.Empty();
     m_text = GTKProcessMenuItemLabel(str, &m_hotKey);

-    // wxPrintf( wxT("DoSetText(): str %s m_text %s hotkey %s\n"), str.c_str(), m_text.c_str(), m_hotKey.c_str() );

 }
 
 #if wxUSE_ACCEL
 }
 
 #if wxUSE_ACCEL


@@ -930,14 +930,15 @@ wxAcceleratorEntry *wxMenuItem::GetAccel() const
     if ( !GetHotKey() )
     {
         // nothing
     if ( !GetHotKey() )
     {
         // nothing

-        return (wxAcceleratorEntry *)NULL;
+        return NULL;

     }
 
     }
 

-    // as wxGetAccelFromString() looks for TAB, insert a dummy one here
+    // accelerator parsing code looks for them after a TAB, so insert a dummy
+    // one here

     wxString label;
     label << wxT('\t') << GetHotKey();
 
     wxString label;
     label << wxT('\t') << GetHotKey();
 

-    return wxGetAccelFromString(label);
+    return wxAcceleratorEntry::Create(label);

 }
 
 #endif // wxUSE_ACCEL
 }
 
 #endif // wxUSE_ACCEL


@@ -1536,7 +1537,7 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey += wxString::Format(wxT("Special%d"), code - WXK_SPECIAL1 + 1);
                 break;
           */
                 hotkey += wxString::Format(wxT("Special%d"), code - WXK_SPECIAL1 + 1);
                 break;
           */

-                // if there are any other keys wxGetAccelFromString() may
+                // if there are any other keys wxAcceleratorEntry::Create() may

                 // return, we should process them here
 
             default:
                 // return, we should process them here
 
             default: