wxMDIChildFrame::Maximize() should have default value for its argument just as wxFram...

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

diff --git a/include/wx/mac/menuitem.h b/include/wx/mac/menuitem.h
index 9011439e22c1ab2622ca2e32ce7ccb7e3b794fbc..3c3748cb29d404f27be5841e7e4099186dae9472 100644 (file)
--- a/include/wx/mac/menuitem.h
+++ b/include/wx/mac/menuitem.h
@@ -1,84 +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 license
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef   _MENUITEM_H
-#define   _MENUITEM_H
-
-#ifdef __GNUG__
-#pragma interface "menuitem.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/menuitem.h"
+#else
+#include "wx/mac/carbon/menuitem.h"
 #endif
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/setup.h"
-
-// an exception to the general rule that a normal header doesn't include other
-// headers - only because ownerdrw.h is not always included and I don't want
-// to write #ifdef's everywhere...
-#if wxUSE_OWNER_DRAWN
-#include  "wx/ownerdrw.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
-// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxMenuItem: public wxMenuItemBase
-#if wxUSE_OWNER_DRAWN
-                            , public wxOwnerDrawn
-#endif
-{
-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 wxString GetLabel() const;
-    virtual void SetCheckable(bool checkable);
-
-    virtual void Enable(bool bDoEnable = TRUE);
-    virtual void Check(bool bDoCheck = TRUE);
-    virtual bool IsChecked() const;
-
-    virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
-    virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
-
-#if wxUSE_ACCEL
-    virtual wxAcceleratorEntry *GetAccel() const;
-#endif // wxUSE_ACCEL
-
-    // unfortunately needed to resolve ambiguity between
-    // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
-    bool IsCheckable() const { return wxMenuItemBase::IsCheckable(); }
-
-    // the id for a popup menu is really its menu handle (as required by
-    // ::AppendMenu() API), so this function will return either the id or the
-    // menu handle depending on what we're
-    int GetRealId() const;
-
-    static int MacBuildMenuString(unsigned char* outMacItemText, wxInt16 *outMacShortcutChar , wxUint8 *outMacModifiers , const char *inItemName , bool useShortcuts ) ;
-
-private:
-    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