a tad bit more padding

[wxWidgets.git] / src / common / menucmn.cpp

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 896c9e1e031017033532fd7217a2d46487a34fc4..49f3a00d9e08b8f9deef1edbf56b38949f59a60e 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -34,6 +34,8 @@
     #include "wx/menu.h"
 #endif
 
     #include "wx/menu.h"
 #endif
 

+#include "wx/stockitem.h"
+

 // ----------------------------------------------------------------------------
 // template lists
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // template lists
 // ----------------------------------------------------------------------------


@@ -174,13 +176,16 @@ static int
 bool
 wxAcceleratorEntry::ParseAccel(const wxString& text, int *flagsOut, int *keyOut)
 {
 bool
 wxAcceleratorEntry::ParseAccel(const wxString& text, int *flagsOut, int *keyOut)
 {

-    // the parser won't like leading/trailing spaces
-    wxString label = text.Strip(wxString::both);
+    // the parser won't like trailing spaces
+    wxString label = text;
+    label.Trim(true);  // the initial \t must be preserved so don't strip leading whitespaces

 
     // check for accelerators: they are given after '\t'
     int posTab = label.Find(wxT('\t'));
     if ( posTab == wxNOT_FOUND )
 
     // check for accelerators: they are given after '\t'
     int posTab = label.Find(wxT('\t'));
     if ( posTab == wxNOT_FOUND )

+    {

         return false;
         return false;

+    }

 
     // parse the accelerator string
     int accelFlags = wxACCEL_NORMAL;
 
     // parse the accelerator string
     int accelFlags = wxACCEL_NORMAL;


@@ -360,8 +365,6 @@ wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
                                const wxString& help,
                                wxItemKind kind,
                                wxMenu *subMenu)
                                const wxString& help,
                                wxItemKind kind,
                                wxMenu *subMenu)

-              : m_text(text),
-                m_help(help)

 {
     wxASSERT_MSG( parentMenu != NULL, wxT("menuitem should have a menu") );
 
 {
     wxASSERT_MSG( parentMenu != NULL, wxT("menuitem should have a menu") );
 


@@ -375,6 +378,9 @@ wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
         m_id = wxNewId();
     if (m_id == wxID_SEPARATOR)
         m_kind = wxITEM_SEPARATOR;
         m_id = wxNewId();
     if (m_id == wxID_SEPARATOR)
         m_kind = wxITEM_SEPARATOR;

+
+    SetText(text);
+    SetHelp(help);

 }
 
 wxMenuItemBase::~wxMenuItemBase()
 }
 
 wxMenuItemBase::~wxMenuItemBase()


@@ -403,6 +409,30 @@ void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel)
 
 #endif // wxUSE_ACCEL
 
 
 #endif // wxUSE_ACCEL
 

+void wxMenuItemBase::SetText(const wxString& str)
+{
+    m_text = str;
+
+    if ( m_text.empty() && !IsSeparator() )
+    {
+        wxASSERT_MSG( wxIsStockID(GetId()),
+                      wxT("A non-stock menu item with an empty label?") );
+        m_text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR |
+                                          wxSTOCK_WITH_MNEMONIC);
+    }
+}
+
+void wxMenuItemBase::SetHelp(const wxString& str)
+{
+    m_help = str;
+
+    if ( m_help.empty() && !IsSeparator() && wxIsStockID(GetId()) )
+    {
+        // get a stock help string
+        m_help = wxGetStockHelpString(GetId());
+    }
+}
+

 bool wxMenuBase::ms_locked = true;
 
 // ----------------------------------------------------------------------------
 bool wxMenuBase::ms_locked = true;
 
 // ----------------------------------------------------------------------------