#include "wx/string.h"
#endif
-#include "wx/ownerdrw.h"
#include "wx/menuitem.h"
#include "wx/log.h"
+#if wxUSE_ACCEL
+ #include "wx/accel.h"
+#endif // wxUSE_ACCEL
+
#include "wx/os2/private.h"
// ---------------------------------------------------------------------------
-// convenience macro
+// macro
// ---------------------------------------------------------------------------
+// hide the ugly cast
#define GetHMenuOf(menu) ((HMENU)menu->GetHMenu())
+// conditional compilation
+#if wxUSE_OWNER_DRAWN
+ #define OWNER_DRAWN_ONLY( code ) if ( IsOwnerDrawn() ) code
+#else // !wxUSE_OWNER_DRAWN
+ #define OWNER_DRAWN_ONLY( code )
+#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+
// ============================================================================
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
#if !defined(USE_SHARED_LIBRARY) || !USE_SHARED_LIBRARY
-#if wxUSE_OWNER_DRAWN
- IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxObject, wxOwnerDrawn)
-#else //!USE_OWNER_DRAWN
- IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-#endif //USE_OWNER_DRAWN
-
+ #if wxUSE_OWNER_DRAWN
+ IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn)
+ #else //!USE_OWNER_DRAWN
+ IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
+ #endif //USE_OWNER_DRAWN
#endif //USE_SHARED_LIBRARY
// ----------------------------------------------------------------------------
// ctor & dtor
// -----------
-wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
- const wxString& strName, const wxString& strHelp,
+wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
+ int id,
+ const wxString& text,
+ const wxString& strHelp,
bool bCheckable,
wxMenu *pSubMenu) :
#if wxUSE_OWNER_DRAWN
- wxOwnerDrawn(strName, bCheckable),
-#else //no owner drawn support
- m_bCheckable(bCheckable),
- m_strName(strName),
-#endif //owner drawn
- m_strHelp(strHelp)
+ wxOwnerDrawn(text, bCheckable)
+#endif // owner drawn
{
wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );
ResetOwnerDrawn();
#undef SYS_COLOR
-#endif
-
- m_pParentMenu = pParentMenu;
- m_pSubMenu = pSubMenu;
- m_bEnabled = TRUE;
- m_bChecked = FALSE;
- m_idItem = id;
+#endif // wxUSE_OWNER_DRAWN
+
+ m_parentMenu = pParentMenu;
+ m_subMenu = pSubMenu;
+ m_isEnabled = TRUE;
+ m_isChecked = FALSE;
+ m_id = id;
+ m_text = text;
+ m_isCheckable = bCheckable;
+ m_help = strHelp;
}
wxMenuItem::~wxMenuItem()
// return the id for calling Win32 API functions
int wxMenuItem::GetRealId() const
{
- return m_pSubMenu ? (int)m_pSubMenu->GetHMenu() : GetId();
+ return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId();
+}
+
+// get item state
+// --------------
+
+bool wxMenuItem::IsChecked() const
+{
+/*
+ int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND);
+
+ // don't "and" with MF_ENABLED because its value is 0
+ return (flag & MF_DISABLED) == 0;
+*/
+ return FALSE;
+}
+
+wxString wxMenuItem::GetLabel() const
+{
+ return wxStripMenuCodes(m_text);
}
-// delete the sub menu
-// -------------------
-void wxMenuItem::DeleteSubMenu()
+// accelerators
+// ------------
+
+#if wxUSE_ACCEL
+
+wxAcceleratorEntry *wxMenuItem::GetAccel() const
{
- delete m_pSubMenu;
- m_pSubMenu = NULL;
+ return wxGetAccelFromString(GetText());
}
+#endif // wxUSE_ACCEL
+
// change item state
// -----------------
-void wxMenuItem::Enable(bool bDoEnable)
+void wxMenuItem::Enable(bool enable)
{
- // TODO:
+ if ( m_isEnabled == enable )
+ return;
/*
- if ( m_bEnabled != bDoEnable ) {
- long rc = EnableMenuItem(GetHMenuOf(m_pParentMenu),
- GetRealId(),
- MF_BYCOMMAND |
- (bDoEnable ? MF_ENABLED : MF_GRAYED));
-
- if ( rc == -1 ) {
- wxLogLastError("EnableMenuItem");
- }
+ long rc = EnableMenuItem(GetHMenuOf(m_parentMenu),
+ GetRealId(),
+ MF_BYCOMMAND |
+ (enable ? MF_ENABLED : MF_GRAYED));
- m_bEnabled = bDoEnable;
+ if ( rc == -1 ) {
+ wxLogLastError("EnableMenuItem");
}
*/
+ wxMenuItemBase::Enable(enable);
}
-void wxMenuItem::Check(bool bDoCheck)
+void wxMenuItem::Check(bool check)
{
- wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") );
+ wxCHECK_RET( m_isCheckable, wxT("only checkable items may be checked") );
- // TODO:
+ if ( m_isChecked == check )
+ return;
/*
- if ( m_bChecked != bDoCheck ) {
- long rc = CheckMenuItem(GetHMenuOf(m_pParentMenu),
- GetId(),
- MF_BYCOMMAND |
- (bDoCheck ? MF_CHECKED : MF_UNCHECKED));
-
- if ( rc == -1 ) {
- wxLogLastError("CheckMenuItem");
- }
+ long rc = CheckMenuItem(GetHMenuOf(m_parentMenu),
+ GetRealId(),
+ MF_BYCOMMAND |
+ (check ? MF_CHECKED : MF_UNCHECKED));
- m_bChecked = bDoCheck;
+ if ( rc == -1 ) {
+ wxLogLastError("CheckMenuItem");
}
*/
+ wxMenuItemBase::Check(check);
}
-void wxMenuItem::SetName(const wxString& strName)
+void wxMenuItem::SetText(const wxString& text)
{
// don't do anything if label didn't change
- if ( m_strName == strName )
+ if ( m_text == text )
return;
- m_strName = strName;
+ wxMenuItemBase::SetText(text);
+ OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) );
+/*
+ HMENU hMenu = GetHMenuOf(m_parentMenu);
+ wxCHECK_RET( hMenu, wxT("menuitem without menu") );
- HMENU hMenu = GetHMenuOf(m_pParentMenu);
+#if wxUSE_ACCEL
+ m_parentMenu->UpdateAccel(this);
+#endif // wxUSE_ACCEL
UINT id = GetRealId();
-
- // TODO:
-/*
UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
if ( flagsOld == 0xFFFFFFFF )
{
}
LPCTSTR data;
+
#if wxUSE_OWNER_DRAWN
if ( IsOwnerDrawn() )
{
#endif //owner drawn
{
flagsOld |= MF_STRING;
- data = strName;
+ data = (char*) text.c_str();
}
if ( ::ModifyMenu(hMenu, id,
MF_BYCOMMAND | flagsOld,
- id, data) == 0xFFFFFFFF )
+ id, data) == (int)0xFFFFFFFF )
{
wxLogLastError(wxT("ModifyMenu"));
}
*/
}
+void wxMenuItem::SetCheckable(bool checkable)
+{
+ wxMenuItemBase::SetCheckable(checkable);
+ OWNER_DRAWN_ONLY( wxOwnerDrawn::SetCheckable(checkable) );
+}
+
+// ----------------------------------------------------------------------------
+// wxMenuItemBase
+// ----------------------------------------------------------------------------
+
+wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
+ int id,
+ const wxString& name,
+ const wxString& help,
+ bool isCheckable,
+ wxMenu *subMenu)
+{
+ return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+}
projects / wxWidgets.git / blobdiff