Fallout of Patch #1547639 (Menu stock item support)

[Francesco Montorsi]

Wlodek Szafran ha scritto:
> Hello,
> 
> the patch #1547639 introduced a misspelled name for the wxIsStockID 
> function in several platform-dependent menuitem.cpp files as 
> wsIsStockId, which causes compilation errors.
ach, sorry I already noticed it and I thought I had submitted the 
updated patch without those mispelled names but I must be wrong.

So here are the simple fixes:

Index: src/gtk1/menu.cpp
===================================================================
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/gtk1/menu.cpp,v
retrieving revision 1.180
diff -bu2 -r1.180 src/gtk1/menu.cpp
--- src/gtk1/menu.cpp
+++ src/gtk1/menu.cpp
@@ -772,5 +772,5 @@
      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);
      }
Index: src/motif/menuitem.cpp
===================================================================
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/motif/menuitem.cpp,v
retrieving revision 1.32
diff -bu2 -r1.32 src/motif/menuitem.cpp
--- src/motif/menuitem.cpp
+++ src/motif/menuitem.cpp
@@ -180,5 +180,5 @@
          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);
          }
cvsdo: WARNING: Using src/msw/.#menuitem.cpp.1_68 for src/msw/menuitem.cpp
Index: src/msw/menuitem.cpp
===================================================================
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/msw/menuitem.cpp,v
retrieving revision 1.68
diff -bu2 -r1.68 src/msw/menuitem.cpp
--- src/msw/menuitem.cpp
+++ src/msw/menuitem.cpp
@@ -157,5 +157,5 @@
      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?"));
          m_text = wxGetStockLabel(GetId(), 
wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
      }
@@ -354,5 +354,5 @@
      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);
      }
Index: src/os2/menuitem.cpp
===================================================================
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/os2/menuitem.cpp,v
retrieving revision 1.37
diff -bu2 -r1.37 src/os2/menuitem.cpp
--- src/os2/menuitem.cpp
+++ src/os2/menuitem.cpp
@@ -376,5 +376,5 @@
      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);
      }
Index: src/univ/menu.cpp
===================================================================
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/univ/menu.cpp,v
retrieving revision 1.67
diff -bu2 -r1.67 src/univ/menu.cpp
--- src/univ/menu.cpp
+++ src/univ/menu.cpp
@@ -1546,5 +1546,5 @@
          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);
          }


Sorry for the problem,
Francesco