Skip to content

Don't rely on implicit wxString -> wxChar* conversion for string constants. #151

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

Don't rely on implicit wxString -> wxChar* conversion for string constants. #151

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
4 changes: 2 additions & 2 deletions wxLua/bindings/genwxbind.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3585,7 +3585,7 @@ if ((double)(lua_Integer)(%s) == (double)(%s)) {
local stringBinding =
{
LuaName = luaname,
Map = " { \""..luaname.."\", "..value..", NULL },\n",
Map = " wxLuaBindString( \""..luaname.."\", "..value.."),\n",
Condition = fullcondition
}

Expand All @@ -3601,7 +3601,7 @@ if ((double)(lua_Integer)(%s) == (double)(%s)) {
local stringBinding =
{
LuaName = luaname,
Map = " { \""..luaname.."\", NULL, "..value.." },\n",
Map = " wxLuaBindString( \""..luaname.."\", "..value.."),\n",
Condition = fullcondition
}

Expand Down
4 changes: 2 additions & 2 deletions wxLua/bindings/wxlua/override.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,8 +861,8 @@ int LUACALL wxluabind_wxLuaBinding__index(lua_State* L)
lua_pushstring(L, wxlString->name);
lua_rawset(L, -3);
lua_pushstring(L, "value");
if (wxlString->wxchar_string != NULL)
lua_pushstring(L, wx2lua(wxlString->wxchar_string));
if (wxlString->wx_string != NULL)
lua_pushstring(L, wx2lua(*(wxlString->wx_string)));
else
lua_pushstring(L, wxlString->c_string);
lua_rawset(L, -3);
Expand Down
32 changes: 30 additions & 2 deletions wxLua/modules/wxlua/wxlbind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,8 +927,8 @@ void wxLuaBinding::DoRegisterBinding(const wxLuaState& wxlState) const
for (n = 0; n < m_stringCount; ++n, ++wxlString)
{
lua_pushstring(L, wxlString->name);
if (wxlString->wxchar_string != NULL)
lua_pushstring(L, wx2lua(wxlString->wxchar_string));
if (wxlString->wx_string != NULL)
lua_pushstring(L, wx2lua(*(wxlString->wx_string)));
else
lua_pushstring(L, wxlString->c_string);
lua_rawset(L, -3);
Expand Down Expand Up @@ -1439,3 +1439,31 @@ void wxLuaBinding::InitAllBindings(bool force_update)

sm_bindingArray_initialized = binding_count;
}

wxLuaBindString::wxLuaBindString(const char *name, const char *c_string):
name(name),
c_string(c_string),
wx_string(NULL) {}

wxLuaBindString::wxLuaBindString(const char *name, const wxString &wx_string):
name(name),
c_string(NULL),
wx_string(new wxString(wx_string)) {}

wxLuaBindString::wxLuaBindString(const wxLuaBindString &other):
name(other.name),
c_string(other.c_string),
wx_string(other.wx_string != NULL ? new wxString(*(other.wx_string)) : NULL) {}

wxLuaBindString::wxLuaBindString(wxLuaBindString &&other):
name(other.name),
c_string(other.c_string),
wx_string(other.wx_string)
{
other.wx_string = NULL;
}

wxLuaBindString::~wxLuaBindString()
{
delete wx_string;
}
17 changes: 14 additions & 3 deletions wxLua/modules/wxlua/wxlbind.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,20 @@ struct WXDLLIMPEXP_WXLUA wxLuaBindNumber

struct WXDLLIMPEXP_WXLUA wxLuaBindString
{
const char* name; // name
const char* c_string; // string value
const wxChar* wxchar_string; // string value
const char* name; // name
const char* c_string; // string value
wxString *wx_string;

wxLuaBindString(const char *name, const char *c_string);
wxLuaBindString(const char *name, const wxString &wx_string);

wxLuaBindString(const wxLuaBindString &other);
wxLuaBindString &operator=(const wxLuaBindString&) = delete;

wxLuaBindString(wxLuaBindString &&other);
wxLuaBindString &operator=(wxLuaBindString&&) = delete;

~wxLuaBindString();
};

// ----------------------------------------------------------------------------
Expand Down