Because someone was inconsistent about using LPSTR and char*, I missed

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

diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index 6536ac08056275bbff3b2e5f6056243b302a3611..28e8e1c9db31f89a0a125f1b31c31dc20f1436e9 100644 (file)
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -2,7 +2,7 @@
 // Name:        menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
-// Modified by: 
+// Modified by:
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -13,7 +13,7 @@
 #define   _MENUITEM_H
 
 #ifdef __GNUG__
-#pragma interface "menuitem.h"
+    #pragma interface "menuitem.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
 // an exception to the general rule that a normal header doesn't include other
 // headers - only because ownerdrw.h is not always included and I don't want
 // to write #ifdef's everywhere...
-#if USE_OWNER_DRAWN
-#include  "wx/ownerdrw.h"
+#if wxUSE_OWNER_DRAWN
+    #include  "wx/ownerdrw.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -40,7 +40,7 @@
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxMenuItem: public wxObject
-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
                             , public wxOwnerDrawn
 #endif
 {
@@ -55,15 +55,20 @@ public:
 
   // 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;  }
 
+  // the id for a popup menu is really its menu handle (as required by
+  // ::AppendMenu() API)
+  int               GetRealId()   const;
+
   // 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);
@@ -79,7 +84,7 @@ private:
   bool        m_bEnabled,       // enabled or greyed?
               m_bChecked;       // checked? (only if checkable)
 
-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
   // wxOwnerDrawn base class already has these variables - nothing to do
 
 #else   //!owner drawn