Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.35, 1.36 clipdrag.cpp, 1.31, 1.32 controls.cpp, 1.43, 1.44 file.cpp, 1.32, 1.33 gdi.cpp, 1.49, 1.50 image.cpp, 1.27, 1.28 print.cpp, 1.28, 1.29 wave.cpp, 1.27, 1.28 windows.cpp, 1.40, 1.41 wx_bind.cpp, 1.79, 1.80
|
From: John L. <jr...@us...> - 2007-03-02 05:44:33
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18504/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp controls.cpp file.cpp gdi.cpp image.cpp print.cpp wave.cpp windows.cpp wx_bind.cpp Log Message: update more bindings to 2.8 using header files Index: print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** print.cpp 26 Feb 2007 01:57:04 -0000 1.28 --- print.cpp 2 Mar 2007 05:44:28 -0000 1.29 *************** *** 597,600 **** --- 597,664 ---- + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) + // %wxchkver_2_8 int GetMedia() const + static int LUACALL wxLua_wxPrintData_GetMedia(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // get this + wxPrintData * self = (wxPrintData *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintData); + // call GetMedia + returns = self->GetMedia(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // %wxchkver_2_8 bool IsOrientationReversed() const + static int LUACALL wxLua_wxPrintData_IsOrientationReversed(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxPrintData * self = (wxPrintData *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintData); + // call IsOrientationReversed + returns = self->IsOrientationReversed(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintData_SetOrientationReversed[] = { &s_wxluaarg_Boolean, 0 }; + // %wxchkver_2_8 void SetOrientationReversed(bool reversed) + static int LUACALL wxLua_wxPrintData_SetOrientationReversed(lua_State *L) + { + wxLuaState wxlState(L); + // bool reversed + bool reversed = wxlState.GetBooleanType(2); + // get this + wxPrintData * self = (wxPrintData *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintData); + // call SetOrientationReversed + self->SetOrientationReversed(reversed); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintData_SetMedia[] = { &s_wxluaarg_Number, 0 }; + // %wxchkver_2_8 void SetMedia(int media) + static int LUACALL wxLua_wxPrintData_SetMedia(lua_State *L) + { + wxLuaState wxlState(L); + // int media + int media = (int)wxlState.GetNumberType(2); + // get this + wxPrintData * self = (wxPrintData *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintData); + // call SetMedia + self->SetMedia(media); + + return 0; + } + + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) // wxSize GetPaperSize() const *************** *** 1049,1052 **** --- 1113,1124 ---- + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) + { LuaMethod, "GetMedia", wxLua_wxPrintData_GetMedia, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "IsOrientationReversed", wxLua_wxPrintData_IsOrientationReversed, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "SetOrientationReversed", wxLua_wxPrintData_SetOrientationReversed, 1, 1, s_wxluatagArray_wxLua_wxPrintData_SetOrientationReversed }, + { LuaMethod, "SetMedia", wxLua_wxPrintData_SetMedia, 1, 1, s_wxluatagArray_wxLua_wxPrintData_SetMedia }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) { LuaMethod, "GetPaperSize", wxLua_wxPrintData_GetPaperSize, 0, 0, s_wxluaargArray_None }, Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** controls.cpp 26 Feb 2007 01:57:01 -0000 1.43 --- controls.cpp 2 Mar 2007 05:44:24 -0000 1.44 *************** *** 403,406 **** --- 403,443 ---- #endif // ((wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON)) && (wxLUA_USE_wxBitmap) + + #if (wxLUA_USE_wxBitmap) && ((wxCHECK_VERSION(2,8,0)) && ((wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON))) + // %wxchkver_2_8 wxBitmap GetBitmapHover() const + static int LUACALL wxLua_wxBitmapButton_GetBitmapHover(lua_State *L) + { + wxLuaState wxlState(L); + wxBitmap *returns; + // get this + wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); + // call GetBitmapHover + // allocate a new object using the copy constructor + returns = new wxBitmap(self->GetBitmapHover()); + // add the new object to the tracked memory list + wxLua_AddTrackedObject(wxlState, (wxBitmap *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxBitmapButton_SetBitmapHover[] = { &s_wxluatag_wxBitmap, 0 }; + // %wxchkver_2_8 void SetBitmapHover(const wxBitmap& hover) + static int LUACALL wxLua_wxBitmapButton_SetBitmapHover(lua_State *L) + { + wxLuaState wxlState(L); + // const wxBitmap hover + const wxBitmap * hover = (const wxBitmap *)wxlState.GetUserDataType(2, s_wxluatag_wxBitmap); + // get this + wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); + // call SetBitmapHover + self->SetBitmapHover(*hover); + + return 0; + } + + #endif // (wxLUA_USE_wxBitmap) && ((wxCHECK_VERSION(2,8,0)) && ((wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON))) + // %constructor wxBitmapButtonDefault() static int LUACALL wxLua_wxBitmapButtonDefault_constructor(lua_State *L) *************** *** 454,457 **** --- 491,500 ---- #endif // ((wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON)) && (wxLUA_USE_wxBitmap) + + #if (wxLUA_USE_wxBitmap) && ((wxCHECK_VERSION(2,8,0)) && ((wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON))) + { LuaMethod, "GetBitmapHover", wxLua_wxBitmapButton_GetBitmapHover, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "SetBitmapHover", wxLua_wxBitmapButton_SetBitmapHover, 1, 1, s_wxluatagArray_wxLua_wxBitmapButton_SetBitmapHover }, + #endif // (wxLUA_USE_wxBitmap) && ((wxCHECK_VERSION(2,8,0)) && ((wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON))) + { LuaConstructor, "wxBitmapButtonDefault", wxLua_wxBitmapButtonDefault_constructor, 0, 0, s_wxluaargArray_None }, { LuaDelete, "wxBitmapButton", wxLua_wxBitmapButton_destructor, 0, 0, s_wxluaargArray_None }, Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** file.cpp 26 Feb 2007 01:57:02 -0000 1.32 --- file.cpp 2 Mar 2007 05:44:24 -0000 1.33 *************** *** 2977,2978 **** --- 2977,3284 ---- #endif // wxUSE_STREAMS + + #if wxUSE_STREAMS + // --------------------------------------------------------------------------- + // Bind class wxDataInputStream + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxDataInputStream' + int s_wxluatag_wxDataInputStream = -1; + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDataInputStream_constructor[] = { &s_wxluatag_wxInputStream, 0 }; + // wxDataInputStream(wxInputStream& s) + static int LUACALL wxLua_wxDataInputStream_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxDataInputStream *returns; + // wxInputStream s + wxInputStream * s = (wxInputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxInputStream); + // call constructor + returns = new wxDataInputStream(*s); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxDataInputStream, returns); + + return 1; + } + + // bool IsOk() + static int LUACALL wxLua_wxDataInputStream_IsOk(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxDataInputStream * self = (wxDataInputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataInputStream); + // call IsOk + returns = self->IsOk(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // wxUint32 Read32() + static int LUACALL wxLua_wxDataInputStream_Read32(lua_State *L) + { + wxLuaState wxlState(L); + wxUint32 returns; + // get this + wxDataInputStream * self = (wxDataInputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataInputStream); + // call Read32 + returns = self->Read32(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // wxUint16 Read16() + static int LUACALL wxLua_wxDataInputStream_Read16(lua_State *L) + { + wxLuaState wxlState(L); + wxUint16 returns; + // get this + wxDataInputStream * self = (wxDataInputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataInputStream); + // call Read16 + returns = self->Read16(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // wxUint8 Read8() + static int LUACALL wxLua_wxDataInputStream_Read8(lua_State *L) + { + wxLuaState wxlState(L); + wxUint8 returns; + // get this + wxDataInputStream * self = (wxDataInputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataInputStream); + // call Read8 + returns = self->Read8(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // double ReadDouble() + static int LUACALL wxLua_wxDataInputStream_ReadDouble(lua_State *L) + { + wxLuaState wxlState(L); + double returns; + // get this + wxDataInputStream * self = (wxDataInputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataInputStream); + // call ReadDouble + returns = self->ReadDouble(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // wxString ReadString() + static int LUACALL wxLua_wxDataInputStream_ReadString(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxDataInputStream * self = (wxDataInputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataInputStream); + // call ReadString + returns = self->ReadString(); + // push the result string + wxlState.lua_PushString(returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDataInputStream_BigEndianOrdered[] = { &s_wxluaarg_Boolean, 0 }; + // void BigEndianOrdered(bool be_order) + static int LUACALL wxLua_wxDataInputStream_BigEndianOrdered(lua_State *L) + { + wxLuaState wxlState(L); + // bool be_order + bool be_order = wxlState.GetBooleanType(2); + // get this + wxDataInputStream * self = (wxDataInputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataInputStream); + // call BigEndianOrdered + self->BigEndianOrdered(be_order); + + return 0; + } + + static int LUACALL wxLua_wxDataInputStream_destructor(lua_State *) + { + return 0; + } + + + + // Map Lua Class Methods to C Binding Functions + WXLUAMETHOD wxDataInputStream_methods[] = { + { LuaConstructor, "wxDataInputStream", wxLua_wxDataInputStream_constructor, 1, 1, s_wxluatagArray_wxLua_wxDataInputStream_constructor }, + { LuaMethod, "IsOk", wxLua_wxDataInputStream_IsOk, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "Read32", wxLua_wxDataInputStream_Read32, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "Read16", wxLua_wxDataInputStream_Read16, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "Read8", wxLua_wxDataInputStream_Read8, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "ReadDouble", wxLua_wxDataInputStream_ReadDouble, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "ReadString", wxLua_wxDataInputStream_ReadString, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "BigEndianOrdered", wxLua_wxDataInputStream_BigEndianOrdered, 1, 1, s_wxluatagArray_wxLua_wxDataInputStream_BigEndianOrdered }, + { LuaDelete, "wxDataInputStream", wxLua_wxDataInputStream_destructor, 0, 0, s_wxluaargArray_None }, + }; + + int wxDataInputStream_methodCount = sizeof(wxDataInputStream_methods)/sizeof(wxDataInputStream_methods[0]); + #endif // wxUSE_STREAMS + + + #if wxUSE_STREAMS + // --------------------------------------------------------------------------- + // Bind class wxDataOutputStream + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxDataOutputStream' + int s_wxluatag_wxDataOutputStream = -1; + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDataOutputStream_constructor[] = { &s_wxluatag_wxOutputStream, 0 }; + // wxDataOutputStream(wxOutputStream& s); + static int LUACALL wxLua_wxDataOutputStream_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxDataOutputStream *returns; + // wxOutputStream s + wxOutputStream * s = (wxOutputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxOutputStream); + // call constructor + returns = new wxDataOutputStream(*s); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxDataOutputStream, returns); + + return 1; + } + + // bool IsOk() + static int LUACALL wxLua_wxDataOutputStream_IsOk(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxDataOutputStream * self = (wxDataOutputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataOutputStream); + // call IsOk + returns = self->IsOk(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDataOutputStream_Write32[] = { &s_wxluaarg_Number, 0 }; + // void Write32(wxUint32 i) + static int LUACALL wxLua_wxDataOutputStream_Write32(lua_State *L) + { + wxLuaState wxlState(L); + // wxUint32 i + wxUint32 i = (wxUint32)wxlState.GetNumberType(2); + // get this + wxDataOutputStream * self = (wxDataOutputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataOutputStream); + // call Write32 + self->Write32(i); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDataOutputStream_Write16[] = { &s_wxluaarg_Number, 0 }; + // void Write16(wxUint16 i) + static int LUACALL wxLua_wxDataOutputStream_Write16(lua_State *L) + { + wxLuaState wxlState(L); + // wxUint16 i + wxUint16 i = (wxUint16)wxlState.GetNumberType(2); + // get this + wxDataOutputStream * self = (wxDataOutputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataOutputStream); + // call Write16 + self->Write16(i); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDataOutputStream_Write8[] = { &s_wxluaarg_Number, 0 }; + // void Write8(wxUint8 i) + static int LUACALL wxLua_wxDataOutputStream_Write8(lua_State *L) + { + wxLuaState wxlState(L); + // wxUint8 i + wxUint8 i = (wxUint8)wxlState.GetNumberType(2); + // get this + wxDataOutputStream * self = (wxDataOutputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataOutputStream); + // call Write8 + self->Write8(i); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDataOutputStream_WriteDouble[] = { &s_wxluaarg_Number, 0 }; + // void WriteDouble(double d) + static int LUACALL wxLua_wxDataOutputStream_WriteDouble(lua_State *L) + { + wxLuaState wxlState(L); + // double d + double d = (double)wxlState.GetNumberType(2); + // get this + wxDataOutputStream * self = (wxDataOutputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataOutputStream); + // call WriteDouble + self->WriteDouble(d); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDataOutputStream_WriteString[] = { &s_wxluaarg_String, 0 }; + // void WriteString(const wxString& string) + static int LUACALL wxLua_wxDataOutputStream_WriteString(lua_State *L) + { + wxLuaState wxlState(L); + // const wxString string + const wxString string = wxlState.GetwxStringType(2); + // get this + wxDataOutputStream * self = (wxDataOutputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataOutputStream); + // call WriteString + self->WriteString(string); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDataOutputStream_BigEndianOrdered[] = { &s_wxluaarg_Boolean, 0 }; + // void BigEndianOrdered(bool be_order) + static int LUACALL wxLua_wxDataOutputStream_BigEndianOrdered(lua_State *L) + { + wxLuaState wxlState(L); + // bool be_order + bool be_order = wxlState.GetBooleanType(2); + // get this + wxDataOutputStream * self = (wxDataOutputStream *)wxlState.GetUserDataType(1, s_wxluatag_wxDataOutputStream); + // call BigEndianOrdered + self->BigEndianOrdered(be_order); + + return 0; + } + + static int LUACALL wxLua_wxDataOutputStream_destructor(lua_State *) + { + return 0; + } + + + + // Map Lua Class Methods to C Binding Functions + WXLUAMETHOD wxDataOutputStream_methods[] = { + { LuaConstructor, "wxDataOutputStream", wxLua_wxDataOutputStream_constructor, 1, 1, s_wxluatagArray_wxLua_wxDataOutputStream_constructor }, + { LuaMethod, "IsOk", wxLua_wxDataOutputStream_IsOk, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "Write32", wxLua_wxDataOutputStream_Write32, 1, 1, s_wxluatagArray_wxLua_wxDataOutputStream_Write32 }, + { LuaMethod, "Write16", wxLua_wxDataOutputStream_Write16, 1, 1, s_wxluatagArray_wxLua_wxDataOutputStream_Write16 }, + { LuaMethod, "Write8", wxLua_wxDataOutputStream_Write8, 1, 1, s_wxluatagArray_wxLua_wxDataOutputStream_Write8 }, + { LuaMethod, "WriteDouble", wxLua_wxDataOutputStream_WriteDouble, 1, 1, s_wxluatagArray_wxLua_wxDataOutputStream_WriteDouble }, + { LuaMethod, "WriteString", wxLua_wxDataOutputStream_WriteString, 1, 1, s_wxluatagArray_wxLua_wxDataOutputStream_WriteString }, + { LuaMethod, "BigEndianOrdered", wxLua_wxDataOutputStream_BigEndianOrdered, 1, 1, s_wxluatagArray_wxLua_wxDataOutputStream_BigEndianOrdered }, + { LuaDelete, "wxDataOutputStream", wxLua_wxDataOutputStream_destructor, 0, 0, s_wxluaargArray_None }, + }; + + int wxDataOutputStream_methodCount = sizeof(wxDataOutputStream_methods)/sizeof(wxDataOutputStream_methods[0]); + #endif // wxUSE_STREAMS + Index: clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/clipdrag.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** clipdrag.cpp 26 Feb 2007 01:57:01 -0000 1.31 --- clipdrag.cpp 2 Mar 2007 05:44:24 -0000 1.32 *************** *** 784,787 **** --- 784,809 ---- int s_wxluatag_wxDataObjectComposite = -1; + + #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) + // %wxchkver_2_8 wxDataFormat GetReceivedFormat() const + static int LUACALL wxLua_wxDataObjectComposite_GetReceivedFormat(lua_State *L) + { + wxLuaState wxlState(L); + wxDataFormat *returns; + // get this + wxDataObjectComposite * self = (wxDataObjectComposite *)wxlState.GetUserDataType(1, s_wxluatag_wxDataObjectComposite); + // call GetReceivedFormat + // allocate a new object using the copy constructor + returns = new wxDataFormat(self->GetReceivedFormat()); + // add the new object to the tracked memory list + wxLua_AddTrackedObject(wxlState, (wxDataFormat *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxDataFormat, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) + // wxDataObjectComposite() static int LUACALL wxLua_wxDataObjectComposite_constructor(lua_State *L) *************** *** 847,850 **** --- 869,877 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDataObjectComposite_methods[] = { + + #if (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) + { LuaMethod, "GetReceivedFormat", wxLua_wxDataObjectComposite_GetReceivedFormat, 0, 0, s_wxluaargArray_None }, + #endif // (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)) + { LuaConstructor, "wxDataObjectComposite", wxLua_wxDataObjectComposite_constructor, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Add", wxLua_wxDataObjectComposite_Add, 2, 1, s_wxluatagArray_wxLua_wxDataObjectComposite_Add }, Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** appframe.cpp 26 Feb 2007 01:57:01 -0000 1.35 --- appframe.cpp 2 Mar 2007 05:44:24 -0000 1.36 *************** *** 1922,1925 **** --- 1922,1977 ---- int s_wxluatag_wxAcceleratorEntry = -1; + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) + // bool IsOk() const + static int LUACALL wxLua_wxAcceleratorEntry_IsOk(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxAcceleratorEntry * self = (wxAcceleratorEntry *)wxlState.GetUserDataType(1, s_wxluatag_wxAcceleratorEntry); + // call IsOk + returns = self->IsOk(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // wxString ToString() const + static int LUACALL wxLua_wxAcceleratorEntry_ToString(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxAcceleratorEntry * self = (wxAcceleratorEntry *)wxlState.GetUserDataType(1, s_wxluatag_wxAcceleratorEntry); + // call ToString + returns = self->ToString(); + // push the result string + wxlState.lua_PushString(returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxAcceleratorEntry_FromString[] = { &s_wxluaarg_String, 0 }; + // bool FromString(const wxString& str) + static int LUACALL wxLua_wxAcceleratorEntry_FromString(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // const wxString str + const wxString str = wxlState.GetwxStringType(2); + // get this + wxAcceleratorEntry * self = (wxAcceleratorEntry *)wxlState.GetUserDataType(1, s_wxluatag_wxAcceleratorEntry); + // call FromString + returns = self->FromString(str); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) + static wxLuaArgTag s_wxluatagArray_wxLua_wxAcceleratorEntry_constructor1[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; // %overload wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0) *************** *** 2077,2080 **** --- 2129,2139 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxAcceleratorEntry_methods[] = { + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) + { LuaMethod, "IsOk", wxLua_wxAcceleratorEntry_IsOk, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "ToString", wxLua_wxAcceleratorEntry_ToString, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "FromString", wxLua_wxAcceleratorEntry_FromString, 1, 1, s_wxluatagArray_wxLua_wxAcceleratorEntry_FromString }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) + { LuaConstructor, "wxAcceleratorEntry", wxLua_wxAcceleratorEntry_constructor, 3, 0, s_wxluatagArray_wxLua_wxAcceleratorEntry_constructor1 }, { LuaConstructor, "wxAcceleratorEntryCopy", wxLua_wxAcceleratorEntryCopy_constructor, 1, 1, s_wxluatagArray_wxLua_wxAcceleratorEntryCopy_constructor }, Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** windows.cpp 26 Feb 2007 01:57:04 -0000 1.40 --- windows.cpp 2 Mar 2007 05:44:28 -0000 1.41 *************** *** 4157,4160 **** --- 4157,4179 ---- + #if wxCHECK_VERSION(2,8,0) + // %wxchkver_2_8 wxString GetLabelText() const + static int LUACALL wxLua_wxControl_GetLabelText(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxControl * self = (wxControl *)wxlState.GetUserDataType(1, s_wxluatag_wxControl); + // call GetLabelText + returns = self->GetLabelText(); + // push the result string + wxlState.lua_PushString(returns); + + return 1; + } + + #endif // wxCHECK_VERSION(2,8,0) + + // Map Lua Class Methods to C Binding Functions *************** *** 4177,4180 **** --- 4196,4204 ---- { LuaMethod, "Command", wxLua_wxControl_Command, 1, 1, s_wxluatagArray_wxLua_wxControl_Command }, { LuaDelete, "wxControl", wxLua_wxControl_destructor, 0, 0, s_wxluaargArray_None }, + + #if wxCHECK_VERSION(2,8,0) + { LuaMethod, "GetLabelText", wxLua_wxControl_GetLabelText, 0, 0, s_wxluaargArray_None }, + #endif // wxCHECK_VERSION(2,8,0) + }; *************** *** 4191,4194 **** --- 4215,4346 ---- + #if ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL)) && (wxLUA_USE_wxSizer) + // wxSizer* GetControlSizer() const + static int LUACALL wxLua_wxBookCtrlBase_GetControlSizer(lua_State *L) + { + wxLuaState wxlState(L); + wxSizer *returns; + // get this + wxBookCtrlBase * self = (wxBookCtrlBase *)wxlState.GetUserDataType(1, s_wxluatag_wxBookCtrlBase); + // call GetControlSizer + returns = self->GetControlSizer(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxSizer, returns); + + return 1; + } + + #endif // ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL)) && (wxLUA_USE_wxSizer) + + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) + // unsigned int GetInternalBorder() const + static int LUACALL wxLua_wxBookCtrlBase_GetInternalBorder(lua_State *L) + { + wxLuaState wxlState(L); + unsigned int returns; + // get this + wxBookCtrlBase * self = (wxBookCtrlBase *)wxlState.GetUserDataType(1, s_wxluatag_wxBookCtrlBase); + // call GetInternalBorder + returns = self->GetInternalBorder(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBase_SetInternalBorder[] = { &s_wxluaarg_Number, 0 }; + // void SetInternalBorder(unsigned int border) + static int LUACALL wxLua_wxBookCtrlBase_SetInternalBorder(lua_State *L) + { + wxLuaState wxlState(L); + // unsigned int border + unsigned int border = (int)wxlState.GetNumberType(2); + // get this + wxBookCtrlBase * self = (wxBookCtrlBase *)wxlState.GetUserDataType(1, s_wxluatag_wxBookCtrlBase); + // call SetInternalBorder + self->SetInternalBorder(border); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBase_SetControlMargin[] = { &s_wxluaarg_Number, 0 }; + // void SetControlMargin(int margin) + static int LUACALL wxLua_wxBookCtrlBase_SetControlMargin(lua_State *L) + { + wxLuaState wxlState(L); + // int margin + int margin = (int)wxlState.GetNumberType(2); + // get this + wxBookCtrlBase * self = (wxBookCtrlBase *)wxlState.GetUserDataType(1, s_wxluatag_wxBookCtrlBase); + // call SetControlMargin + self->SetControlMargin(margin); + + return 0; + } + + // int GetControlMargin() const + static int LUACALL wxLua_wxBookCtrlBase_GetControlMargin(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // get this + wxBookCtrlBase * self = (wxBookCtrlBase *)wxlState.GetUserDataType(1, s_wxluatag_wxBookCtrlBase); + // call GetControlMargin + returns = self->GetControlMargin(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // bool IsVertical() const + static int LUACALL wxLua_wxBookCtrlBase_IsVertical(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxBookCtrlBase * self = (wxBookCtrlBase *)wxlState.GetUserDataType(1, s_wxluatag_wxBookCtrlBase); + // call IsVertical + returns = self->IsVertical(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBase_SetFitToCurrentPage[] = { &s_wxluaarg_Boolean, 0 }; + // void SetFitToCurrentPage(bool fit) + static int LUACALL wxLua_wxBookCtrlBase_SetFitToCurrentPage(lua_State *L) + { + wxLuaState wxlState(L); + // bool fit + bool fit = wxlState.GetBooleanType(2); + // get this + wxBookCtrlBase * self = (wxBookCtrlBase *)wxlState.GetUserDataType(1, s_wxluatag_wxBookCtrlBase); + // call SetFitToCurrentPage + self->SetFitToCurrentPage(fit); + + return 0; + } + + // bool GetFitToCurrentPage() const + static int LUACALL wxLua_wxBookCtrlBase_GetFitToCurrentPage(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxBookCtrlBase * self = (wxBookCtrlBase *)wxlState.GetUserDataType(1, s_wxluatag_wxBookCtrlBase); + // call GetFitToCurrentPage + returns = self->GetFitToCurrentPage(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) + + #if (wxLUA_USE_wxImageList) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) // wxImageList* GetImageList() const *************** *** 4553,4556 **** --- 4705,4724 ---- WXLUAMETHOD wxBookCtrlBase_methods[] = { + #if ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL)) && (wxLUA_USE_wxSizer) + { LuaMethod, "GetControlSizer", wxLua_wxBookCtrlBase_GetControlSizer, 0, 0, s_wxluaargArray_None }, + #endif // ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL)) && (wxLUA_USE_wxSizer) + + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) + { LuaMethod, "GetInternalBorder", wxLua_wxBookCtrlBase_GetInternalBorder, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "SetInternalBorder", wxLua_wxBookCtrlBase_SetInternalBorder, 1, 1, s_wxluatagArray_wxLua_wxBookCtrlBase_SetInternalBorder }, + { LuaMethod, "SetControlMargin", wxLua_wxBookCtrlBase_SetControlMargin, 1, 1, s_wxluatagArray_wxLua_wxBookCtrlBase_SetControlMargin }, + { LuaMethod, "GetControlMargin", wxLua_wxBookCtrlBase_GetControlMargin, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "IsVertical", wxLua_wxBookCtrlBase_IsVertical, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "SetFitToCurrentPage", wxLua_wxBookCtrlBase_SetFitToCurrentPage, 1, 1, s_wxluatagArray_wxLua_wxBookCtrlBase_SetFitToCurrentPage }, + { LuaMethod, "GetFitToCurrentPage", wxLua_wxBookCtrlBase_GetFitToCurrentPage, 0, 0, s_wxluaargArray_None }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) + + #if (wxLUA_USE_wxImageList) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) { LuaMethod, "GetImageList", wxLua_wxBookCtrlBase_GetImageList, 0, 0, s_wxluaargArray_None }, Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** image.cpp 26 Feb 2007 01:57:03 -0000 1.27 --- image.cpp 2 Mar 2007 05:44:27 -0000 1.28 *************** *** 2395,2398 **** --- 2395,2477 ---- + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider) + // %static bool Pop() + static int LUACALL wxLua_wxArtProvider_Pop(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // call Pop + returns = wxArtProvider::Pop(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider) + + + #if (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_Push[] = { &s_wxluatag_wxArtProvider, 0 }; + // %static void Push(wxArtProvider *provider) + static int LUACALL wxLua_wxArtProvider_Push(lua_State *L) + { + wxLuaState wxlState(L); + // wxArtProvider provider + wxArtProvider * provider = (wxArtProvider *)wxlState.GetUserDataType(2, s_wxluatag_wxArtProvider); + // call Push + wxArtProvider::Push(provider); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_Insert[] = { &s_wxluatag_wxArtProvider, 0 }; + // %static void Insert(wxArtProvider *provider) + static int LUACALL wxLua_wxArtProvider_Insert(lua_State *L) + { + wxLuaState wxlState(L); + // wxArtProvider provider + wxArtProvider * provider = (wxArtProvider *)wxlState.GetUserDataType(2, s_wxluatag_wxArtProvider); + // call Insert + wxArtProvider::Insert(provider); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_Remove[] = { &s_wxluatag_wxArtProvider, 0 }; + // %static bool Remove(wxArtProvider *provider) + static int LUACALL wxLua_wxArtProvider_Remove(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // wxArtProvider provider + wxArtProvider * provider = (wxArtProvider *)wxlState.GetUserDataType(2, s_wxluatag_wxArtProvider); + // call Remove + returns = wxArtProvider::Remove(provider); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_Delete[] = { &s_wxluatag_wxArtProvider, 0 }; + // %static bool Delete(wxArtProvider *provider) + static int LUACALL wxLua_wxArtProvider_Delete(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // wxArtProvider provider + wxArtProvider * provider = (wxArtProvider *)wxlState.GetUserDataType(2, s_wxluatag_wxArtProvider); + // call Delete + returns = wxArtProvider::Delete(provider); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_GetSizeHint[] = { &s_wxluaarg_String, &s_wxluaarg_Boolean, 0 }; *************** *** 2441,2444 **** --- 2520,2536 ---- + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider) + { LuaMethod, "Pop", wxLua_wxArtProvider_Pop, 0, 0, s_wxluaargArray_None }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider) + + + #if (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) + { LuaMethod, "Push", wxLua_wxArtProvider_Push, 1, 1, s_wxluatagArray_wxLua_wxArtProvider_Push }, + { LuaMethod, "Insert", wxLua_wxArtProvider_Insert, 1, 1, s_wxluatagArray_wxLua_wxArtProvider_Insert }, + { LuaMethod, "Remove", wxLua_wxArtProvider_Remove, 1, 1, s_wxluatagArray_wxLua_wxArtProvider_Remove }, + { LuaMethod, "Delete", wxLua_wxArtProvider_Delete, 1, 1, s_wxluatagArray_wxLua_wxArtProvider_Delete }, + #endif // (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) { LuaMethod, "GetSizeHint", wxLua_wxArtProvider_GetSizeHint, 2, 1, s_wxluatagArray_wxLua_wxArtProvider_GetSizeHint }, Index: wave.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wave.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wave.cpp 26 Feb 2007 01:57:04 -0000 1.27 --- wave.cpp 2 Mar 2007 05:44:28 -0000 1.28 *************** *** 830,833 **** --- 830,869 ---- + #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) + // !%wxchkver_2_8 int GetNumberJoysticks() const + static int LUACALL wxLua_wxJoystick_GetNumberJoysticks(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // get this + wxJoystick * self = (wxJoystick *)wxlState.GetUserDataType(1, s_wxluatag_wxJoystick); + // call GetNumberJoysticks + returns = self->GetNumberJoysticks(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) + + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) + // %wxchkver_2_8 %static int GetNumberJoysticks() const + static int LUACALL wxLua_wxJoystick_GetNumberJoysticks(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // call GetNumberJoysticks + returns = wxJoystick::GetNumberJoysticks(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) + + #if (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) // wxPoint GetPosition() const *************** *** 946,962 **** } - // %static int GetNumberJoysticks() const - static int LUACALL wxLua_wxJoystick_GetNumberJoysticks(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // call GetNumberJoysticks - returns = wxJoystick::GetNumberJoysticks(); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - // int GetPollingMax() const static int LUACALL wxLua_wxJoystick_GetPollingMax(lua_State *L) --- 982,985 ---- *************** *** 1491,1494 **** --- 1514,1527 ---- WXLUAMETHOD wxJoystick_methods[] = { + #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) + { LuaMethod, "GetNumberJoysticks", wxLua_wxJoystick_GetNumberJoysticks, 0, 0, s_wxluaargArray_None }, + #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) + + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) + { LuaMethod, "GetNumberJoysticks", wxLua_wxJoystick_GetNumberJoysticks, 0, 0, s_wxluaargArray_None }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) + + #if (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetPosition", wxLua_wxJoystick_GetPosition, 0, 0, s_wxluaargArray_None }, *************** *** 1501,1505 **** { LuaMethod, "GetNumberAxes", wxLua_wxJoystick_GetNumberAxes, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetNumberButtons", wxLua_wxJoystick_GetNumberButtons, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "GetNumberJoysticks", wxLua_wxJoystick_GetNumberJoysticks, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetPollingMax", wxLua_wxJoystick_GetPollingMax, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetPollingMin", wxLua_wxJoystick_GetPollingMin, 0, 0, s_wxluaargArray_None }, --- 1534,1537 ---- Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** wx_bind.cpp 26 Feb 2007 01:57:05 -0000 1.79 --- wx_bind.cpp 2 Mar 2007 05:44:28 -0000 1.80 *************** *** 418,427 **** #endif // (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxButton && wxUSE_BUTTON) ! #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxNotebook && wxUSE_NOTEBOOK) { "wxBK_BOTTOM", wxBK_BOTTOM }, { "wxBK_LEFT", wxBK_LEFT }, { "wxBK_RIGHT", wxBK_RIGHT }, { "wxBK_TOP", wxBK_TOP }, ! #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxNotebook && wxUSE_NOTEBOOK) #if (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) && (wxLUA_USE_wxHelpController && wxUSE_HELP) --- 418,454 ---- #endif // (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxButton && wxUSE_BUTTON) ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) ! { "wxALPHA_OPAQUE", wxALPHA_OPAQUE }, ! { "wxALPHA_TRANSPARENT", wxALPHA_TRANSPARENT }, ! { "wxC2S_CSS_SYNTAX", wxC2S_CSS_SYNTAX }, ! { "wxC2S_HTML_SYNTAX", wxC2S_HTML_SYNTAX }, ! { "wxC2S_NAME", wxC2S_NAME }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) ! ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC) ! { "wxALWAYS_NATIVE_DOUBLE_BUFFER", wxALWAYS_NATIVE_DOUBLE_BUFFER }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC) ! ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxID_XXX) ! { "wxID_EDIT", wxID_EDIT }, ! { "wxID_FILE", wxID_FILE }, ! { "wxID_HELP_INDEX", wxID_HELP_INDEX }, ! { "wxID_HELP_SEARCH", wxID_HELP_SEARCH }, ! { "wxID_PAGE_SETUP", wxID_PAGE_SETUP }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxID_XXX) ! ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) ! { "wxBK_ALIGN_MASK", wxBK_ALIGN_MASK }, { "wxBK_BOTTOM", wxBK_BOTTOM }, + { "wxBK_DEFAULT", wxBK_DEFAULT }, { "wxBK_LEFT", wxBK_LEFT }, { "wxBK_RIGHT", wxBK_RIGHT }, { "wxBK_TOP", wxBK_TOP }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) ! ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxStaticText && wxUSE_STATTEXT) ! { "wxST_DOTS_END", wxST_DOTS_END }, ! { "wxST_DOTS_MIDDLE", wxST_DOTS_MIDDLE }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxStaticText && wxUSE_STATTEXT) #if (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) && (wxLUA_USE_wxHelpController && wxUSE_HELP) *************** *** 475,478 **** --- 502,506 ---- { "wxCLIP_CHILDREN", wxCLIP_CHILDREN }, { "wxCOLOURED", wxCOLOURED }, + { "wxDD_NEW_DIR_BUTTON", wxDD_NEW_DIR_BUTTON }, { "wxDOUBLE_BORDER", wxDOUBLE_BORDER }, { "wxEQUIV", wxEQUIV }, *************** *** 523,527 **** { "wxSIZE_USE_EXISTING", wxSIZE_USE_EXISTING }, { "wxSTATIC_BORDER", wxSTATIC_BORDER }, - { "wxST_NO_AUTORESIZE", wxST_NO_AUTORESIZE }, { "wxSUBRELEASE_NUMBER", wxSUBRELEASE_NUMBER }, { "wxSUNKEN_BORDER", wxSUNKEN_BORDER }, --- 551,554 ---- *************** *** 1377,1380 **** --- 1404,1438 ---- #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) + { "wxACCEL_CMD", wxACCEL_CMD }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC) + { "wxLayout_Default", wxLayout_Default }, + { "wxLayout_LeftToRight", wxLayout_LeftToRight }, + { "wxLayout_RightToLeft", wxLayout_RightToLeft }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC) + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) + { "wxDateTime_GMT13", wxDateTime::GMT13 }, + { "wxDateTime_NZDT", wxDateTime::NZDT }, + { "wxDateTime_NZST", wxDateTime::NZST }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDateTime && wxUSE_DATETIME) + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) + { "wxBK_HITTEST_NOWHERE", wxBK_HITTEST_NOWHERE }, + { "wxBK_HITTEST_ONICON", wxBK_HITTEST_ONICON }, + { "wxBK_HITTEST_ONITEM", wxBK_HITTEST_ONITEM }, + { "wxBK_HITTEST_ONLABEL", wxBK_HITTEST_ONLABEL }, + { "wxBK_HITTEST_ONPAGE", wxBK_HITTEST_ONPAGE }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) + + #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_HOTKEY) + { "wxMOD_ALL", wxMOD_ALL }, + { "wxMOD_ALTGR", wxMOD_ALTGR }, + { "wxMOD_CMD", wxMOD_CMD }, + { "wxMOD_META", wxMOD_META }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxUSE_HOTKEY) + #if (wxLUA_USE_wxLuaPrintout) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) { "wxPRINTER_CANCELLED", wxPRINTER_CANCELLED }, *************** *** 1637,1641 **** #if wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL { "wxACCEL_ALT", wxACCEL_ALT }, - { "wxACCEL_CMD", wxACCEL_CMD }, { "wxACCEL_CTRL", wxACCEL_CTRL }, { "wxACCEL_NORMAL", wxACCEL_NORMAL }, --- 1695,1698 ---- *************** *** 2874,2877 **** --- 2931,2954 ---- #endif // ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) + #if ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) + + static wxLuaArgTag s_wxluatagArray_wxLua_wxAcceleratorEntry_Create[] = { &s_wxluaarg_String, 0 }; + // %staticonly wxAcceleratorEntry *Create(const wxString& str) + static int LUACALL wxLua_wxAcceleratorEntry_Create(lua_State *L) + { + wxLuaState wxlState(L); + wxAcceleratorEntry *returns; + // const wxString str + const wxString str = wxlState.GetwxStringType(1); + // call Create + returns = wxAcceleratorEntry::Create(str); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxAcceleratorEntry, returns); + + return 1; + } + + #endif // ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) + #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) *************** *** 2990,2993 **** --- 3067,3186 ---- #endif // (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxProcess) + #if (wxCHECK_VERSION(2,8,0) || !defined(__WXGTK__)) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) + + static wxLuaArgTag s_wxluatagArray_wxLua_wxDisplay_GetFromWindow[] = { &s_wxluatag_wxWindow, 0 }; + // %wxchkver_2_8|!%gtk %static int GetFromWindow(wxWindow* win) + static int LUACALL wxLua_wxDisplay_GetFromWindow(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // wxWindow win + wxWindow * win = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call GetFromWindow + returns = wxDisplay::GetFromWindow(win); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #endif // (wxCHECK_VERSION(2,8,0) || !defined(__WXGTK__)) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider) + + // %static bool Pop() + static int LUACALL wxLua_wxArtProvider_Pop(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // call Pop + returns = wxArtProvider::Pop(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider) + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) + + // %wxchkver_2_8 %static int GetNumberJoysticks() const + static int LUACALL wxLua_wxJoystick_GetNumberJoysticks(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // call GetNumberJoysticks + returns = wxJoystick::GetNumberJoysticks(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) + + #if (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) + + static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_Delete[] = { &s_wxluatag_wxArtProvider, 0 }; + // %static bool Delete(wxArtProvider *provider) + static int LUACALL wxLua_wxArtProvider_Delete(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // wxArtProvider provider + wxArtProvider * provider = (wxArtProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxArtProvider); + // call Delete + returns = wxArtProvider::Delete(provider); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_Insert[] = { &s_wxluatag_wxArtProvider, 0 }; + // %static void Insert(wxArtProvider *provider) + static int LUACALL wxLua_wxArtProvider_Insert(lua_State *L) + { + wxLuaState wxlState(L); + // wxArtProvider provider + wxArtProvider * provider = (wxArtProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxArtProvider); + // call Insert + wxArtProvider::Insert(provider); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_Push[] = { &s_wxluatag_wxArtProvider, 0 }; + // %static void Push(wxArtProvider *provider) + static int LUACALL wxLua_wxArtProvider_Push(lua_State *L) + { + wxLuaState wxlState(L); + // wxArtProvider provider + wxArtProvider * provider = (wxArtProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxArtProvider); + // call Push + wxArtProvider::Push(provider); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxArtProvider_Remove[] = { &s_wxluatag_wxArtProvider, 0 }; + // %static bool Remove(wxArtProvider *provider) + static int LUACALL wxLua_wxArtProvider_Remove(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // wxArtProvider provider + wxArtProvider * provider = (wxArtProvider *)wxlState.GetUserDataType(1, s_wxluatag_wxArtProvider); + // call Remove + returns = wxArtProvider::Remove(provider); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) + #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxSystemSettings) *************** *** 3013,3020 **** #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxSystemSettings) ! #if (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG) static wxLuaArgTag s_wxluatagArray_wxLua_function_wxGetColourFromUser[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxColour, 0 }; ! // wxUSE_COLOURDLG %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit) static int LUACALL wxLua_function_wxGetColourFromUser(lua_State *L) { --- 3206,3213 ---- #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxSystemSettings) ! #if (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG && !wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_function_wxGetColourFromUser[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxColour, 0 }; ! // wxUSE_COLOURDLG&&!%wxchkver_2_8 %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit) static int LUACALL wxLua_function_wxGetColourFromUser(lua_State *L) { *************** *** 3036,3040 **** } ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG) #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME) --- 3229,3233 ---- } ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG && !wxCHECK_VERSION(2,8,0)) #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME) *************** *** 3174,3177 **** --- 3367,3399 ---- #endif // (wxLUA_USE_wxProcess) && (!wxCHECK_VERSION(2,6,0)) + #if (wxUSE_COLOURDLG && wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) + + static wxLuaArgTag s_wxluatagArray_wxLua_function_wxGetColourFromUser[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxColour, &s_wxluaarg_String, 0 }; + // wxUSE_COLOURDLG&&%wxchkver_2_8 %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wxString& caption = "") + static int LUACALL wxLua_function_wxGetColourFromUser(lua_State *L) + { + wxLuaState wxlState(L); + wxColour *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString caption = "" + const wxString caption = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); + // const wxColour colInit + const wxColour * colInit = (const wxColour *)wxlState.GetUserDataType(2, s_wxluatag_wxColour); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call wxGetColourFromUser + // allocate a new object using the copy constructor + returns = new wxColour(wxGetColourFromUser(parent, *colInit, caption)); + // add the new object to the tracked memory list + wxLua_AddTrackedObject(wxlState, (wxColour *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxColour, returns); + + return 1; + } + + #endif // (wxUSE_COLOURDLG && wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) + #if (wxUSE_FONTDLG) && (wxLUA_USE_wxFont) *************** *** 4633,4652 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxDisplay_GetFromWindow[] = { &s_wxluatag_wxWindow, 0 }; - // %static int GetFromWindow(wxWindow* win) - static int LUACALL wxLua_wxDisplay_GetFromWindow(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // wxWindow win - wxWindow * win = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); - // call GetFromWindow - returns = wxDisplay::GetFromWindow(win); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY --- 4855,4858 ---- *************** *** 4695,4715 **** #endif // wxLUA_USE_wxFrame - #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK - - // %static int GetNumberJoysticks() const - static int LUACALL wxLua_wxJoystick_GetNumberJoysticks(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // call GetNumberJoysticks - returns = wxJoystick::GetNumberJoysticks(); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - - #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK - #if wxLUA_USE_wxObject --- 4901,4904 ---- *************** *** 5162,5165 **** --- 5351,5359 ---- + #if ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) + { LuaGlobal, "wxAcceleratorEntry_Create", wxLua_wxAcceleratorEntry_Create, 1, 1, s_wxluatagArray_wxLua_wxAcceleratorEntry_Create }, + #endif // ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) + + #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) { LuaGlobal, "wxArtProvider_GetBitmap", wxLua_wxArtProvider_GetBitmap, 3, 1, s_wxluatagArray_wxLua_wxArtProvider_GetBitmap }, *************** *** 5183,5186 **** --- 5377,5403 ---- + #if (wxCHECK_VERSION(2,8,0) || !defined(__WXGTK__)) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) + { LuaGlobal, "wxDisplay_GetFromWindow", wxLua_wxDisplay_GetFromWindow, 1, 1, s_wxluatagArray_wxLua_wxDisplay_GetFromWindow }, + #endif // (wxCHECK_VERSION(2,8,0) || !defined(__WXGTK__)) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) + + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider) + { LuaGlobal, "wxArtProvider_Pop", wxLua_wxArtProvider_Pop, 0, 0, s_wxluaargArray_None }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider) + + + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) + { LuaGlobal, "wxJoystick_GetNumberJoysticks", wxLua_wxJoystick_GetNumberJoysticks, 0, 0, s_wxluaargArray_None }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) + + + #if (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) + { LuaGlobal, "wxArtProvider_Delete", wxLua_wxArtProvider_Delete, 1, 1, s_wxluatagArray_wxLua_wxArtProvider_Delete }, + { LuaGlobal, "wxArtProvider_Insert", wxLua_wxArtProvider_Insert, 1, 1, s_wxluatagArray_wxLua_wxArtProvider_Insert }, + { LuaGlobal, "wxArtProvider_Push", wxLua_wxArtProvider_Push, 1, 1, s_wxluatagArray_wxLua_wxArtProvider_Push }, + { LuaGlobal, "wxArtProvider_Remove", wxLua_wxArtProvider_Remove, 1, 1, s_wxluatagArray_wxLua_wxArtProvider_Remove }, + #endif // (wxLUA_USE_wxArtProvider) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxArtProvider)) + + #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxSystemSettings) { LuaGlobal, "wxSystemSettings_GetColour", wxLua_wxSystemSettings_GetColour, 1, 1, s_wxluatagArray_wxLua_wxSystemSettings_GetColour }, *************** *** 5188,5194 **** ! #if (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG) { LuaGlobal, "wxGetColourFromUser", wxLua_function_wxGetColourFromUser, 2, 2, s_wxluatagArray_wxLua_function_wxGetColourFromUser }, ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG) --- 5405,5411 ---- ! #if (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG && !wxCHECK_VERSION(2,8,0)) { LuaGlobal, "wxGetColourFromUser", wxLua_function_wxGetColourFromUser, 2, 2, s_wxluatagArray_wxLua_function_wxGetColourFromUser }, ! #endif // (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG && !wxCHECK_VERSION(2,8,0)) *************** *** 5219,5222 **** --- 5436,5444 ---- + #if (wxUSE_COLOURDLG && wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) + { LuaGlobal, "wxGetColourFromUser", wxLua_function_wxGetColourFromUser, 3, 2, s_wxluatagArray_wxLua_function_wxGetColourFromUser }, + #endif // (wxUSE_COLOURDLG && wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush) + + #if (wxUSE_FONTDLG) && (wxLUA_USE_wxFont) { LuaGlobal, "wxGetFontFromUser", wxLua_function_wxGetFontFromUser, 2, 2, s_wxluatagArray_wxLua_function_wxGetFontFromUser }, *************** *** 5359,5363 **** #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY { LuaGlobal, "wxDisplay_GetCount", wxLua_wxDisplay_GetCount, 0, 0, s_wxluaargArray_None }, - { LuaGlobal, "wxDisplay_GetFromWindow", wxLua_wxDisplay_GetFromWindow, 1, 1, s_wxluatagArray_wxLua_wxDisplay_GetFromWindow }, #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY --- 5581,5584 ---- *************** *** 5373,5381 **** - #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK - { LuaGlobal, "wxJoystick_GetNumberJoysticks", wxLua_wxJoystick_GetNumberJoysticks, 0, 0, s_wxluaargArray_None }, - #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK - - #if wxLUA_USE_wxObject { LuaGlobal, "wxCreateDynamicObject", wxLua_function_wxCreateDynamicObject, 1, 1, s_wxluatagArray_wxLua_function_wxCreateDynamicObject }, --- 5594,5597 ---- *************** *** 5488,5491 **** --- 5704,5712 ---- + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC) + { "wxAutoBufferedPaintDC", wxAutoBufferedPaintDC_methods, wxAutoBufferedPaintDC_methodCount, CLASSINFO(wxAutoBufferedPaintDC), &s_wxluatag_wxAutoBufferedPaintDC, "wxDC", NULL }, + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC) + + #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON) { "wxBitmapButton", wxBitmapButton_methods, wxBitmapButton_methodCount, CLASSINFO(wxBitmapButton), &s_wxluatag_wxBitmapButton, "wxButton", NULL }, *************** *** 6403,6406 **** --- 6624,6629 ---- #if wxUSE_STREAMS + { "wxDataInputStream", wxDataInputStream_methods, wxDataInputStream_methodCount, NULL, &s_wxluatag_wxDataInputStream, NULL, NULL }, + { "wxDataOutputStream", wxDataOutputStream_methods, wxDataOutputStream_methodCount, NULL, &s_wxluatag_wxDataOutputStream, NULL, NULL }, { "wxFileInputStream", wxFileInputStream_methods, wxFileInputStream_methodCount, NULL, &s_wxluatag_wxFileInputStream, "wxInputStream", NULL }, { "wxFileOutputStream", wxFileOutputStream_methods, wxFileOutputStream_methodCount, NULL, &s_wxluatag_wxFileOutputStream, "wxOutpu... [truncated message content] |
