few other fixes for wxChar => wxString

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

diff --git a/interface/wx/menuitem.h b/interface/wx/menuitem.h
index eb25e171daf1e19145913b2ac8b38a1a8f210a58..3b6d3b455255e4eefef0d62d40ce0435312ade21 100644 (file)
--- a/interface/wx/menuitem.h
+++ b/interface/wx/menuitem.h
@@ -15,7 +15,7 @@
     usually construct an object of this class for you.
 
     Also please note that the methods related to fonts and bitmaps are currently
     usually construct an object of this class for you.
 
     Also please note that the methods related to fonts and bitmaps are currently

-    only implemented for Windows and GTK+.
+    only implemented for Windows, Mac and GTK+.

 
     @library{wxcore}
     @category{menus}
 
     @library{wxcore}
     @category{menus}


@@ -75,13 +75,13 @@ public:
             Optional help string that will be shown on the status bar.
         @param kind
             May be @c wxITEM_SEPARATOR, @c wxITEM_NORMAL, @c wxITEM_CHECK or
             Optional help string that will be shown on the status bar.
         @param kind
             May be @c wxITEM_SEPARATOR, @c wxITEM_NORMAL, @c wxITEM_CHECK or

-            @c wxITEM_RADIO
+            @c wxITEM_RADIO.

         @param subMenu
             If non-@NULL, indicates that the menu item is a submenu.
     */
     wxMenuItem(wxMenu* parentMenu = NULL, int id = wxID_SEPARATOR,
         @param subMenu
             If non-@NULL, indicates that the menu item is a submenu.
     */
     wxMenuItem(wxMenu* parentMenu = NULL, int id = wxID_SEPARATOR,

-               const wxString& text = "",
-               const wxString& helpString = "",
+               const wxString& text = wxEmptyString,
+               const wxString& helpString = wxEmptyString,

                wxItemKind kind = wxITEM_NORMAL,
                wxMenu* subMenu = NULL);
 
                wxItemKind kind = wxITEM_NORMAL,
                wxMenu* subMenu = NULL);
 


@@ -109,7 +109,7 @@ public:
     /**
         Returns the checked or unchecked bitmap (Windows only).
     */
     /**
         Returns the checked or unchecked bitmap (Windows only).
     */

-    wxBitmap GetBitmap(bool checked = true) const;
+    virtual const wxBitmap& GetBitmap() const;

 
     /**
         Returns the font associated with the menu item (Windows only).
 
     /**
         Returns the font associated with the menu item (Windows only).


@@ -119,7 +119,7 @@ public:
     /**
         Returns the help string associated with the menu item.
     */
     /**
         Returns the help string associated with the menu item.
     */

-    wxString GetHelp() const;
+    const wxString& GetHelp() const;

 
     /**
         Returns the menu item identifier.
 
     /**
         Returns the menu item identifier.


@@ -212,7 +212,7 @@ public:
 
         @see GetLabel(), GetLabelFromText()
     */
 
         @see GetLabel(), GetLabelFromText()
     */

-    wxString GetText() const;
+    const wxString& GetText() const;

 
     /**
         Returns the text colour associated with the menu item (Windows only).
 
     /**
         Returns the text colour associated with the menu item (Windows only).


@@ -250,14 +250,18 @@ public:
     void SetBackgroundColour(const wxColour& colour) const;
 
     /**
     void SetBackgroundColour(const wxColour& colour) const;
 
     /**

-        Sets the bitmap for the menu item (Windows and GTK+ only).
+        Sets the bitmap for the menu item.

         It is equivalent to wxMenuItem::SetBitmaps(bmp, wxNullBitmap).
         It is equivalent to wxMenuItem::SetBitmaps(bmp, wxNullBitmap).

+
+        @onlyfor{wxmsw,wxmac,wxgtk}

     */
     virtual void SetBitmap(const wxBitmap& bmp);
 
     /**
     */
     virtual void SetBitmap(const wxBitmap& bmp);
 
     /**

-        Sets the checked/unchecked bitmaps for the menu item (Windows only).
+        Sets the checked/unchecked bitmaps for the menu item.

         The first bitmap is also used as the single bitmap for uncheckable menu items.
         The first bitmap is also used as the single bitmap for uncheckable menu items.

+
+        @onlyfor{wxmsw}

     */
     void SetBitmaps(const wxBitmap& checked,
                     const wxBitmap& unchecked = wxNullBitmap);
     */
     void SetBitmaps(const wxBitmap& checked,
                     const wxBitmap& unchecked = wxNullBitmap);


@@ -285,12 +289,12 @@ public:
     /**
         Sets the parent menu which will contain this menu item.
     */
     /**
         Sets the parent menu which will contain this menu item.
     */

-    void SetMenu(const wxMenu* menu);
+    void SetMenu(wxMenu* menu);

 
     /**
         Sets the submenu of this menu item.
     */
 
     /**
         Sets the submenu of this menu item.
     */

-    void SetSubMenu(const wxMenu* menu);
+    void SetSubMenu(wxMenu* menu);

 
     /**
         Sets the text associated with the menu item.
 
     /**
         Sets the text associated with the menu item.