///////////////////////////////////////////////////////////////////////////////
-// Name: menuitem.cpp
+// Name: src/os2/menuitem.cpp
// Purpose: wxMenuItem implementation
// Author: David Webster
// Modified by:
// headers & declarations
// ============================================================================
-#ifdef __GNUG__
- #pragma implementation "menuitem.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#include "wx/menuitem.h"
+#include "wx/stockitem.h"
+
#ifndef WX_PRECOMP
#include "wx/font.h"
#include "wx/bitmap.h"
#include "wx/settings.h"
- #include "wx/font.h"
#include "wx/window.h"
#include "wx/accel.h"
#include "wx/menu.h"
#include "wx/string.h"
+ #include "wx/log.h"
#endif
-#include "wx/menuitem.h"
-#include "wx/log.h"
-
#if wxUSE_ACCEL
#include "wx/accel.h"
#endif // wxUSE_ACCEL
#define OWNER_DRAWN_ONLY( code )
#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
-// ----------------------------------------------------------------------------
-// static function for translating menu labels
-// ----------------------------------------------------------------------------
-
-static wxString TextToLabel(
- const wxString& rsTitle
-)
-{
- wxString sTitle;
- const wxChar* zPc;
-
- if (rsTitle.IsEmpty())
- return(sTitle);
-
- for (zPc = rsTitle.c_str(); *zPc != wxT('\0'); zPc++)
- {
- if (*zPc == wxT('&'))
- {
- if (*(zPc + 1) == wxT('&'))
- {
- zPc++;
- sTitle << wxT('&');
- }
- else
- sTitle << wxT('~');
- }
- else
- {
- if ( *zPc == wxT('~'))
- {
- //
- // Tildes must be doubled to prevent them from being
- // interpreted as accelerator character prefix by PM ???
- //
- sTitle << *zPc;
- }
- sTitle << *zPc;
- }
- }
- return(sTitle);
-} // end of TextToLabel
-
// ============================================================================
// implementation
// ============================================================================
)
: wxMenuItemBase( pParentMenu
,nId
- ,TextToLabel(rsText)
+ ,wxPMTextToLabel(rsText)
,rsHelp
,eKind
,pSubMenu
)
#if wxUSE_OWNER_DRAWN
-, wxOwnerDrawn( TextToLabel(rsText)
+, wxOwnerDrawn( wxPMTextToLabel(rsText)
,eKind == wxITEM_CHECK
)
#endif // owner drawn
{
wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent"));
+ memset(&m_vMenuData, '\0', sizeof(m_vMenuData));
+ m_vMenuData.id = (USHORT)nId;
Init();
} // end of wxMenuItem::wxMenuItem
)
: wxMenuItemBase( pParentMenu
,nId
- ,TextToLabel(rsText)
+ ,wxPMTextToLabel(rsText)
,rsHelp
,bIsCheckable ? wxITEM_CHECK : wxITEM_NORMAL
,pSubMenu
)
#if wxUSE_OWNER_DRAWN
-, wxOwnerDrawn( TextToLabel(rsText)
+, wxOwnerDrawn( wxPMTextToLabel(rsText)
,bIsCheckable
)
#endif // owner drawn
// --------------
bool wxMenuItem::IsChecked() const
{
- USHORT uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu)
- ,MM_QUERYITEMATTR
- ,MPFROM2SHORT(GetId(), TRUE)
- ,MPFROMSHORT(MIA_CHECKED)
- ));
+ USHORT uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu)
+ ,MM_QUERYITEMATTR
+ ,MPFROM2SHORT(GetId(), TRUE)
+ ,MPFROMSHORT(MIA_CHECKED)
+ ));
- return (uFlag & MIA_CHECKED);
+ return (uFlag & MIA_CHECKED) == MIA_CHECKED ;
} // end of wxMenuItem::IsChecked
-wxString wxMenuItemBase::GetLabelFromText(
+wxString wxMenuItemBase::GetLabelText(
const wxString& rsText
)
{
wxString sLabel;
- for (const char* zPc = rsText.c_str(); *zPc; zPc++)
+ for (const wxChar* zPc = rsText.c_str(); *zPc; zPc++)
{
if (*zPc == wxT('~') || *zPc == wxT('&'))
{
//
// '~' is the escape character for OS/2PM and '&' is the one for
- // wxWindows - skip both of them
+ // wxWidgets - skip both of them
//
continue;
}
sLabel += *zPc;
}
return sLabel;
-} // end of wxMenuItemBase::GetLabelFromText
+} // end of wxMenuItemBase::GetLabelText
//
// Radio group stuff
//
void wxMenuItem::SetAsRadioGroupStart()
{
- m_bIsRadioGroupStart = TRUE;
+ m_bIsRadioGroupStart = true;
} // end of wxMenuItem::SetAsRadioGroupStart
void wxMenuItem::SetRadioGroupStart(
);
if (!bOk)
{
- wxLogLastError("EnableMenuItem");
+ wxLogLastError(wxT("EnableMenuItem"));
}
wxMenuItemBase::Enable(bEnable);
} // end of wxMenuItem::Enable
//
// Also uncheck all the other items in this radio group
//
- wxMenuItemList::Node* pNode = rItems.Item(nStart);
+ wxMenuItemList::compatibility_iterator node = rItems.Item(nStart);
- for (int n = nStart; n <= nEnd && pNode; n++)
+ for (int n = nStart; n <= nEnd && node; n++)
{
if (n == nPos)
{
}
if (n != nPos)
{
- pNode->GetData()->m_isChecked = FALSE;
+ node->GetData()->m_isChecked = FALSE;
::WinSendMsg( hMenu
,MM_SETITEMATTR
,MPFROM2SHORT(n, TRUE)
,MPFROM2SHORT(MIA_CHECKED, FALSE)
);
}
- pNode = pNode->GetNext();
+ node = node->GetNext();
}
}
else // check item
}
if (!bOk)
{
- wxLogLastError("CheckMenuItem");
+ wxLogLastError(wxT("CheckMenuItem"));
}
wxMenuItemBase::Check(bCheck);
} // end of wxMenuItem::Check
-void wxMenuItem::SetText(
- const wxString& rText
-)
+void wxMenuItem::SetItemLabel( const wxString& rText )
{
//
// Don't do anything if label didn't change
//
- wxString sText = TextToLabel(rText);
+ wxString sText = wxPMTextToLabel(rText);
if (m_text == sText)
return;
- wxMenuItemBase::SetText(sText);
- OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(sText));
+ // wxMenuItemBase will do stock ID checks
+ wxMenuItemBase::SetItemLabel(sText);
+
+ // m_text could now be different from 'text' if we are a stock menu item,
+ // so use only m_text below
+
+ OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(m_text));
+#if wxUSE_OWNER_DRAWN
+ if (rText.IsEmpty())
+ SetAccelString(m_text.AfterFirst(_T('\t')));
+ else
+ SetAccelString(rText.AfterFirst(_T('\t')));
+#endif // wxUSE_OWNER_DRAWN
HWND hMenu = GetHmenuOf(m_parentMenu);
m_parentMenu->UpdateAccel(this);
#endif // wxUSE_ACCEL
- USHORT uId = GetRealId();
- MENUITEM vItem;
- USHORT uFlagsOld;
+ USHORT uId = (USHORT)GetRealId();
+ MENUITEM vItem;
+ USHORT uFlagsOld;
if (!::WinSendMsg( hMenu
,MM_QUERYITEM
,(MPARAM)&vItem
))
{
- wxLogLastError("GetMenuState");
+ wxLogLastError(wxT("GetMenuState"));
}
else
{
uFlagsOld |= MIS_SUBMENU;
}
- BYTE* pData;
+ char* pData;
#if wxUSE_OWNER_DRAWN
if (IsOwnerDrawn())
{
uFlagsOld |= MIS_OWNERDRAW;
- pData = (BYTE*)this;
+ pData = (char*)this;
}
else
#endif //owner drawn
{
uFlagsOld |= MIS_TEXT;
- pData = (BYTE*)sText.c_str();
+ pData = (char*) m_text.wx_str();
}
//
,pSubMenu
);
} // end of wxMenuItemBase::New
-
projects / wxWidgets.git / blobdiff