Compilo.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 016f7008725ab113f6082d8bd498abb63f2963cf..ab623d957bac6e7dba57bb86f25bdc2ea1d93f63 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -771,7 +771,7 @@ void wxMenuItem::SetText( const wxString& string )
     wxString str = string;
     if (str.IsEmpty())
     {
     wxString str = string;
     if (str.IsEmpty())
     {

-        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);
     }
 

diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp
index 9d096e847f31ccc2bfdc3cbbf608495ff41931fb..2b57e57d6accc64011b89a9b28b69c92c11c87b7 100644 (file)
--- a/src/motif/menuitem.cpp
+++ b/src/motif/menuitem.cpp
@@ -179,7 +179,7 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar,
 
         if (m_text.IsEmpty())
         {
 
         if (m_text.IsEmpty())
         {

-            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?"));

             txt = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
         }
 
             txt = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
         }
 

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 055d634f55a831c3ad5332696a12876d87062fbd..2a5f3785845571f5513be80e1aab38c200794a52 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -375,7 +375,7 @@ void wxMenuItem::SetText( const wxString& rText )
 
     if (sText.IsEmpty())
     {
 
     if (sText.IsEmpty())
     {

-        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?"));

         sText = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
     }
 
         sText = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
     }
 

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index c3170fa2d9cf4bb2cf4b3f33e63f98c604d5130d..c2b05dc3b574957018373a45ea1977a877a84a2d 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -1545,7 +1545,7 @@ void wxMenuItem::SetText(const wxString& txt)
         wxString text = txt;
         if (text.IsEmpty())
         {
         wxString text = txt;
         if (text.IsEmpty())
         {

-            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?"));

             text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
         }
 
             text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
         }