From: Robert Roebling Date: Sun, 3 Sep 2006 20:12:44 +0000 (+0000) Subject: Compilo. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4fc3eebc017183cb8cc2c4400227d05b4eb16676 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 016f700872..ab623d957b 100644 --- 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()) { - 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); } diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp index 9d096e847f..2b57e57d6a 100644 --- 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()) { - 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); } diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 055d634f55..2a5f378584 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -375,7 +375,7 @@ void wxMenuItem::SetText( const wxString& rText ) 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); } diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp index c3170fa2d9..c2b05dc3b5 100644 --- 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()) { - 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); }