Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/osx/menuitem.h b/include/wx/osx/menuitem.h
index 6171b124ee78699dea8dd15ba34a8a91459eb669..e4f53c86e84cb79040b17759aca2a4b463631f41 100644 (file)
--- a/include/wx/osx/menuitem.h
+++ b/include/wx/osx/menuitem.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/carbon/menuitem.h
+// Name:        wx/osx/menuitem.h

 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -29,12 +29,12 @@ class WXDLLIMPEXP_CORE wxMenuItem: public wxMenuItemBase
 {
 public:
     // ctor & dtor
 {
 public:
     // ctor & dtor

-    wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
+    wxMenuItem(wxMenu *parentMenu = NULL,

                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,
                wxItemKind kind = wxITEM_NORMAL,

-               wxMenu *subMenu = (wxMenu *)NULL);
+               wxMenu *subMenu = NULL);

     virtual ~wxMenuItem();
 
     // override base class virtuals
     virtual ~wxMenuItem();
 
     // override base class virtuals


@@ -74,8 +74,7 @@ private:
     bool m_isRadioGroupStart;
 
     wxBitmap  m_bitmap; // Bitmap for menuitem, if any
     bool m_isRadioGroupStart;
 
     wxBitmap  m_bitmap; // Bitmap for menuitem, if any

-    void* m_menu ; // the appropriate menu , may also be a system menu
-    
+

     wxMenuItemImpl* m_peer;
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
     wxMenuItemImpl* m_peer;
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)