added (and documented) trivial but useful IsSingleLine() and IsMultiLine() text contr...

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

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index dac0c55cf5ea41b39ad7f0b5282026ab4309e24d..b8d23c5eddb5c074a0263962070fc9d0f8eceea1 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -41,7 +41,7 @@ public:
                            int id = wxID_SEPARATOR,
                            const wxString& text = wxEmptyString,
                            const wxString& help = wxEmptyString,
                            int id = wxID_SEPARATOR,
                            const wxString& text = wxEmptyString,
                            const wxString& help = wxEmptyString,

-                           wxItemKind kind = wxItem_Normal,
+                           wxItemKind kind = wxITEM_NORMAL,

                            wxMenu *subMenu = (wxMenu *)NULL);
 
     // destruction: wxMenuItem will delete its submenu
                            wxMenu *subMenu = (wxMenu *)NULL);
 
     // destruction: wxMenuItem will delete its submenu


@@ -71,8 +71,9 @@ public:
     // what kind of menu item we are
     wxItemKind GetKind() const { return m_kind; }
 
     // what kind of menu item we are
     wxItemKind GetKind() const { return m_kind; }
 

-    virtual void SetCheckable(bool checkable) { m_kind = wxItem_Check; }
-    bool IsCheckable() const { return m_kind == wxItem_Check; }
+    virtual void SetCheckable(bool checkable) { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; }
+    bool IsCheckable() const
+        { return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; }

 
     bool IsSubMenu() const { return m_subMenu != NULL; }
     void SetSubMenu(wxMenu *menu) { m_subMenu = menu; }
 
     bool IsSubMenu() const { return m_subMenu != NULL; }
     void SetSubMenu(wxMenu *menu) { m_subMenu = menu; }


@@ -115,7 +116,7 @@ public:
                            wxMenu *subMenu = (wxMenu *)NULL)
     {
         return New(parentMenu, id, text, help,
                            wxMenu *subMenu = (wxMenu *)NULL)
     {
         return New(parentMenu, id, text, help,

-                   isCheckable ? wxItem_Check : wxItem_Normal, subMenu);
+                   isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu);

     }
 
 protected:
     }
 
 protected:


@@ -133,7 +134,7 @@ protected:
                    int id = wxID_SEPARATOR,
                    const wxString& text = wxEmptyString,
                    const wxString& help = wxEmptyString,
                    int id = wxID_SEPARATOR,
                    const wxString& text = wxEmptyString,
                    const wxString& help = wxEmptyString,

-                   wxItemKind kind = wxItem_Normal,
+                   wxItemKind kind = wxITEM_NORMAL,

                    wxMenu *subMenu = (wxMenu *)NULL);
 
 private:
                    wxMenu *subMenu = (wxMenu *)NULL);
 
 private: