fixed menu titles handling after wxID_SEPARATOR change

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

diff --git a/include/wx/mac/menuitem.h b/include/wx/mac/menuitem.h
index 4c9cd9f5d4877f3793a2b0ad28bafd003659f528..16bfdd36d54102f02758efdd7704d0999a570999 100644 (file)
--- a/include/wx/mac/menuitem.h
+++ b/include/wx/mac/menuitem.h
@@ -1,81 +1,5 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        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>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef   _MENUITEM_H
-#define   _MENUITEM_H
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "menuitem.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/setup.h"
-
-// ----------------------------------------------------------------------------
-// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
-// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxMenuItem: public wxMenuItemBase
-{
-public:
-    // ctor & dtor
-    wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
-               int id = wxID_SEPARATOR,
-               const wxString& name = wxEmptyString,
-               const wxString& help = wxEmptyString,
-               wxItemKind kind = wxITEM_NORMAL,
-               wxMenu *subMenu = (wxMenu *)NULL);
-    virtual ~wxMenuItem();
-
-    // override base class virtuals
-    virtual void SetText(const wxString& strName);
-
-    virtual void Enable(bool bDoEnable = TRUE);
-    virtual void Check(bool bDoCheck = TRUE);
-
-    virtual void SetBitmap(const wxBitmap& bitmap) ;
-    virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
-
-    // update the os specific representation
-    void UpdateItemBitmap() ;
-    void UpdateItemText() ;
-    void UpdateItemStatus() ;
-
-    // mark item as belonging to the given radio group
-    void SetAsRadioGroupStart();
-    void SetRadioGroupStart(int start);
-    void SetRadioGroupEnd(int end);
-
-private:
-    void UncheckRadio() ;
-    
-    // the positions of the first and last items of the radio group this item
-    // belongs to or -1: start is the radio group start and is valid for all
-    // but first radio group items (m_isRadioGroupStart == FALSE), end is valid
-    // only for the first one
-    union
-    {
-        int start;
-        int end;
-    } m_radioGroup;
-
-    // does this item start a radio group?
-    bool m_isRadioGroupStart;
-
-    wxBitmap  m_bitmap; // Bitmap for menuitem, if any
-    void* m_menu ; // the appropriate menu , may also be a system menu
-
-    DECLARE_DYNAMIC_CLASS(wxMenuItem)
-};
-
-#endif  //_MENUITEM_H
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/menuitem.h"
+#else
+#include "wx/mac/carbon/menuitem.h"
+#endif
\ No newline at end of file