Skip to content

Enabling wxEVT_THREAD events in wxLua #156

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
KritzelKratzel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enabling wxEVT_THREAD events in wxLua #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2da7bfd
Added wxEVT_THREAD event in wxLua
KritzelKratzel Jan 25, 2026
cb2d17f
Install missing css-file with HTML-docs
KritzelKratzel Jan 26, 2026
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
2 changes: 1 addition & 1 deletion wxLua/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ endif()
install(DIRECTORY "${wxLua_ROOT_DIR}/docs/"
DESTINATION "${WXLUA_SHARE_DIR}doc/wxLua"
FILES_MATCHING
PATTERN "*.md" PATTERN "*.html"
PATTERN "*.md" PATTERN "*.html" PATTERN "*.css"
PATTERN "CVS" EXCLUDE
PATTERN ".svn" EXCLUDE
PATTERN "doxygen" EXCLUDE)
Expand Down
8 changes: 8 additions & 0 deletions wxLua/bindings/wxwidgets/wx_datatypes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6505,6 +6505,14 @@ wx_dataTypeTable =
Name = "wxTextValidator",
ValueType = "class",
},
wxThreadEvent = {
BaseClasses = {
[1] = "wxEvent",
},
IsNumber = false,
Name = "wxThreadEvent",
ValueType = "class",
},
wxTimePickerCtrl = {
BaseClasses = {
[1] = "wxControl",
Expand Down
24 changes: 23 additions & 1 deletion wxLua/bindings/wxwidgets/wxcore_event.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class %delete wxCommandEvent : public wxEvent
bool IsSelection();
void SetClientData(voidptr_long number); // C++ is (void *clientData) You can put a number here
void SetClientObject(wxClientData* clientObject);
void SetExtraLong(int extraLong);
void SetExtraLong(long extraLong);
void SetInt(int intCommand);
void SetString(const wxString &string);
};
Expand Down Expand Up @@ -995,3 +995,25 @@ class %delete wxHelpEvent : public wxCommandEvent
void SetPosition(const wxPoint& pos);
void SetTarget(const wxString& target);
};

// ---------------------------------------------------------------------------
// wxThreadEvent

#include "wx/event.h"

class %delete wxThreadEvent : public wxEvent
{
%wxEventType wxEVT_THREAD

wxThreadEvent(wxEventType eventType = wxEVT_THREAD, int id = wxID_ANY);

// GetEventCategory() not implemented
// SetPayload() not implemented
// GetPayload() not implemented
long GetExtraLong();
int GetInt();
wxString GetString();
void SetExtraLong(long extraLong);
void SetInt(int intCommand);
void SetString(const wxString &string);
};
1 change: 1 addition & 0 deletions wxLua/modules/wxbind/include/wxcore_bind.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@ extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxSetCursorEvent;
extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxShowEvent;
extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxSizeEvent;
extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxSysColourChangedEvent;
extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxThreadEvent;
extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxUpdateUIEvent;
extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxVisualAttributes;
extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxWindow;
Expand Down
10 changes: 10 additions & 0 deletions wxLua/modules/wxbind/src/wxcore_bind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,8 @@ wxLuaBindEvent* wxLuaGetEventList_wxcore(size_t &count)
{ "wxEVT_TEXT_URL", WXLUA_GET_wxEventType_ptr(wxEVT_TEXT_URL), &wxluatype_wxTextUrlEvent },
#endif // (wxCHECK_VERSION(3,0,0)) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)

{ "wxEVT_THREAD", WXLUA_GET_wxEventType_ptr(wxEVT_THREAD), &wxluatype_wxThreadEvent },

