don't do anything before including the PCH header

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

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index fa0bfec3d72499d42a46bdcbe3455099e9decc3a..884fa75167268fcabb89e77f699ba185eeb37541 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -67,7 +67,7 @@ wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
     m_id          = id;
     m_kind        = kind;
     if (m_id == wxID_ANY)
-        m_id = wxNewId();
+        m_id = wxWindow::NewControlId();
     if (m_id == wxID_SEPARATOR)
         m_kind = wxITEM_SEPARATOR;
 
@@ -848,7 +848,7 @@ void wxMenuBarBase::SetLabelTop(size_t pos, const wxString& label)
 
 wxString wxMenuBarBase::GetLabelTop(size_t pos) const
 {
-    return GetMenuLabel(pos);
+    return GetMenuLabelText(pos);
 }
 #endif