Fixes for 16-bit compilation

[wxWidgets.git] / include / wx / msw / menuitem.h

diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index cbe61b535f3bff17aa7ec513db5f86767f82be6c..28e8e1c9db31f89a0a125f1b31c31dc20f1436e9 100644 (file)
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -55,15 +55,20 @@ public:
 
   // accessors (some more are inherited from wxOwnerDrawn or are below)
   bool              IsSeparator() const { return m_idItem == ID_SEPARATOR;  }
 
   // accessors (some more are inherited from wxOwnerDrawn or are below)
   bool              IsSeparator() const { return m_idItem == ID_SEPARATOR;  }

-  bool              IsEnabled()   const { return m_bEnabled;  }
-  bool              IsChecked()   const { return m_bChecked;  }
+  bool              IsEnabled()   const { return m_bEnabled;                }
+  bool              IsChecked()   const { return m_bChecked;                }
+  bool              IsSubMenu()   const { return GetSubMenu() != NULL;      }

 
   int               GetId()       const { return m_idItem;    }
   const wxString&   GetHelp()     const { return m_strHelp;   }
   wxMenu           *GetSubMenu()  const { return m_pSubMenu;  }
 
 
   int               GetId()       const { return m_idItem;    }
   const wxString&   GetHelp()     const { return m_strHelp;   }
   wxMenu           *GetSubMenu()  const { return m_pSubMenu;  }
 

+  // the id for a popup menu is really its menu handle (as required by
+  // ::AppendMenu() API)
+  int               GetRealId()   const;
+

   // operations
   // operations

-  void SetName(const wxString& strName) { m_strName = strName; }
+  void SetName(const wxString& strName);

   void SetHelp(const wxString& strHelp) { m_strHelp = strHelp; }
 
   void Enable(bool bDoEnable = TRUE);
   void SetHelp(const wxString& strHelp) { m_strHelp = strHelp; }
 
   void Enable(bool bDoEnable = TRUE);