Fix compilation with wxUSE_ACCEL==0
This commit is contained in:
@@ -312,6 +312,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
|
||||
|
||||
GetBuffer().AddEventHandler(this);
|
||||
|
||||
#if wxUSE_ACCEL
|
||||
// Accelerators
|
||||
wxAcceleratorEntry entries[6];
|
||||
|
||||
@@ -324,6 +325,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
|
||||
|
||||
wxAcceleratorTable accel(6, entries);
|
||||
SetAcceleratorTable(accel);
|
||||
#endif // wxUSE_ACCEL
|
||||
|
||||
m_contextMenu = new wxMenu;
|
||||
m_contextMenu->Append(wxID_UNDO, _("&Undo"));
|
||||
|
@@ -78,7 +78,9 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
|
||||
{
|
||||
int id = GetID();
|
||||
wxString label = GetText(wxT("label"));
|
||||
#if wxUSE_ACCEL
|
||||
wxString accel = GetText(wxT("accel"), false);
|
||||
#endif // wxUSE_ACCEL
|
||||
|
||||
wxItemKind kind = wxITEM_NORMAL;
|
||||
if (GetBool(wxT("radio")))
|
||||
@@ -99,12 +101,14 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
|
||||
|
||||
wxMenuItem *mitem = new wxMenuItem(p_menu, id, label,
|
||||
GetText(wxT("help")), kind);
|
||||
#if wxUSE_ACCEL
|
||||
if (!accel.empty())
|
||||
{
|
||||
wxAcceleratorEntry entry;
|
||||
if (entry.FromString(accel))
|
||||
mitem->SetAccel(&entry);
|
||||
}
|
||||
#endif // wxUSE_ACCEL
|
||||
|
||||
#if !defined(__WXMSW__) || wxUSE_OWNER_DRAWN
|
||||
if (HasParam(wxT("bitmap")))
|
||||
|
Reference in New Issue
Block a user