#if wxLUA_USE_wxTimer && wxUSE_TIMER
{ "wxEVT_TIMER", WXLUA_GET_wxEventType_ptr(wxEVT_TIMER), &wxluatype_wxTimerEvent },
#endif // wxLUA_USE_wxTimer && wxUSE_TIMER
Expand Down Expand Up @@ -5575,6 +5577,7 @@ static const char* wxluaclassname_wxTextEntry = "wxTextEntry";
static const char* wxluaclassname_wxTextEntryDialog = "wxTextEntryDialog";
static const char* wxluaclassname_wxTextUrlEvent = "wxTextUrlEvent";
static const char* wxluaclassname_wxTextValidator = "wxTextValidator";
static const char* wxluaclassname_wxThreadEvent = "wxThreadEvent";
static const char* wxluaclassname_wxTimePickerCtrl = "wxTimePickerCtrl";
static const char* wxluaclassname_wxTimer = "wxTimer";
static const char* wxluaclassname_wxTimerEvent = "wxTimerEvent";
Expand Down Expand Up @@ -6125,6 +6128,8 @@ static const char* wxluabaseclassnames_wxTextUrlEvent[] = { wxluaclassname_wxCom
static wxLuaBindClass* wxluabaseclassbinds_wxTextUrlEvent[] = { NULL };
static const char* wxluabaseclassnames_wxTextValidator[] = { wxluaclassname_wxValidator, NULL };
static wxLuaBindClass* wxluabaseclassbinds_wxTextValidator[] = { NULL };
static const char* wxluabaseclassnames_wxThreadEvent[] = { wxluaclassname_wxEvent, NULL };
static wxLuaBindClass* wxluabaseclassbinds_wxThreadEvent[] = { NULL };
static const char* wxluabaseclassnames_wxTimePickerCtrl[] = { wxluaclassname_wxControl, NULL };
static wxLuaBindClass* wxluabaseclassbinds_wxTimePickerCtrl[] = { NULL };
static const char* wxluabaseclassnames_wxTimer[] = { wxluaclassname_wxEvtHandler, NULL };
Expand Down Expand Up @@ -6684,6 +6689,9 @@ extern void wxLua_wxSizeEvent_delete_function(void** p);
extern wxLuaBindMethod wxSysColourChangedEvent_methods[];
extern int wxSysColourChangedEvent_methodCount;
extern void wxLua_wxSysColourChangedEvent_delete_function(void** p);
extern wxLuaBindMethod wxThreadEvent_methods[];
extern int wxThreadEvent_methodCount;
extern void wxLua_wxThreadEvent_delete_function(void** p);
extern wxLuaBindMethod wxUpdateUIEvent_methods[];
extern int wxUpdateUIEvent_methodCount;
extern void wxLua_wxUpdateUIEvent_delete_function(void** p);
Expand Down Expand Up @@ -8685,6 +8693,8 @@ wxLuaBindClass* wxLuaGetClassList_wxcore(size_t &count)
{ wxluaclassname_wxTextValidator, wxTextValidator_methods, wxTextValidator_methodCount, CLASSINFO(wxTextValidator), &wxluatype_wxTextValidator, wxluabaseclassnames_wxTextValidator, wxluabaseclassbinds_wxTextValidator, NULL, NULL, NULL, 0, &wxLua_wxTextValidator_delete_function, },
#endif // (wxLUA_USE_wxTextValidator) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)

{ wxluaclassname_wxThreadEvent, wxThreadEvent_methods, wxThreadEvent_methodCount, CLASSINFO(wxThreadEvent), &wxluatype_wxThreadEvent, wxluabaseclassnames_wxThreadEvent, wxluabaseclassbinds_wxThreadEvent, NULL, NULL, NULL, 0, &wxLua_wxThreadEvent_delete_function, },

#if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxTimePickerCtrl && wxUSE_TIMEPICKCTRL && wxCHECK_VERSION(2,9,3))
{ wxluaclassname_wxTimePickerCtrl, wxTimePickerCtrl_methods, wxTimePickerCtrl_methodCount, CLASSINFO(wxTimePickerCtrl), &wxluatype_wxTimePickerCtrl, wxluabaseclassnames_wxTimePickerCtrl, wxluabaseclassbinds_wxTimePickerCtrl, NULL, NULL, NULL, 0, &wxLua_wxTimePickerCtrl_delete_function, },
#endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxTimePickerCtrl && wxUSE_TIMEPICKCTRL && wxCHECK_VERSION(2,9,3))
Expand Down
174 changes: 171 additions & 3 deletions wxLua/modules/wxbind/src/wxcore_event.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,11 +345,11 @@ static int LUACALL wxLua_wxCommandEvent_SetClientObject(lua_State *L)
static wxLuaArgType s_wxluatypeArray_wxLua_wxCommandEvent_SetExtraLong[] = { &wxluatype_wxCommandEvent, &wxluatype_TNUMBER, NULL };
static int LUACALL wxLua_wxCommandEvent_SetExtraLong(lua_State *L);
static wxLuaBindCFunc s_wxluafunc_wxLua_wxCommandEvent_SetExtraLong[1] = {{ wxLua_wxCommandEvent_SetExtraLong, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxCommandEvent_SetExtraLong }};
// void SetExtraLong(int extraLong);
// void SetExtraLong(long extraLong);
static int LUACALL wxLua_wxCommandEvent_SetExtraLong(lua_State *L)
{
// int extraLong
int extraLong = (int)wxlua_getnumbertype(L, 2);
// long extraLong
long extraLong = (long)wxlua_getnumbertype(L, 2);
// get this
wxCommandEvent * self = (wxCommandEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxCommandEvent);
// call SetExtraLong
Expand Down Expand Up @@ -5216,3 +5216,171 @@ wxLuaBindNumber wxHelpEvent_enums[] = {
};
int wxHelpEvent_enumCount = sizeof(wxHelpEvent_enums)/sizeof(wxLuaBindNumber) - 1;

// ---------------------------------------------------------------------------
// Bind class wxThreadEvent
// ---------------------------------------------------------------------------

// Lua MetaTable Tag for Class 'wxThreadEvent'
int wxluatype_wxThreadEvent = WXLUA_TUNKNOWN;

static wxLuaArgType s_wxluatypeArray_wxLua_wxThreadEvent_GetExtraLong[] = { &wxluatype_wxThreadEvent, NULL };
static int LUACALL wxLua_wxThreadEvent_GetExtraLong(lua_State *L);
static wxLuaBindCFunc s_wxluafunc_wxLua_wxThreadEvent_GetExtraLong[1] = {{ wxLua_wxThreadEvent_GetExtraLong, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxThreadEvent_GetExtraLong }};
// long GetExtraLong();
static int LUACALL wxLua_wxThreadEvent_GetExtraLong(lua_State *L)
{
// get this
wxThreadEvent * self = (wxThreadEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxThreadEvent);
// call GetExtraLong
long returns = (self->GetExtraLong());
// push the result number
#if LUA_VERSION_NUM >= 503
if ((double)(lua_Integer)returns == (double)returns) {
// Exactly representable as lua_Integer
lua_pushinteger(L, returns);
} else
#endif
{
lua_pushnumber(L, returns);
}

return 1;
}

static wxLuaArgType s_wxluatypeArray_wxLua_wxThreadEvent_GetInt[] = { &wxluatype_wxThreadEvent, NULL };
static int LUACALL wxLua_wxThreadEvent_GetInt(lua_State *L);
static wxLuaBindCFunc s_wxluafunc_wxLua_wxThreadEvent_GetInt[1] = {{ wxLua_wxThreadEvent_GetInt, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxThreadEvent_GetInt }};
// int GetInt();
static int LUACALL wxLua_wxThreadEvent_GetInt(lua_State *L)
{
// get this
wxThreadEvent * self = (wxThreadEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxThreadEvent);
// call GetInt
int returns = (self->GetInt());
// push the result number
#if LUA_VERSION_NUM >= 503
if ((double)(lua_Integer)returns == (double)returns) {
// Exactly representable as lua_Integer
lua_pushinteger(L, returns);
} else
#endif
{
lua_pushnumber(L, returns);
}

return 1;
}

static wxLuaArgType s_wxluatypeArray_wxLua_wxThreadEvent_GetString[] = { &wxluatype_wxThreadEvent, NULL };
static int LUACALL wxLua_wxThreadEvent_GetString(lua_State *L);
static wxLuaBindCFunc s_wxluafunc_wxLua_wxThreadEvent_GetString[1] = {{ wxLua_wxThreadEvent_GetString, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxThreadEvent_GetString }};
// wxString GetString();
static int LUACALL wxLua_wxThreadEvent_GetString(lua_State *L)
{
// get this
wxThreadEvent * self = (wxThreadEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxThreadEvent);
// call GetString
wxString returns = (self->GetString());
// push the result string
wxlua_pushwxString(L, returns);

return 1;
}

static wxLuaArgType s_wxluatypeArray_wxLua_wxThreadEvent_SetExtraLong[] = { &wxluatype_wxThreadEvent, &wxluatype_TNUMBER, NULL };
static int LUACALL wxLua_wxThreadEvent_SetExtraLong(lua_State *L);
static wxLuaBindCFunc s_wxluafunc_wxLua_wxThreadEvent_SetExtraLong[1] = {{ wxLua_wxThreadEvent_SetExtraLong, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxThreadEvent_SetExtraLong }};
// void SetExtraLong(long extraLong);
static int LUACALL wxLua_wxThreadEvent_SetExtraLong(lua_State *L)
{
// long extraLong
long extraLong = (long)wxlua_getnumbertype(L, 2);
// get this
wxThreadEvent * self = (wxThreadEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxThreadEvent);
// call SetExtraLong
self->SetExtraLong(extraLong);

return 0;
}

static wxLuaArgType s_wxluatypeArray_wxLua_wxThreadEvent_SetInt[] = { &wxluatype_wxThreadEvent, &wxluatype_TNUMBER, NULL };
static int LUACALL wxLua_wxThreadEvent_SetInt(lua_State *L);
static wxLuaBindCFunc s_wxluafunc_wxLua_wxThreadEvent_SetInt[1] = {{ wxLua_wxThreadEvent_SetInt, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxThreadEvent_SetInt }};
// void SetInt(int intCommand);
static int LUACALL wxLua_wxThreadEvent_SetInt(lua_State *L)
{
// int intCommand
int intCommand = (int)wxlua_getnumbertype(L, 2);
// get this
wxThreadEvent * self = (wxThreadEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxThreadEvent);
// call SetInt
self->SetInt(intCommand);

return 0;
}

static wxLuaArgType s_wxluatypeArray_wxLua_wxThreadEvent_SetString[] = { &wxluatype_wxThreadEvent, &wxluatype_TSTRING, NULL };
static int LUACALL wxLua_wxThreadEvent_SetString(lua_State *L);
static wxLuaBindCFunc s_wxluafunc_wxLua_wxThreadEvent_SetString[1] = {{ wxLua_wxThreadEvent_SetString, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxThreadEvent_SetString }};
// void SetString(const wxString &string);
static int LUACALL wxLua_wxThreadEvent_SetString(lua_State *L)
{
// const wxString string
const wxString string = wxlua_getwxStringtype(L, 2);
// get this
wxThreadEvent * self = (wxThreadEvent *)wxluaT_getuserdatatype(L, 1, wxluatype_wxThreadEvent);
// call SetString
self->SetString(string);

return 0;
}

static wxLuaArgType s_wxluatypeArray_wxLua_wxThreadEvent_delete[] = { &wxluatype_wxThreadEvent, NULL };
static wxLuaBindCFunc s_wxluafunc_wxLua_wxThreadEvent_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxThreadEvent_delete }};

