From: John L. <jr...@us...> - 2006-06-09 22:51:38
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16561/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: cleanup output fix use of wxUSE_FATAL_EXCEPTIONS Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxstc_bind.cpp 8 Jun 2006 03:22:11 -0000 1.9 --- wxstc_bind.cpp 9 Jun 2006 22:51:34 -0000 1.10 *************** *** 28,35 **** static WXLUAEVENT eventList[] = { - #if !wxCHECK_VERSION(2,5,0) { &wxEVT_STC_POSCHANGED, "wxEVT_STC_POSCHANGED", &s_wxluatag_wxStyledTextEvent }, ! #endif { &wxEVT_STC_CHANGE, "wxEVT_STC_CHANGE", &s_wxluatag_wxStyledTextEvent }, --- 28,34 ---- static WXLUAEVENT eventList[] = { #if !wxCHECK_VERSION(2,5,0) { &wxEVT_STC_POSCHANGED, "wxEVT_STC_POSCHANGED", &s_wxluatag_wxStyledTextEvent }, ! #endif // !wxCHECK_VERSION(2,5,0) { &wxEVT_STC_CHANGE, "wxEVT_STC_CHANGE", &s_wxluatag_wxStyledTextEvent }, *************** *** 55,58 **** --- 54,58 ---- { &wxEVT_STC_USERLISTSELECTION, "wxEVT_STC_USERLISTSELECTION", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_ZOOM, "wxEVT_STC_ZOOM", &s_wxluatag_wxStyledTextEvent }, + { 0, 0, 0 }, }; *************** *** 93,97 **** { "wxSTC_SCRIPTOL_WORD", wxSTC_SCRIPTOL_WORD }, { "wxSTC_SCRIPTOL_WORD2", wxSTC_SCRIPTOL_WORD2 }, ! #endif { "wxSTC_ADA_CHARACTER", wxSTC_ADA_CHARACTER }, --- 93,97 ---- { "wxSTC_SCRIPTOL_WORD", wxSTC_SCRIPTOL_WORD }, { "wxSTC_SCRIPTOL_WORD2", wxSTC_SCRIPTOL_WORD2 }, ! #endif // !wxCHECK_VERSION(2,5,0) { "wxSTC_ADA_CHARACTER", wxSTC_ADA_CHARACTER }, *************** *** 674,682 **** { "wxSTC_SCRIPTOL_TRIPLE", wxSTC_SCRIPTOL_TRIPLE }, { "wxSTC_SCRIPTOL_WHITE", wxSTC_SCRIPTOL_WHITE }, ! #endif // -------------------------------------------------------------------- // %enum // -------------------------------------------------------------------- { 0, 0 }, }; --- 674,683 ---- { "wxSTC_SCRIPTOL_TRIPLE", wxSTC_SCRIPTOL_TRIPLE }, { "wxSTC_SCRIPTOL_WHITE", wxSTC_SCRIPTOL_WHITE }, ! #endif // wxCHECK_VERSION(2,5,0) // -------------------------------------------------------------------- // %enum // -------------------------------------------------------------------- + { 0, 0 }, }; *************** *** 697,700 **** --- 698,702 ---- // %define %string // -------------------------------------------------------------------- + { 0, 0 }, }; *************** *** 721,724 **** --- 723,730 ---- // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // wxLuaGetFunctionList_wxstc() is called to register global functions + // ---------------------------------------------------------------------------- + WXLUAMETHOD* wxLuaGetFunctionList_wxstc(size_t &count) { *************** *** 733,736 **** --- 739,746 ---- + // ---------------------------------------------------------------------------- + // wxLuaGetClassList_wxstc() is called to register classes + // ---------------------------------------------------------------------------- + WXLUACLASS* wxLuaGetClassList_wxstc(size_t &count) { Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** stc.cpp 8 Jun 2006 03:22:11 -0000 1.14 --- stc.cpp 9 Jun 2006 22:51:34 -0000 1.15 *************** *** 58,62 **** } ! #endif // void AddText(const wxString& text) --- 58,62 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) // void AddText(const wxString& text) *************** *** 4223,4227 **** } ! #endif --- 4223,4227 ---- } ! #endif // wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,4,0) *************** *** 4256,4260 **** } ! #endif --- 4256,4260 ---- } ! #endif // wxCHECK_VERSION(2,4,0) *************** *** 4556,4560 **** } ! #endif --- 4556,4560 ---- } ! #endif // wxLUA_USE_wxColourPenBrush *************** *** 4576,4580 **** } ! #endif --- 4576,4580 ---- } ! #endif // wxLUA_USE_wxFont *************** *** 4647,4651 **** } ! #endif --- 4647,4651 ---- } ! #endif // wxLUA_USE_wxPointSizeRect *************** *** 4679,4683 **** } ! #endif --- 4679,4683 ---- } ! #endif // wxLUA_USE_wxScrollBar *************** *** 4690,4694 **** #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) { LuaMethod, "FormatRange", wxLua_wxStyledTextCtrl_FormatRange, 7, 7, { &s_wxluaarg_Boolean, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxDC, &s_wxluatag_wxDC, &s_wxluatag_wxRect, &s_wxluatag_wxRect, 0 } }, ! #endif { LuaMethod, "AddText", wxLua_wxStyledTextCtrl_AddText, 1, 1, { &s_wxluaarg_String, 0 } }, --- 4690,4694 ---- #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) { LuaMethod, "FormatRange", wxLua_wxStyledTextCtrl_FormatRange, 7, 7, { &s_wxluaarg_Boolean, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxDC, &s_wxluatag_wxDC, &s_wxluatag_wxRect, &s_wxluatag_wxRect, 0 } }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) { LuaMethod, "AddText", wxLua_wxStyledTextCtrl_AddText, 1, 1, { &s_wxluaarg_String, 0 } }, *************** *** 5080,5084 **** { LuaGetProp, "Cursor", wxLua_wxStyledTextCtrl_GetCursor, 0, 0, {0} }, { LuaSetProp, "Cursor", wxLua_wxStyledTextCtrl_SetCursor, 1, 1, {0} }, ! #endif --- 5080,5084 ---- { LuaGetProp, "Cursor", wxLua_wxStyledTextCtrl_GetCursor, 0, 0, {0} }, { LuaSetProp, "Cursor", wxLua_wxStyledTextCtrl_SetCursor, 1, 1, {0} }, ! #endif // wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,4,0) *************** *** 5088,5092 **** { LuaGetProp, "STCCursor", wxLua_wxStyledTextCtrl_GetSTCCursor, 0, 0, {0} }, { LuaSetProp, "STCCursor", wxLua_wxStyledTextCtrl_SetSTCCursor, 1, 1, {0} }, ! #endif --- 5088,5092 ---- { LuaGetProp, "STCCursor", wxLua_wxStyledTextCtrl_GetSTCCursor, 0, 0, {0} }, { LuaSetProp, "STCCursor", wxLua_wxStyledTextCtrl_SetSTCCursor, 1, 1, {0} }, ! #endif // wxCHECK_VERSION(2,4,0) *************** *** 5114,5123 **** { LuaGetProp, "EdgeColour", wxLua_wxStyledTextCtrl_GetEdgeColour, 0, 0, {0} }, { LuaSetProp, "EdgeColour", wxLua_wxStyledTextCtrl_SetEdgeColour, 1, 1, {0} }, ! #endif #if wxLUA_USE_wxFont { LuaMethod, "StyleSetFont", wxLua_wxStyledTextCtrl_StyleSetFont, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxFont, 0 } }, ! #endif --- 5114,5123 ---- { LuaGetProp, "EdgeColour", wxLua_wxStyledTextCtrl_GetEdgeColour, 0, 0, {0} }, { LuaSetProp, "EdgeColour", wxLua_wxStyledTextCtrl_SetEdgeColour, 1, 1, {0} }, ! #endif // wxLUA_USE_wxColourPenBrush #if wxLUA_USE_wxFont { LuaMethod, "StyleSetFont", wxLua_wxStyledTextCtrl_StyleSetFont, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxFont, 0 } }, ! #endif // wxLUA_USE_wxFont *************** *** 5126,5130 **** { LuaMethod, "PositionFromPoint", wxLua_wxStyledTextCtrl_PositionFromPoint, 1, 1, { &s_wxluatag_wxPoint, 0 } }, { LuaMethod, "PointFromPosition", wxLua_wxStyledTextCtrl_PointFromPosition, 1, 1, { &s_wxluaarg_Number, 0 } }, ! #endif --- 5126,5130 ---- { LuaMethod, "PositionFromPoint", wxLua_wxStyledTextCtrl_PositionFromPoint, 1, 1, { &s_wxluatag_wxPoint, 0 } }, { LuaMethod, "PointFromPosition", wxLua_wxStyledTextCtrl_PointFromPosition, 1, 1, { &s_wxluaarg_Number, 0 } }, ! #endif // wxLUA_USE_wxPointSizeRect *************** *** 5132,5136 **** { LuaMethod, "SetVScrollBar", wxLua_wxStyledTextCtrl_SetVScrollBar, 1, 1, { &s_wxluatag_wxScrollBar, 0 } }, { LuaMethod, "SetHScrollBar", wxLua_wxStyledTextCtrl_SetHScrollBar, 1, 1, { &s_wxluatag_wxScrollBar, 0 } }, ! #endif }; --- 5132,5136 ---- { LuaMethod, "SetVScrollBar", wxLua_wxStyledTextCtrl_SetVScrollBar, 1, 1, { &s_wxluatag_wxScrollBar, 0 } }, { LuaMethod, "SetHScrollBar", wxLua_wxStyledTextCtrl_SetHScrollBar, 1, 1, { &s_wxluatag_wxScrollBar, 0 } }, ! #endif // wxLUA_USE_wxScrollBar }; *************** *** 5822,5826 **** } ! #endif --- 5822,5826 ---- } ! #endif // wxLUA_USE_wxDragDrop *************** *** 5921,5925 **** { LuaGetProp, "DragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, {0} }, { LuaSetProp, "DragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, {0} }, ! #endif }; --- 5921,5925 ---- { LuaGetProp, "DragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, {0} }, { LuaSetProp, "DragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, {0} }, ! #endif // wxLUA_USE_wxDragDrop }; |