Only in wxLua-r156/apps/wxluacan: wxluacan_datatypes.lua Only in wxLua-r156/bindings/wxlua: wxlua_datatypes.lua Only in wxLua-r156/bindings/wxlua_debugger: wxluadebugger_datatypes.lua diff -rup wxLua-r156.orig/bindings/wxwidgets/wx_datatypes.lua wxLua-r156/bindings/wxwidgets/wx_datatypes.lua --- wxLua-r156.orig/bindings/wxwidgets/wx_datatypes.lua 2012-09-28 20:02:37.000000000 +0400 +++ wxLua-r156/bindings/wxwidgets/wx_datatypes.lua 2012-11-13 16:12:02.000000000 +0400 @@ -5097,6 +5097,15 @@ wx_dataTypeTable = Name = "wxWord", ValueType = "number", }, + wxWrapSizer = { + BaseClasses = { + [1] = "wxBoxSizer", + }, + Condition = "(wxLUA_USE_wxSizer) && (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0))", + IsNumber = false, + Name = "wxWrapSizer", + ValueType = "class", + }, wxXPMHandler = { BaseClasses = { [1] = "wxImageHandler", Only in wxLua-r156/bindings/wxwidgets: wxadv_datatypes.lua Only in wxLua-r156/bindings/wxwidgets: wxaui_datatypes.lua Only in wxLua-r156/bindings/wxwidgets: wxbase_datatypes.lua Only in wxLua-r156/bindings/wxwidgets: wxcore_datatypes.lua diff -rup wxLua-r156.orig/bindings/wxwidgets/wxcore_sizer.i wxLua-r156/bindings/wxwidgets/wxcore_sizer.i --- wxLua-r156.orig/bindings/wxwidgets/wxcore_sizer.i 2012-11-04 11:30:55.000000000 +0400 +++ wxLua-r156/bindings/wxwidgets/wxcore_sizer.i 2012-11-13 16:13:06.000000000 +0400 @@ -490,3 +490,25 @@ class wxIndividualLayoutConstraint : pub #endif //wxLUA_USE_wxLayoutConstraints && (!%wxchkver_2_6 ); + +// --------------------------------------------------------------------------- +// wxWrapSizer + +#if %wxchkver_2_9 + +#include "wx/wrapsizer.h" + +enum +{ + wxEXTEND_LAST_ON_EACH_LINE, + wxREMOVE_LEADING_SPACES, + wxWRAPSIZER_DEFAULT_FLAGS +}; + +class wxWrapSizer : public wxBoxSizer +{ + wxWrapSizer(int orient = wxHORIZONTAL, int flags = wxWRAPSIZER_DEFAULT_FLAGS); + bool InformFirstDirection(int direction, int size, int availableOtherDir) +}; + +#endif Only in wxLua-r156/bindings/wxwidgets: wxcore_sizer.i~ Only in wxLua-r156/bindings/wxwidgets: wxgl_datatypes.lua Only in wxLua-r156/bindings/wxwidgets: wxhtml_datatypes.lua Only in wxLua-r156/bindings/wxwidgets: wxmedia_datatypes.lua Only in wxLua-r156/bindings/wxwidgets: wxnet_datatypes.lua Only in wxLua-r156/bindings/wxwidgets: wxrichtext_datatypes.lua Only in wxLua-r156/bindings/wxwidgets: wxstc_datatypes.lua Only in wxLua-r156/bindings/wxwidgets: wxxml_datatypes.lua Only in wxLua-r156/bindings/wxwidgets: wxxrc_datatypes.lua diff -rup wxLua-r156.orig/modules/wxbind/include/wxcore_bind.h wxLua-r156/modules/wxbind/include/wxcore_bind.h --- wxLua-r156.orig/modules/wxbind/include/wxcore_bind.h 2012-09-28 20:02:37.000000000 +0400 +++ wxLua-r156/modules/wxbind/include/wxcore_bind.h 2012-11-13 16:13:15.000000000 +0400 @@ -118,6 +118,10 @@ extern WXDLLIMPEXP_BINDWXCORE wxLuaBindi #include "wx/gbsizer.h" #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) +#if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + #include "wx/wrapsizer.h" +#endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + #if (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) #include "wx/layout.h" #endif // (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) @@ -688,6 +692,10 @@ extern WXDLLIMPEXP_BINDWXCORE wxLuaBindi extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxStaticBoxSizer; #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_STATBOX) +#if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxWrapSizer; +#endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + #if (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxIndividualLayoutConstraint; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxLayoutConstraints; diff -rup wxLua-r156.orig/modules/wxbind/src/wxcore_bind.cpp wxLua-r156/modules/wxbind/src/wxcore_bind.cpp --- wxLua-r156.orig/modules/wxbind/src/wxcore_bind.cpp 2012-11-04 10:29:18.000000000 +0400 +++ wxLua-r156/modules/wxbind/src/wxcore_bind.cpp 2012-11-13 16:13:15.000000000 +0400 @@ -1013,6 +1013,10 @@ wxLuaBindNumber* wxLuaGetDefineList_wxco { "wxEXPAND", wxEXPAND }, +#if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + { "wxEXTEND_LAST_ON_EACH_LINE", wxEXTEND_LAST_ON_EACH_LINE }, +#endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + #if wxLUA_USE_wxColourPenBrush { "wxFDIAGONAL_HATCH", wxFDIAGONAL_HATCH }, #endif // wxLUA_USE_wxColourPenBrush @@ -1960,6 +1964,10 @@ wxLuaBindNumber* wxLuaGetDefineList_wxco { "wxRB_SINGLE", wxRB_SINGLE }, #endif // wxLUA_USE_wxRadioButton && wxUSE_RADIOBTN +#if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + { "wxREMOVE_LEADING_SPACES", wxREMOVE_LEADING_SPACES }, +#endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + #if wxCHECK_VERSION(2,8,8) { "wxRESERVE_SPACE_EVEN_IF_HIDDEN", wxRESERVE_SPACE_EVEN_IF_HIDDEN }, #endif // wxCHECK_VERSION(2,8,8) @@ -2473,6 +2481,11 @@ wxLuaBindNumber* wxLuaGetDefineList_wxco { "wxWINDOW_VARIANT_MINI", wxWINDOW_VARIANT_MINI }, { "wxWINDOW_VARIANT_NORMAL", wxWINDOW_VARIANT_NORMAL }, { "wxWINDOW_VARIANT_SMALL", wxWINDOW_VARIANT_SMALL }, + +#if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + { "wxWRAPSIZER_DEFAULT_FLAGS", wxWRAPSIZER_DEFAULT_FLAGS }, +#endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + { "wxWS_EX_BLOCK_EVENTS", wxWS_EX_BLOCK_EVENTS }, { "wxWS_EX_PROCESS_IDLE", wxWS_EX_PROCESS_IDLE }, { "wxWS_EX_PROCESS_UI_UPDATES", wxWS_EX_PROCESS_UI_UPDATES }, @@ -4684,6 +4697,7 @@ static const char* wxluaclassname_wxWind static const char* wxluaclassname_wxWindowDisabler = "wxWindowDisabler"; static const char* wxluaclassname_wxWindowList = "wxWindowList"; static const char* wxluaclassname_wxWindowUpdateLocker = "wxWindowUpdateLocker"; +static const char* wxluaclassname_wxWrapSizer = "wxWrapSizer"; static const char* wxluaclassname_wxXPMHandler = "wxXPMHandler"; static const char* wxluabaseclassnames_wxANIHandler[] = { wxluaclassname_wxCURHandler, NULL }; @@ -5186,6 +5200,8 @@ static const char* wxluabaseclassnames_w static wxLuaBindClass* wxluabaseclassbinds_wxWindowDestroyEvent[] = { NULL }; static const char* wxluabaseclassnames_wxWindowList[] = { wxluaclassname_wxList, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxWindowList[] = { NULL }; +static const char* wxluabaseclassnames_wxWrapSizer[] = { wxluaclassname_wxBoxSizer, NULL }; +static wxLuaBindClass* wxluabaseclassbinds_wxWrapSizer[] = { NULL }; static const char* wxluabaseclassnames_wxXPMHandler[] = { wxluaclassname_wxImageHandler, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxXPMHandler[] = { NULL }; // --------------------------------------------------------------------------- @@ -5487,6 +5503,12 @@ static wxLuaBindClass* wxluabaseclassbin extern void wxLua_wxStaticBoxSizer_delete_function(void** p); #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_STATBOX) +#if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + extern wxLuaBindMethod wxWrapSizer_methods[]; + extern int wxWrapSizer_methodCount; + extern void wxLua_wxWrapSizer_delete_function(void** p); +#endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + #if (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) extern wxLuaBindMethod wxIndividualLayoutConstraint_methods[]; extern int wxIndividualLayoutConstraint_methodCount; @@ -7417,6 +7439,10 @@ wxLuaBindClass* wxLuaGetClassList_wxcore { wxluaclassname_wxWindowUpdateLocker, wxWindowUpdateLocker_methods, wxWindowUpdateLocker_methodCount, NULL, &wxluatype_wxWindowUpdateLocker, NULL, NULL, NULL, NULL, NULL, 0, &wxLua_wxWindowUpdateLocker_delete_function, }, +#if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + { wxluaclassname_wxWrapSizer, wxWrapSizer_methods, wxWrapSizer_methodCount, CLASSINFO(wxWrapSizer), &wxluatype_wxWrapSizer, wxluabaseclassnames_wxWrapSizer, wxluabaseclassbinds_wxWrapSizer, NULL, NULL, NULL, 0, &wxLua_wxWrapSizer_delete_function, }, +#endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) + #if wxLUA_USE_wxImage && wxUSE_IMAGE { wxluaclassname_wxXPMHandler, wxXPMHandler_methods, wxXPMHandler_methodCount, CLASSINFO(wxXPMHandler), &wxluatype_wxXPMHandler, wxluabaseclassnames_wxXPMHandler, wxluabaseclassbinds_wxXPMHandler, NULL, NULL, NULL, 0, &wxLua_wxXPMHandler_delete_function, }, #endif // wxLUA_USE_wxImage && wxUSE_IMAGE diff -rup wxLua-r156.orig/modules/wxbind/src/wxcore_sizer.cpp wxLua-r156/modules/wxbind/src/wxcore_sizer.cpp --- wxLua-r156.orig/modules/wxbind/src/wxcore_sizer.cpp 2012-11-04 11:30:55.000000000 +0400 +++ wxLua-r156/modules/wxbind/src/wxcore_sizer.cpp 2012-11-13 16:13:14.000000000 +0400 @@ -5653,3 +5653,75 @@ int wxIndividualLayoutConstraint_methodC #endif // (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) + +#if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) +// --------------------------------------------------------------------------- +// Bind class wxWrapSizer +// --------------------------------------------------------------------------- + +// Lua MetaTable Tag for Class 'wxWrapSizer' +int wxluatype_wxWrapSizer = WXLUA_TUNKNOWN; + +static wxLuaArgType s_wxluatypeArray_wxLua_wxWrapSizer_InformFirstDirection[] = { &wxluatype_wxWrapSizer, &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; +static int LUACALL wxLua_wxWrapSizer_InformFirstDirection(lua_State *L); +static wxLuaBindCFunc s_wxluafunc_wxLua_wxWrapSizer_InformFirstDirection[1] = {{ wxLua_wxWrapSizer_InformFirstDirection, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxWrapSizer_InformFirstDirection }}; +// bool InformFirstDirection(int direction, int size, int availableOtherDir) +static int LUACALL wxLua_wxWrapSizer_InformFirstDirection(lua_State *L) +{ + // int availableOtherDir + int availableOtherDir = (int)wxlua_getnumbertype(L, 4); + // int size + int size = (int)wxlua_getnumbertype(L, 3); + // int direction + int direction = (int)wxlua_getnumbertype(L, 2); + // get this + wxWrapSizer * self = (wxWrapSizer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxWrapSizer); + // call InformFirstDirection + bool returns = (self->InformFirstDirection(direction, size, availableOtherDir)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; +} + +static wxLuaArgType s_wxluatypeArray_wxLua_wxWrapSizer_constructor[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL }; +static int LUACALL wxLua_wxWrapSizer_constructor(lua_State *L); +static wxLuaBindCFunc s_wxluafunc_wxLua_wxWrapSizer_constructor[1] = {{ wxLua_wxWrapSizer_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxWrapSizer_constructor }}; +// wxWrapSizer(int orient = wxHORIZONTAL, int flags = wxWRAPSIZER_DEFAULT_FLAGS); +static int LUACALL wxLua_wxWrapSizer_constructor(lua_State *L) +{ + // get number of arguments + int argCount = lua_gettop(L); + // int flags = wxWRAPSIZER_DEFAULT_FLAGS + int flags = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxWRAPSIZER_DEFAULT_FLAGS); + // int orient = wxHORIZONTAL + int orient = (argCount >= 1 ? (int)wxlua_getnumbertype(L, 1) : wxHORIZONTAL); + // call constructor + wxWrapSizer* returns = new wxWrapSizer(orient, flags); + // push the constructed class pointer + wxluaT_pushuserdatatype(L, returns, wxluatype_wxWrapSizer); + + return 1; +} + + + + +void wxLua_wxWrapSizer_delete_function(void** p) +{ + wxWrapSizer* o = (wxWrapSizer*)(*p); + delete o; +} + +// Map Lua Class Methods to C Binding Functions +wxLuaBindMethod wxWrapSizer_methods[] = { + { "InformFirstDirection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWrapSizer_InformFirstDirection, 1, NULL }, + { "wxWrapSizer", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxWrapSizer_constructor, 1, NULL }, + + { 0, 0, 0, 0 }, +}; + +int wxWrapSizer_methodCount = sizeof(wxWrapSizer_methods)/sizeof(wxLuaBindMethod) - 1; + +#endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,9,0)) +