static wxLuaArgType s_wxluatypeArray_wxLua_wxThreadEvent_constructor[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
static int LUACALL wxLua_wxThreadEvent_constructor(lua_State *L);
static wxLuaBindCFunc s_wxluafunc_wxLua_wxThreadEvent_constructor[1] = {{ wxLua_wxThreadEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxThreadEvent_constructor }};
// wxThreadEvent(wxEventType eventType = wxEVT_THREAD, int id = wxID_ANY);
static int LUACALL wxLua_wxThreadEvent_constructor(lua_State *L)
{
// get number of arguments
int argCount = lua_gettop(L);
// int id = wxID_ANY
int id = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxID_ANY);
// wxEventType eventType = wxEVT_THREAD
wxEventType eventType = (argCount >= 1 ? (wxEventType)wxlua_getnumbertype(L, 1) : wxEVT_THREAD);
// call constructor
wxThreadEvent* returns = new wxThreadEvent(eventType, id);
// add to tracked memory list
wxluaO_addgcobject(L, returns, wxluatype_wxThreadEvent);
// push the constructed class pointer
wxluaT_pushuserdatatype(L, returns, wxluatype_wxThreadEvent);

return 1;
}



void wxLua_wxThreadEvent_delete_function(void** p)
{
wxThreadEvent* o = (wxThreadEvent*)(*p);
delete o;
}

// Map Lua Class Methods to C Binding Functions
wxLuaBindMethod wxThreadEvent_methods[] = {
{ "GetExtraLong", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxThreadEvent_GetExtraLong, 1, NULL },
{ "GetInt", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxThreadEvent_GetInt, 1, NULL },
{ "GetString", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxThreadEvent_GetString, 1, NULL },
{ "SetExtraLong", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxThreadEvent_SetExtraLong, 1, NULL },
{ "SetInt", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxThreadEvent_SetInt, 1, NULL },
{ "SetString", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxThreadEvent_SetString, 1, NULL },
{ "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxThreadEvent_delete, 1, NULL },
{ "wxThreadEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxThreadEvent_constructor, 1, NULL },
{ 0, 0, 0, 0 },
};

int wxThreadEvent_methodCount = sizeof(wxThreadEvent_methods)/sizeof(wxLuaBindMethod) - 1;