Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation with wxUSE_ACCEL==0

Browse Source
This commit is contained in:
Artur Wieczorek
2017-07-30 10:38:06 +02:00
parent 2c2e0aaa01
commit d57672ee42
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/richtext/richtextctrl.cpp
View File

@@ -312,6 +312,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
GetBuffer().AddEventHandler(this); GetBuffer().AddEventHandler(this);
#if wxUSE_ACCEL
// Accelerators // Accelerators
wxAcceleratorEntry entries[6]; wxAcceleratorEntry entries[6];
@@ -324,6 +325,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
wxAcceleratorTable accel(6, entries); wxAcceleratorTable accel(6, entries);
SetAcceleratorTable(accel); SetAcceleratorTable(accel);
#endif // wxUSE_ACCEL
m_contextMenu = new wxMenu; m_contextMenu = new wxMenu;
m_contextMenu->Append(wxID_UNDO, _("&Undo")); m_contextMenu->Append(wxID_UNDO, _("&Undo"));

4
src/xrc/xh_menu.cpp
View File

@@ -78,7 +78,9 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
{ {
int id = GetID(); int id = GetID();
wxString label = GetText(wxT("label")); wxString label = GetText(wxT("label"));
#if wxUSE_ACCEL
wxString accel = GetText(wxT("accel"), false); wxString accel = GetText(wxT("accel"), false);
#endif // wxUSE_ACCEL
wxItemKind kind = wxITEM_NORMAL; wxItemKind kind = wxITEM_NORMAL;
if (GetBool(wxT("radio"))) if (GetBool(wxT("radio")))
@@ -99,12 +101,14 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
wxMenuItem *mitem = new wxMenuItem(p_menu, id, label, wxMenuItem *mitem = new wxMenuItem(p_menu, id, label,
GetText(wxT("help")), kind); GetText(wxT("help")), kind);
#if wxUSE_ACCEL
if (!accel.empty()) if (!accel.empty())
{ {
wxAcceleratorEntry entry; wxAcceleratorEntry entry;
if (entry.FromString(accel)) if (entry.FromString(accel))
mitem->SetAccel(&entry); mitem->SetAccel(&entry);
} }
#endif // wxUSE_ACCEL
#if !defined(__WXMSW__) || wxUSE_OWNER_DRAWN #if !defined(__WXMSW__) || wxUSE_OWNER_DRAWN
if (HasParam(wxT("bitmap"))) if (HasParam(wxT("bitmap")))