A few tweaks and cleanups

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

diff --git a/include/wx/menu.h b/include/wx/menu.h
index b1b357c694e9642294a490848d670fc26df437e2..181781b0a59c2586bcf4bc9c3aa9ace86b1e929b 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -79,7 +79,7 @@ public:
     void Append(int id,
                 const wxString& text,
                 const wxString& help = wxEmptyString,
     void Append(int id,
                 const wxString& text,
                 const wxString& help = wxEmptyString,

-                wxItemKind kind = wxItem_Normal)
+                wxItemKind kind = wxITEM_NORMAL)

     {
         DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, kind));
     }
     {
         DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, kind));
     }


@@ -92,7 +92,7 @@ public:
                          const wxString& text,
                          const wxString& help = wxEmptyString)
     {
                          const wxString& text,
                          const wxString& help = wxEmptyString)
     {

-        Append(id, text, help, wxItem_Check);
+        Append(id, text, help, wxITEM_CHECK);

     }
 
     // append a radio item
     }
 
     // append a radio item


@@ -100,7 +100,7 @@ public:
                          const wxString& text,
                          const wxString& help = wxEmptyString)
     {
                          const wxString& text,
                          const wxString& help = wxEmptyString)
     {

-        Append(id, text, help, wxItem_Radio);
+        Append(id, text, help, wxITEM_RADIO);

     }
 
     // append a submenu
     }
 
     // append a submenu


@@ -109,7 +109,8 @@ public:
                 wxMenu *submenu,
                 const wxString& help = wxEmptyString)
     {
                 wxMenu *submenu,
                 const wxString& help = wxEmptyString)
     {

-        DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, FALSE, submenu));
+        DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help,
+                                 wxITEM_NORMAL, submenu));

     }
 
     // the most generic form of Append() - append anything
     }
 
     // the most generic form of Append() - append anything


@@ -127,7 +128,7 @@ public:
                 int id,
                 const wxString& text,
                 const wxString& help = wxEmptyString,
                 int id,
                 const wxString& text,
                 const wxString& help = wxEmptyString,

-                wxItemKind kind = wxItem_Normal)
+                wxItemKind kind = wxITEM_NORMAL)

     {
         Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, kind));
     }
     {
         Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, kind));
     }


@@ -144,7 +145,7 @@ public:
                          const wxString& text,
                          const wxString& help = wxEmptyString)
     {
                          const wxString& text,
                          const wxString& help = wxEmptyString)
     {

-        Insert(pos, id, text, help, wxItem_Check);
+        Insert(pos, id, text, help, wxITEM_CHECK);

     }
 
     // insert a radio item
     }
 
     // insert a radio item


@@ -153,7 +154,7 @@ public:
                          const wxString& text,
                          const wxString& help = wxEmptyString)
     {
                          const wxString& text,
                          const wxString& help = wxEmptyString)
     {

-        Insert(pos, id, text, help, wxItem_Radio);
+        Insert(pos, id, text, help, wxITEM_RADIO);

     }
 
     // insert a submenu
     }
 
     // insert a submenu


@@ -163,7 +164,8 @@ public:
                 wxMenu *submenu,
                 const wxString& help = wxEmptyString)
     {
                 wxMenu *submenu,
                 const wxString& help = wxEmptyString)
     {

-        Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, FALSE, submenu));
+        Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help,
+                                    wxITEM_NORMAL, submenu));

     }
 
     // prepend an item to the menu
     }
 
     // prepend an item to the menu


@@ -176,7 +178,7 @@ public:
     void Prepend(int id,
                  const wxString& text,
                  const wxString& help = wxEmptyString,
     void Prepend(int id,
                  const wxString& text,
                  const wxString& help = wxEmptyString,

-                 wxItemKind kind = wxItem_Normal)
+                 wxItemKind kind = wxITEM_NORMAL)

     {
         Insert(0u, id, text, help, kind);
     }
     {
         Insert(0u, id, text, help, kind);
     }


@@ -318,7 +320,7 @@ public:
                 const wxString& help,
                 bool isCheckable)
     {
                 const wxString& help,
                 bool isCheckable)
     {

-        Append(id, text, help, isCheckable ? wxItem_Check : wxItem_Normal);
+        Append(id, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL);

     }
 
     void Insert(size_t pos,
     }
 
     void Insert(size_t pos,


@@ -327,7 +329,7 @@ public:
                 const wxString& help,
                 bool isCheckable)
     {
                 const wxString& help,
                 bool isCheckable)
     {

-        Insert(pos, id, text, help, isCheckable ? wxItem_Check : wxItem_Normal);
+        Insert(pos, id, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL);

     }
 
     void Prepend(int id,
     }
 
     void Prepend(int id,