[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

[wxWidgets.git] / src / motif / menuitem.cpp

diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp
index e0e9cb9a52f7590e11cb51fd08777bd9a7796fac..e2da6fa88a2b9d10e354f90adb62d0fa3db66de1 100644 (file)
--- a/src/motif/menuitem.cpp
+++ b/src/motif/menuitem.cpp
@@ -21,6 +21,9 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/defs.h"
 
 #include "wx/menu.h"
 #include "wx/defs.h"
 
 #include "wx/menu.h"


@@ -164,9 +167,9 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMen
     m_menuBar = menuBar;
     m_topMenu = topMenu;
 
     m_menuBar = menuBar;
     m_topMenu = topMenu;
 

-    if (GetId() == -2)
+    if (GetId() == -3)

     {
     {

-        // Id=-2 identifies a Title item.
+        // Id=-3 identifies a Title item.

         m_buttonWidget = (WXWidget) XtVaCreateManagedWidget
             (wxStripMenuCodes(m_text),
             xmLabelGadgetClass, (Widget) menu, NULL);
         m_buttonWidget = (WXWidget) XtVaCreateManagedWidget
             (wxStripMenuCodes(m_text),
             xmLabelGadgetClass, (Widget) menu, NULL);


@@ -223,14 +226,14 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMen
             (XtCallbackProc) wxMenuItemDisarmCallback,
             (XtPointer) this);
     }
             (XtCallbackProc) wxMenuItemDisarmCallback,
             (XtPointer) this);
     }

-    else if (GetId() == -1)
+    else if (GetId() == wxID_SEPARATOR)

     {
         m_buttonWidget = (WXWidget) XtVaCreateManagedWidget ("separator",
             xmSeparatorGadgetClass, (Widget) menu, NULL);
     }
     else if (m_subMenu)
     {
     {
         m_buttonWidget = (WXWidget) XtVaCreateManagedWidget ("separator",
             xmSeparatorGadgetClass, (Widget) menu, NULL);
     }
     else if (m_subMenu)
     {

-        m_buttonWidget = m_subMenu->CreateMenu (menuBar, menu, topMenu, m_text, TRUE);
+        m_buttonWidget = m_subMenu->CreateMenu (menuBar, menu, topMenu, m_text, true);

         m_subMenu->SetButtonWidget(m_buttonWidget);
         XtAddCallback ((Widget) m_buttonWidget,
             XmNcascadingCallback,
         m_subMenu->SetButtonWidget(m_buttonWidget);
         XtAddCallback ((Widget) m_buttonWidget,
             XmNcascadingCallback,


@@ -243,7 +246,7 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMen
 
 void wxMenuItem::DestroyItem(bool full)
 {
 
 void wxMenuItem::DestroyItem(bool full)
 {

-    if (GetId() == -2)
+    if (GetId() == -3)

     {
         ;      // Nothing
 
     {
         ;      // Nothing
 


@@ -264,7 +267,7 @@ void wxMenuItem::DestroyItem(bool full)
                 wxMenuItemDisarmCallback, (XtPointer) this);
         }
     }
                 wxMenuItemDisarmCallback, (XtPointer) this);
         }
     }

-    else if (GetId() == -1)
+    else if (GetId() == wxID_SEPARATOR)

     {
         ;      // Nothing
 
     {
         ;      // Nothing
 


@@ -331,7 +334,7 @@ void wxMenuItemCallback (Widget WXUNUSED(w), XtPointer clientData,
 
         if (item->IsCheckable())
         {
 
         if (item->IsCheckable())
         {

-            Boolean isChecked = FALSE;
+            Boolean isChecked = false;

             XtVaGetValues ((Widget) item->GetButtonWidget(),
                            XmNset, & isChecked,
                            NULL);
             XtVaGetValues ((Widget) item->GetButtonWidget(),
                            XmNset, & isChecked,
                            NULL);