use AllocExclusive

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

diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h
index 00027ee3fdbb4d064000d20b79f4a30985aafa48..1e9d1d89b8bbc1fe2ecb1a8317ad5fb59cc24583 100644 (file)
--- a/include/wx/os2/menuitem.h
+++ b/include/wx/os2/menuitem.h
@@ -1,26 +1,22 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        menuitem.h
+// Name:        wx/os2/menuitem.h

 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 

-#ifdef __GNUG__
-#pragma interface "menuitem.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

-#include "wx/setup.h"
+#include "wx/defs.h"

 
 // 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
 
 // 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


@@ -47,9 +43,9 @@ public:
     //
     wxMenuItem( wxMenu*         pParentMenu = NULL
                ,int             nId = wxID_SEPARATOR
     //
     wxMenuItem( wxMenu*         pParentMenu = NULL
                ,int             nId = wxID_SEPARATOR

-               ,const wxString& rStrName = ""
-               ,const wxString& rWxHelp = ""
-               ,wxItemKind      kind = wxITEM_NORMAL
+               ,const wxString& rStrName = wxEmptyString
+               ,const wxString& rWxHelp = wxEmptyString
+               ,wxItemKind      eKind = wxITEM_NORMAL

                ,wxMenu*         pSubMenu = NULL
               );
 
                ,wxMenu*         pSubMenu = NULL
               );
 


@@ -71,8 +67,8 @@ public:
     virtual void SetText(const wxString& rStrName);
     virtual void SetCheckable(bool bCheckable);
 
     virtual void SetText(const wxString& rStrName);
     virtual void SetCheckable(bool bCheckable);
 

-    virtual void Enable(bool bDoEnable = TRUE);
-    virtual void Check(bool bDoCheck = TRUE);
+    virtual void Enable(bool bDoEnable = true);
+    virtual void Check(bool bDoCheck = true);

     virtual bool IsChecked(void) const;
 
     //
     virtual bool IsChecked(void) const;
 
     //


@@ -88,6 +84,9 @@ public:
     //
     int GetRealId(void) const;
 
     //
     int GetRealId(void) const;
 

+    //
+    // Mark item as belonging to the given radio group
+    //

     void SetAsRadioGroupStart(void);
     void SetRadioGroupStart(int nStart);
     void SetRadioGroupEnd(int nEnd);
     void SetAsRadioGroupStart(void);
     void SetRadioGroupStart(int nStart);
     void SetRadioGroupEnd(int nEnd);


@@ -110,8 +109,13 @@ private:
     {
         int m_nStart;
         int m_nEnd;
     {
         int m_nStart;
         int m_nEnd;

-    }                               m_vRadioGroup;
+    } m_vRadioGroup;
+
+    //
+    // Does this item start a radio group?
+    //

     bool                            m_bIsRadioGroupStart;
     bool                            m_bIsRadioGroupStart;

+

     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 }; // end of CLASS wxMenuItem
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 }; // end of CLASS wxMenuItem