fixed reverted #if condition around wxDoLogTraceWchar

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 10fee257c64899a109fb7768d8005927c5129b33..ea47b894ec325784450d37b418945ff0d288c126 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -704,7 +704,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        wxMenu *subMenu)
           : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
 {
                        wxMenu *subMenu)
           : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
 {

-    Init(text);
+    Init();

 }
 
 wxMenuItem::wxMenuItem(wxMenu *parentMenu,
 }
 
 wxMenuItem::wxMenuItem(wxMenu *parentMenu,


@@ -716,15 +716,15 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
           : wxMenuItemBase(parentMenu, id, text, help,
                            isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
 {
           : wxMenuItemBase(parentMenu, id, text, help,
                            isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
 {

-    Init(text);
+    Init();

 }
 
 }
 

-void wxMenuItem::Init(const wxString& text)
+void wxMenuItem::Init()

 {
     m_labelWidget = (GtkWidget *) NULL;
     m_menuItem = (GtkWidget *) NULL;
 
 {
     m_labelWidget = (GtkWidget *) NULL;
     m_menuItem = (GtkWidget *) NULL;
 

-    DoSetText(text);
+    DoSetText(m_text);

 }
 
 wxMenuItem::~wxMenuItem()
 }
 
 wxMenuItem::~wxMenuItem()


@@ -769,10 +769,11 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 void wxMenuItem::SetText( const wxString& string )
 {
     wxString str = string;
 void wxMenuItem::SetText( const wxString& string )
 {
     wxString str = string;

-    if (str.IsEmpty())
+    if ( str.empty() && !IsSeparator() )

     {
         wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
     {
         wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));

-        str = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
+        str = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR |
+                                       wxSTOCK_WITH_MNEMONIC);

     }
 
     // Some optimization to avoid flicker
     }
 
     // Some optimization to avoid flicker


@@ -833,7 +834,9 @@ void wxMenuItem::SetText( const wxString& string )
 void wxMenuItem::DoSetText( const wxString& str )
 {
     // '\t' is the deliminator indicating a hot key
 void wxMenuItem::DoSetText( const wxString& str )
 {
     // '\t' is the deliminator indicating a hot key

-    m_text.Empty();
+    wxString text;
+    text.reserve(str.length());
+

     const wxChar *pc = str;
     while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) )
     {
     const wxChar *pc = str;
     while ( (*pc != wxT('\0')) && (*pc != wxT('\t')) )
     {


@@ -841,30 +844,32 @@ void wxMenuItem::DoSetText( const wxString& str )
         {
             // "&" is doubled to indicate "&" instead of accelerator
             ++pc;
         {
             // "&" is doubled to indicate "&" instead of accelerator
             ++pc;

-            m_text << wxT('&');
+            text << wxT('&');

         }
         else if (*pc == wxT('&'))
         {
         }
         else if (*pc == wxT('&'))
         {

-            m_text << wxT('_');
+            text << wxT('_');

         }
         else if ( *pc == wxT('_') )    // escape underscores
         {
         }
         else if ( *pc == wxT('_') )    // escape underscores
         {

-            m_text << wxT("__");
+            text << wxT("__");

         }
         else
         {
         }
         else
         {

-            m_text << *pc;
+            text << *pc;

         }
         ++pc;
     }
 
     m_hotKey = wxEmptyString;
 
         }
         ++pc;
     }
 
     m_hotKey = wxEmptyString;
 

-    if(*pc == wxT('\t'))
+    if ( *pc == wxT('\t') )

     {
        pc++;
        m_hotKey = pc;
     }
     {
        pc++;
        m_hotKey = pc;
     }

+
+    m_text = text;

 }
 
 #if wxUSE_ACCEL
 }
 
 #if wxUSE_ACCEL


@@ -1243,10 +1248,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("Down" );
                 break;
             case WXK_PAGEUP:
                 hotkey << wxT("Down" );
                 break;
             case WXK_PAGEUP:

-                hotkey << wxT("PgUp" );
+                hotkey << wxT("Page_Up" );

                 break;
             case WXK_PAGEDOWN:
                 break;
             case WXK_PAGEDOWN:

-                hotkey << wxT("PgDn" );
+                hotkey << wxT("Page_Down" );

                 break;
             case WXK_LEFT:
                 hotkey << wxT("Left" );
                 break;
             case WXK_LEFT:
                 hotkey << wxT("Left" );


@@ -1364,10 +1369,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("KP_Down" );
                 break;
             case WXK_NUMPAD_PAGEUP:
                 hotkey << wxT("KP_Down" );
                 break;
             case WXK_NUMPAD_PAGEUP:

-                hotkey << wxT("KP_PgUp" );
+                hotkey << wxT("KP_Page_Up" );

                 break;
             case WXK_NUMPAD_PAGEDOWN:
                 break;
             case WXK_NUMPAD_PAGEDOWN:

-                hotkey << wxT("KP_PgDn" );
+                hotkey << wxT("KP_Page_Down" );

                 break;
             case WXK_NUMPAD_END:
                 hotkey << wxT("KP_End" );
                 break;
             case WXK_NUMPAD_END:
                 hotkey << wxT("KP_End" );


@@ -1429,7 +1434,7 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 if ( code < 127 )
                 {
                     wxString name = wxGTK_CONV_BACK( gdk_keyval_name((guint)code) );
                 if ( code < 127 )
                 {
                     wxString name = wxGTK_CONV_BACK( gdk_keyval_name((guint)code) );

-                    if ( name )
+                    if ( !name.empty() )

                     {
                         hotkey << name;
                         break;
                     {
                         hotkey << name;
                         break;