diff --git a/wxLua/bindings/wxwidgets/wxadv_grid.i b/wxLua/bindings/wxwidgets/wxadv_grid.i index f723e097..23149037 100644 --- a/wxLua/bindings/wxwidgets/wxadv_grid.i +++ b/wxLua/bindings/wxwidgets/wxadv_grid.i @@ -453,8 +453,10 @@ class %delete wxGridStringTable : public wxGridTableBase enum wxGridTableRequest { +#if WXWIN_COMPATIBILITY_3_0 wxGRIDTABLE_REQUEST_VIEW_GET_VALUES, wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES, +#endif wxGRIDTABLE_NOTIFY_ROWS_INSERTED, wxGRIDTABLE_NOTIFY_ROWS_APPENDED, wxGRIDTABLE_NOTIFY_ROWS_DELETED, diff --git a/wxLua/bindings/wxwidgets/wxaui_aui.i b/wxLua/bindings/wxwidgets/wxaui_aui.i index e4144d8e..1baddc1d 100644 --- a/wxLua/bindings/wxwidgets/wxaui_aui.i +++ b/wxLua/bindings/wxwidgets/wxaui_aui.i @@ -370,10 +370,16 @@ class %delete wxAuiNotebookPageArray wxAuiNotebookPageArray(); wxAuiNotebookPageArray(const wxAuiNotebookPageArray& array); +#if WXWIN_COMPATIBILITY_3_0 void Add(wxAuiNotebookPage* page); + void Insert(wxAuiNotebookPage* page, int nIndex); +#endif +#if !WXWIN_COMPATIBILITY_3_0 + void Add(wxAuiNotebookPage& page); + void Insert(wxAuiNotebookPage& page, int nIndex); +#endif void Clear(); int GetCount() const; - void Insert(wxAuiNotebookPage* page, int nIndex); bool IsEmpty(); wxAuiNotebookPage Item(size_t nIndex) const; void RemoveAt(size_t nIndex); diff --git a/wxLua/bindings/wxwidgets/wxcore_gdi.i b/wxLua/bindings/wxwidgets/wxcore_gdi.i index ff4f8bdd..bcd24d61 100644 --- a/wxLua/bindings/wxwidgets/wxcore_gdi.i +++ b/wxLua/bindings/wxwidgets/wxcore_gdi.i @@ -1052,9 +1052,11 @@ class %delete wxIcon : public wxGDIObject int GetWidth(); %wxchkver_2_9_5 bool IsOk() const; %wxchkver_2_9_5 bool LoadFile(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1); +#if WXWIN_COMPATIBILITY_3_0 void SetDepth(int d); void SetHeight(int h); void SetWidth(int w); +#endif wxIcon& operator=(const wxIcon& i) const; !%wxchkver_2_9_5 bool LoadFile(const wxString& name, wxBitmapType flag); bool Ok(); // %add for compatibility with earlier versions of wxlua @@ -1149,11 +1151,13 @@ class %delete wxBitmap : public wxGDIObject %wxchkver_3_0_0 static wxBitmap NewFromPNGData(const void* data, size_t size); // %win static bool RemoveHandler(const wxString& name); // no support for wxBitmapHandler %wxchkver_3_0_0 bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette* palette = NULL) const; +#if WXWIN_COMPATIBILITY_3_0 void SetDepth(int depth); void SetHeight(int height); + void SetWidth(int width); +#endif void SetMask(%ungc wxMask* mask); %win void SetPalette(const wxPalette& palette); - void SetWidth(int width); !%wxchkver_3_0_0 bool SaveFile(const wxString& name, wxBitmapType type, wxPalette* palette = NULL); !%wxchkver_3_0_0 wxBitmap& operator=(const wxBitmap& b) const; !%wxchkver_3_1_2 wxBitmap(const wxImage &image, int depth = wxBITMAP_SCREEN_DEPTH); diff --git a/wxLua/bindings/wxwidgets/wxcore_image.i b/wxLua/bindings/wxwidgets/wxcore_image.i index 5e837a19..ec037c37 100644 --- a/wxLua/bindings/wxwidgets/wxcore_image.i +++ b/wxLua/bindings/wxwidgets/wxcore_image.i @@ -665,8 +665,11 @@ class wxArtProvider : public wxObject static wxBitmap GetBitmap(const wxString& id, const wxString& client = wxART_OTHER, const wxSize& size = wxDefaultSize); static wxIcon GetIcon(const wxString& id, const wxString& client = wxART_OTHER, const wxSize& size = wxDefaultSize); - static wxSize GetSizeHint(const wxString& client, bool platform_dependent = false); + !%wxchkver_3_1_6 static wxSize GetSizeHint(const wxString& client, bool platform_dependent = false); + %wxchkver_3_1_6 static wxSize GetSizeHint(const wxString& client, wxWindow *win = nullptr); +#if WXWIN_COMPATIBILITY_3_0 %wxchkver_3_1 static void RescaleBitmap(wxBitmap& bmp, const wxSize& sizeNeeded); +#endif }; class %delete wxLuaArtProvider : public wxArtProvider diff --git a/wxLua/modules/wxbind/src/wxadv_bind.cpp b/wxLua/modules/wxbind/src/wxadv_bind.cpp index 3fbacf9d..3a4239d5 100644 --- a/wxLua/modules/wxbind/src/wxadv_bind.cpp +++ b/wxLua/modules/wxbind/src/wxadv_bind.cpp @@ -27296,9 +27296,12 @@ wxLuaBindNumber* wxLuaGetDefineList_wxadv(size_t &count) { "wxGRIDTABLE_NOTIFY_ROWS_APPENDED", wxGRIDTABLE_NOTIFY_ROWS_APPENDED }, { "wxGRIDTABLE_NOTIFY_ROWS_DELETED", wxGRIDTABLE_NOTIFY_ROWS_DELETED }, { "wxGRIDTABLE_NOTIFY_ROWS_INSERTED", wxGRIDTABLE_NOTIFY_ROWS_INSERTED }, +#endif // wxLUA_USE_wxGrid && wxUSE_GRID + +#if (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxGrid && wxUSE_GRID) { "wxGRIDTABLE_REQUEST_VIEW_GET_VALUES", wxGRIDTABLE_REQUEST_VIEW_GET_VALUES }, { "wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES", wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES }, -#endif // wxLUA_USE_wxGrid && wxUSE_GRID +#endif // (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxGrid && wxUSE_GRID) #if (wxCHECK_VERSION(2,8,8)) && (wxLUA_USE_wxGrid && wxUSE_GRID) { "wxGRID_AUTOSIZE", wxGRID_AUTOSIZE }, diff --git a/wxLua/modules/wxbind/src/wxaui_bind.cpp b/wxLua/modules/wxbind/src/wxaui_bind.cpp index 6114df5c..6ee56ef2 100644 --- a/wxLua/modules/wxbind/src/wxaui_bind.cpp +++ b/wxLua/modules/wxbind/src/wxaui_bind.cpp @@ -4161,9 +4161,29 @@ int wxAuiNotebookPage_methodCount = sizeof(wxAuiNotebookPage_methods)/sizeof(wxL // Lua MetaTable Tag for Class 'wxAuiNotebookPageArray' int wxluatype_wxAuiNotebookPageArray = WXLUA_TUNKNOWN; +#if ((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) +static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Add1[] = { &wxluatype_wxAuiNotebookPageArray, &wxluatype_wxAuiNotebookPage, NULL }; +static int LUACALL wxLua_wxAuiNotebookPageArray_Add1(lua_State *L); +// static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_Add1[1] = {{ wxLua_wxAuiNotebookPageArray_Add1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Add1 }}; +// void Add(wxAuiNotebookPage& page); +static int LUACALL wxLua_wxAuiNotebookPageArray_Add1(lua_State *L) +{ + // wxAuiNotebookPage page + wxAuiNotebookPage * page = (wxAuiNotebookPage *)wxluaT_getuserdatatype(L, 2, wxluatype_wxAuiNotebookPage); + // get this + wxAuiNotebookPageArray * self = (wxAuiNotebookPageArray *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiNotebookPageArray); + // call Add + self->Add(*page); + + return 0; +} + +#endif // ((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + +#if ((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Add[] = { &wxluatype_wxAuiNotebookPageArray, &wxluatype_wxAuiNotebookPage, NULL }; static int LUACALL wxLua_wxAuiNotebookPageArray_Add(lua_State *L); -static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_Add[1] = {{ wxLua_wxAuiNotebookPageArray_Add, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Add }}; +// static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_Add[1] = {{ wxLua_wxAuiNotebookPageArray_Add, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Add }}; // void Add(wxAuiNotebookPage* page); static int LUACALL wxLua_wxAuiNotebookPageArray_Add(lua_State *L) { @@ -4177,6 +4197,8 @@ static int LUACALL wxLua_wxAuiNotebookPageArray_Add(lua_State *L) return 0; } +#endif // ((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Clear[] = { &wxluatype_wxAuiNotebookPageArray, NULL }; static int LUACALL wxLua_wxAuiNotebookPageArray_Clear(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_Clear[1] = {{ wxLua_wxAuiNotebookPageArray_Clear, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Clear }}; @@ -4215,9 +4237,32 @@ if ((double)(lua_Integer)returns == (double)returns) { return 1; } + +#if ((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) +static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Insert1[] = { &wxluatype_wxAuiNotebookPageArray, &wxluatype_wxAuiNotebookPage, &wxluatype_TNUMBER, NULL }; +static int LUACALL wxLua_wxAuiNotebookPageArray_Insert1(lua_State *L); +// static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_Insert1[1] = {{ wxLua_wxAuiNotebookPageArray_Insert1, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Insert1 }}; +// void Insert(wxAuiNotebookPage& page, int nIndex); +static int LUACALL wxLua_wxAuiNotebookPageArray_Insert1(lua_State *L) +{ + // int nIndex + int nIndex = (int)wxlua_getnumbertype(L, 3); + // wxAuiNotebookPage page + wxAuiNotebookPage * page = (wxAuiNotebookPage *)wxluaT_getuserdatatype(L, 2, wxluatype_wxAuiNotebookPage); + // get this + wxAuiNotebookPageArray * self = (wxAuiNotebookPageArray *)wxluaT_getuserdatatype(L, 1, wxluatype_wxAuiNotebookPageArray); + // call Insert + self->Insert(*page, nIndex); + + return 0; +} + +#endif // ((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + +#if ((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Insert[] = { &wxluatype_wxAuiNotebookPageArray, &wxluatype_wxAuiNotebookPage, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxAuiNotebookPageArray_Insert(lua_State *L); -static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_Insert[1] = {{ wxLua_wxAuiNotebookPageArray_Insert, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Insert }}; +// static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_Insert[1] = {{ wxLua_wxAuiNotebookPageArray_Insert, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Insert }}; // void Insert(wxAuiNotebookPage* page, int nIndex); static int LUACALL wxLua_wxAuiNotebookPageArray_Insert(lua_State *L) { @@ -4233,6 +4278,8 @@ static int LUACALL wxLua_wxAuiNotebookPageArray_Insert(lua_State *L) return 0; } +#endif // ((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_IsEmpty[] = { &wxluatype_wxAuiNotebookPageArray, NULL }; static int LUACALL wxLua_wxAuiNotebookPageArray_IsEmpty(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_IsEmpty[1] = {{ wxLua_wxAuiNotebookPageArray_IsEmpty, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_IsEmpty }}; @@ -4325,6 +4372,37 @@ static int LUACALL wxLua_wxAuiNotebookPageArray_constructor(lua_State *L) +#if (((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI))||(((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) +// function overload table +static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_Add_overload[] = +{ + +#if ((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + { wxLua_wxAuiNotebookPageArray_Add1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Add1 }, +#endif // ((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + +#if ((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + { wxLua_wxAuiNotebookPageArray_Add, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Add }, +#endif // ((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) +}; +static int s_wxluafunc_wxLua_wxAuiNotebookPageArray_Add_overload_count = sizeof(s_wxluafunc_wxLua_wxAuiNotebookPageArray_Add_overload)/sizeof(wxLuaBindCFunc); + +// function overload table +static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_Insert_overload[] = +{ + +#if ((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + { wxLua_wxAuiNotebookPageArray_Insert1, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Insert1 }, +#endif // ((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + +#if ((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + { wxLua_wxAuiNotebookPageArray_Insert, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiNotebookPageArray_Insert }, +#endif // ((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) +}; +static int s_wxluafunc_wxLua_wxAuiNotebookPageArray_Insert_overload_count = sizeof(s_wxluafunc_wxLua_wxAuiNotebookPageArray_Insert_overload)/sizeof(wxLuaBindCFunc); + +#endif // (((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI))||(((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiNotebookPageArray_constructor_overload[] = @@ -4344,10 +4422,17 @@ void wxLua_wxAuiNotebookPageArray_delete_function(void** p) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxAuiNotebookPageArray_methods[] = { - { "Add", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebookPageArray_Add, 1, NULL }, +#if (((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI))||(((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) + { "Add", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebookPageArray_Add_overload, s_wxluafunc_wxLua_wxAuiNotebookPageArray_Add_overload_count, 0 }, +#endif // (((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI))||(((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) + { "Clear", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebookPageArray_Clear, 1, NULL }, { "GetCount", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebookPageArray_GetCount, 1, NULL }, - { "Insert", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebookPageArray_Insert, 1, NULL }, + +#if (((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI))||(((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) + { "Insert", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebookPageArray_Insert_overload, s_wxluafunc_wxLua_wxAuiNotebookPageArray_Insert_overload_count, 0 }, +#endif // (((!WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI))||(((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) + { "IsEmpty", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebookPageArray_IsEmpty, 1, NULL }, { "Item", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebookPageArray_Item, 1, NULL }, { "RemoveAt", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebookPageArray_RemoveAt, 1, NULL }, diff --git a/wxLua/modules/wxbind/src/wxcore_gdi.cpp b/wxLua/modules/wxbind/src/wxcore_gdi.cpp index 177e9c8e..c7ddcb3f 100644 --- a/wxLua/modules/wxbind/src/wxcore_gdi.cpp +++ b/wxLua/modules/wxbind/src/wxcore_gdi.cpp @@ -10585,6 +10585,8 @@ static int LUACALL wxLua_wxIcon_Ok(lua_State *L) return 1; } + +#if (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxIcon) static wxLuaArgType s_wxluatypeArray_wxLua_wxIcon_SetDepth[] = { &wxluatype_wxIcon, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxIcon_SetDepth(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxIcon_SetDepth[1] = {{ wxLua_wxIcon_SetDepth, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxIcon_SetDepth }}; @@ -10633,6 +10635,8 @@ static int LUACALL wxLua_wxIcon_SetWidth(lua_State *L) return 0; } +#endif // (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxIcon) + static wxLuaArgType s_wxluatypeArray_wxLua_wxIcon_delete[] = { &wxluatype_wxIcon, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxIcon_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxIcon_delete }}; @@ -10804,9 +10808,13 @@ wxLuaBindMethod wxIcon_methods[] = { #endif // ((!wxCHECK_VERSION(2,9,5)) && (wxLUA_USE_wxIcon))||((wxCHECK_VERSION(2,9,5)) && (wxLUA_USE_wxIcon)) { "Ok", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxIcon_Ok, 1, NULL }, + +#if (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxIcon) { "SetDepth", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxIcon_SetDepth, 1, NULL }, { "SetHeight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxIcon_SetHeight, 1, NULL }, { "SetWidth", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxIcon_SetWidth, 1, NULL }, +#endif // (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxIcon) + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxIcon_delete, 1, NULL }, { "op_set", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxIcon_op_set, 1, NULL }, @@ -11732,6 +11740,7 @@ static int LUACALL wxLua_wxBitmap_SaveFile(lua_State *L) #endif // ((wxCHECK_VERSION(3,0,0)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) +#if (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxBitmap) static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmap_SetDepth[] = { &wxluatype_wxBitmap, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxBitmap_SetDepth(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmap_SetDepth[1] = {{ wxLua_wxBitmap_SetDepth, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBitmap_SetDepth }}; @@ -11764,6 +11773,7 @@ static int LUACALL wxLua_wxBitmap_SetHeight(lua_State *L) return 0; } +#endif // (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxBitmap) #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxMask) static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmap_SetMask[] = { &wxluatype_wxBitmap, &wxluatype_wxMask, NULL }; @@ -11804,6 +11814,7 @@ static int LUACALL wxLua_wxBitmap_SetPalette(lua_State *L) #endif // ((defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) +#if (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxBitmap) static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmap_SetWidth[] = { &wxluatype_wxBitmap, &wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxBitmap_SetWidth(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmap_SetWidth[1] = {{ wxLua_wxBitmap_SetWidth, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxBitmap_SetWidth }}; @@ -11820,6 +11831,8 @@ static int LUACALL wxLua_wxBitmap_SetWidth(lua_State *L) return 0; } +#endif // (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxBitmap) + static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmap_delete[] = { &wxluatype_wxBitmap, NULL }; static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmap_delete[1] = {{ wxlua_userdata_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatypeArray_wxLua_wxBitmap_delete }}; @@ -12356,8 +12369,10 @@ wxLuaBindMethod wxBitmap_methods[] = { { "SaveFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmap_SaveFile_overload, s_wxluafunc_wxLua_wxBitmap_SaveFile_overload_count, 0 }, #endif // (((!wxCHECK_VERSION(3,0,0)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((wxCHECK_VERSION(3,0,0)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) +#if (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxBitmap) { "SetDepth", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmap_SetDepth, 1, NULL }, { "SetHeight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmap_SetHeight, 1, NULL }, +#endif // (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxBitmap) #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxMask) { "SetMask", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmap_SetMask, 1, NULL }, @@ -12367,7 +12382,10 @@ wxLuaBindMethod wxBitmap_methods[] = { { "SetPalette", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmap_SetPalette, 1, NULL }, #endif // ((defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) +#if (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxBitmap) { "SetWidth", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBitmap_SetWidth, 1, NULL }, +#endif // (WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxBitmap) + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxBitmap_delete, 1, NULL }, #if ((!wxCHECK_VERSION(3,0,0)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxBitmap) diff --git a/wxLua/modules/wxbind/src/wxcore_image.cpp b/wxLua/modules/wxbind/src/wxcore_image.cpp index 4ae6963d..489755e3 100644 --- a/wxLua/modules/wxbind/src/wxcore_image.cpp +++ b/wxLua/modules/wxbind/src/wxcore_image.cpp @@ -5010,11 +5010,37 @@ static int LUACALL wxLua_wxArtProvider_GetIcon(lua_State *L) #endif // ((wxLUA_USE_wxArtProvider) && (wxLUA_USE_wxIcon)) && (wxLUA_USE_wxPointSizeRect) -#if (wxLUA_USE_wxArtProvider) && (wxLUA_USE_wxPointSizeRect) +#if ((wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect) +static wxLuaArgType s_wxluatypeArray_wxLua_wxArtProvider_GetSizeHint1[] = { &wxluatype_TSTRING, &wxluatype_wxWindow, NULL }; +static int LUACALL wxLua_wxArtProvider_GetSizeHint1(lua_State *L); +// static wxLuaBindCFunc s_wxluafunc_wxLua_wxArtProvider_GetSizeHint1[1] = {{ wxLua_wxArtProvider_GetSizeHint1, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatypeArray_wxLua_wxArtProvider_GetSizeHint1 }}; +// %wxchkver_3_1_6 static wxSize GetSizeHint(const wxString& client, wxWindow *win = nullptr); +static int LUACALL wxLua_wxArtProvider_GetSizeHint1(lua_State *L) +{ + // get number of arguments + int argCount = lua_gettop(L); + // wxWindow win = nullptr + wxWindow * win = (argCount >= 2 ? (wxWindow *)wxluaT_getuserdatatype(L, 2, wxluatype_wxWindow) : nullptr); + // const wxString client + const wxString client = wxlua_getwxStringtype(L, 1); + // call GetSizeHint + // allocate a new object using the copy constructor + wxSize* returns = new wxSize(wxArtProvider::GetSizeHint(client, win)); + // add the new object to the tracked memory list + wxluaO_addgcobject(L, returns, wxluatype_wxSize); + // push the result datatype + wxluaT_pushuserdatatype(L, returns, wxluatype_wxSize); + + return 1; +} + +#endif // ((wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect) + +#if ((!wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgType s_wxluatypeArray_wxLua_wxArtProvider_GetSizeHint[] = { &wxluatype_TSTRING, &wxluatype_TBOOLEAN, NULL }; static int LUACALL wxLua_wxArtProvider_GetSizeHint(lua_State *L); -static wxLuaBindCFunc s_wxluafunc_wxLua_wxArtProvider_GetSizeHint[1] = {{ wxLua_wxArtProvider_GetSizeHint, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatypeArray_wxLua_wxArtProvider_GetSizeHint }}; -// static wxSize GetSizeHint(const wxString& client, bool platform_dependent = false); +// static wxLuaBindCFunc s_wxluafunc_wxLua_wxArtProvider_GetSizeHint[1] = {{ wxLua_wxArtProvider_GetSizeHint, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatypeArray_wxLua_wxArtProvider_GetSizeHint }}; +// !%wxchkver_3_1_6 static wxSize GetSizeHint(const wxString& client, bool platform_dependent = false); static int LUACALL wxLua_wxArtProvider_GetSizeHint(lua_State *L) { // get number of arguments @@ -5034,7 +5060,7 @@ static int LUACALL wxLua_wxArtProvider_GetSizeHint(lua_State *L) return 1; } -#endif // (wxLUA_USE_wxArtProvider) && (wxLUA_USE_wxPointSizeRect) +#endif // ((!wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect) #if ((!wxCHECK_VERSION(2,9,0) || (defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider))) && (wxLUA_USE_wxArtProvider) static wxLuaArgType s_wxluatypeArray_wxLua_wxArtProvider_Insert[] = { &wxluatype_wxArtProvider, NULL }; @@ -5105,7 +5131,7 @@ static int LUACALL wxLua_wxArtProvider_Remove(lua_State *L) #endif // ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxArtProvider) -#if (((wxCHECK_VERSION(3,1,0)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPointSizeRect) +#if ((((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxArtProvider)) && (wxCHECK_VERSION(3,1,0))) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgType s_wxluatypeArray_wxLua_wxArtProvider_RescaleBitmap[] = { &wxluatype_wxBitmap, &wxluatype_wxSize, NULL }; static int LUACALL wxLua_wxArtProvider_RescaleBitmap(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxArtProvider_RescaleBitmap[1] = {{ wxLua_wxArtProvider_RescaleBitmap, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 2, 2, s_wxluatypeArray_wxLua_wxArtProvider_RescaleBitmap }}; @@ -5122,10 +5148,27 @@ static int LUACALL wxLua_wxArtProvider_RescaleBitmap(lua_State *L) return 0; } -#endif // (((wxCHECK_VERSION(3,1,0)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPointSizeRect) +#endif // ((((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxArtProvider)) && (wxCHECK_VERSION(3,1,0))) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPointSizeRect) +#if (((wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect))||(((!wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect)) +// function overload table +static wxLuaBindCFunc s_wxluafunc_wxLua_wxArtProvider_GetSizeHint_overload[] = +{ + +#if ((wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect) + { wxLua_wxArtProvider_GetSizeHint1, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatypeArray_wxLua_wxArtProvider_GetSizeHint1 }, +#endif // ((wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect) + +#if ((!wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect) + { wxLua_wxArtProvider_GetSizeHint, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatypeArray_wxLua_wxArtProvider_GetSizeHint }, +#endif // ((!wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect) +}; +static int s_wxluafunc_wxLua_wxArtProvider_GetSizeHint_overload_count = sizeof(s_wxluafunc_wxLua_wxArtProvider_GetSizeHint_overload)/sizeof(wxLuaBindCFunc); + +#endif // (((wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect))||(((!wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect)) + void wxLua_wxArtProvider_delete_function(void** p) { wxArtProvider* o = (wxArtProvider*)(*p); @@ -5146,9 +5189,9 @@ wxLuaBindMethod wxArtProvider_methods[] = { { "GetIcon", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetIcon, 1, NULL }, #endif // ((wxLUA_USE_wxArtProvider) && (wxLUA_USE_wxIcon)) && (wxLUA_USE_wxPointSizeRect) -#if (wxLUA_USE_wxArtProvider) && (wxLUA_USE_wxPointSizeRect) - { "GetSizeHint", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetSizeHint, 1, NULL }, -#endif // (wxLUA_USE_wxArtProvider) && (wxLUA_USE_wxPointSizeRect) +#if (((wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect))||(((!wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect)) + { "GetSizeHint", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_GetSizeHint_overload, s_wxluafunc_wxLua_wxArtProvider_GetSizeHint_overload_count, 0 }, +#endif // (((wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect))||(((!wxCHECK_VERSION(3,1,6)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxPointSizeRect)) #if ((!wxCHECK_VERSION(2,9,0) || (defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider))) && (wxLUA_USE_wxArtProvider) { "Insert", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_Insert, 1, NULL }, @@ -5163,9 +5206,9 @@ wxLuaBindMethod wxArtProvider_methods[] = { { "Remove", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_Remove, 1, NULL }, #endif // ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxArtProvider) -#if (((wxCHECK_VERSION(3,1,0)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPointSizeRect) +#if ((((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxArtProvider)) && (wxCHECK_VERSION(3,1,0))) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPointSizeRect) { "RescaleBitmap", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxArtProvider_RescaleBitmap, 1, NULL }, -#endif // (((wxCHECK_VERSION(3,1,0)) && (wxLUA_USE_wxArtProvider)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPointSizeRect) +#endif // ((((WXWIN_COMPATIBILITY_3_0) && (wxLUA_USE_wxArtProvider)) && (wxCHECK_VERSION(3,1,0))) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPointSizeRect) { 0, 0, 0, 0 }, };