Skip to content

Revert "solve compile failed in larger 3.0.0, lua-5.1 (closes #122)." #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
solemnwarning wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "solve compile failed in larger 3.0.0, lua-5.1 (closes #122)." #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions wxLua/modules/wxlua/wxlstate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2356,6 +2356,20 @@ void wxLuaState::AddLuaPath(const wxFileName& filename)
// wxLuaEvent
//-----------------------------------------------------------------------------

#if wxCHECK_VERSION(3,0,0)
wxDEFINE_EVENT(wxEVT_LUA_CREATION, wxLuaEvent);
wxDEFINE_EVENT(wxEVT_LUA_PRINT, wxLuaEvent);
wxDEFINE_EVENT(wxEVT_LUA_ERROR, wxLuaEvent);
wxDEFINE_EVENT(wxEVT_LUA_DEBUG_HOOK, wxLuaEvent);
#else
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_CREATION)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_PRINT)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_ERROR)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUG_HOOK)
//DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_INIT)
//DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUGGERATTACHED)
#endif

wxLuaEvent::wxLuaEvent(wxEventType commandType, wxWindowID id, const wxLuaState& wxlState)
:wxNotifyEvent(commandType, id), m_wxlState(wxlState),
m_debug_hook_break(false),
Expand Down
12 changes: 0 additions & 12 deletions wxLua/modules/wxlua/wxlstate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,18 +792,6 @@ class WXDLLIMPEXP_WXLUA wxLuaEvent: public wxNotifyEvent
lua_Debug *m_lua_Debug;
};

#if wxCHECK_VERSION(3,0,0)
wxDEFINE_EVENT(wxEVT_LUA_CREATION, wxLuaEvent);
wxDEFINE_EVENT(wxEVT_LUA_PRINT, wxLuaEvent);
wxDEFINE_EVENT(wxEVT_LUA_ERROR, wxLuaEvent);
wxDEFINE_EVENT(wxEVT_LUA_DEBUG_HOOK, wxLuaEvent);
#else
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_CREATION)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_PRINT)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_ERROR)
DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUG_HOOK)
#endif

#if wxCHECK_VERSION(3,0,0)
// A wxLuaState is being created, sent at the end of
// wxLuaState(wxEvtHandler, win id) or Create(wxEvtHandler, win id)
Expand Down