Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2006-08-28 05:26:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1034/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Finished cleaning up the code, removed all code from internal.h and internal.cpp and moved it to other files. Do not #include internal.h anymore! Have the functions in wxLuaState that only call C lua funcs call C helper funcs in wxlstate.cpp so that you don't have to create a wxLuaState if you don't really need it. Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** wxbind.h 9 Jun 2006 22:51:30 -0000 1.35 --- wxbind.h 28 Aug 2006 05:26:20 -0000 1.36 *************** *** 13,26 **** #include "wxbind/include/wxbinddefs.h" #ifndef wxUSE_WAVE ! #define wxUSE_WAVE 0 ! #endif #ifndef wxUSE_SOUND ! #define wxUSE_SOUND 0 ! #endif #include "wxlua/include/wxlstate.h" #include "wxlua/include/wxlbind.h" - #include "wxlua/include/internal.h" - // binding class class wxLuaBinding_wx : public wxLuaBinding --- 13,41 ---- #include "wxbind/include/wxbinddefs.h" #ifndef wxUSE_WAVE ! #define wxUSE_WAVE 0 ! #endif // wxUSE_WAVE #ifndef wxUSE_SOUND ! #define wxUSE_SOUND 0 ! #endif // wxUSE_SOUND ! ! #include "wx/treectrl.h" ! ! // ---------------------------------------------------------------------------- ! // wxLuaTreeItemData - our treeitem data that allows us to get/set an index ! // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaTreeItemData : public wxTreeItemData ! { ! public: ! wxLuaTreeItemData(double value = 0) : m_value(value) {} ! double GetValue() const { return m_value; } ! void SetValue(double value) { m_value = value; } ! ! private: ! double m_value; ! }; ! #include "wxlua/include/wxlstate.h" #include "wxlua/include/wxlbind.h" // binding class class wxLuaBinding_wx : public wxLuaBinding |
|
From: John L. <jr...@us...> - 2006-08-28 05:26:23
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1034/wxLua/bindings Modified Files: genwxbind.lua Log Message: Finished cleaning up the code, removed all code from internal.h and internal.cpp and moved it to other files. Do not #include internal.h anymore! Have the functions in wxLuaState that only call C lua funcs call C helper funcs in wxlstate.cpp so that you don't have to create a wxLuaState if you don't really need it. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** genwxbind.lua 24 Jul 2006 20:26:10 -0000 1.76 --- genwxbind.lua 28 Aug 2006 05:26:19 -0000 1.77 *************** *** 3895,3899 **** table.insert(fileData, "#include \"wxlua/include/wxlstate.h\"\n") table.insert(fileData, "#include \"wxlua/include/wxlbind.h\"\n") - table.insert(fileData, "#include \"wxlua/include/internal.h\"\n\n") if hook_bind_condition then --- 3895,3898 ---- |
|
From: John L. <jr...@us...> - 2006-08-24 05:12:31
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15690/wxLua/modules/wxbind/src Modified Files: html.cpp wx_bind.cpp Log Message: update bindings to 2.7 Index: html.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/html.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** html.cpp 12 Jun 2006 03:50:38 -0000 1.17 --- html.cpp 24 Aug 2006 05:12:27 -0000 1.18 *************** *** 1890,1893 **** --- 1890,1912 ---- + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + // !%wxchkver27 wxWindow* GetWindow() + static int LUACALL wxLua_wxHtmlWinParser_GetWindow(lua_State *L) + { + wxLuaState wxlState(L); + wxWindow *returns; + // get this + wxHtmlWinParser * self = (wxHtmlWinParser *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWinParser); + // call GetWindow + returns = self->GetWindow(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); + + return 1; + } + + #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + + #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxHTML) // wxColour GetActualColor() const *************** *** 2211,2229 **** } - // wxWindow* GetWindow() - static int LUACALL wxLua_wxHtmlWinParser_GetWindow(lua_State *L) - { - wxLuaState wxlState(L); - wxWindow *returns; - // get this - wxHtmlWinParser * self = (wxHtmlWinParser *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWinParser); - // call GetWindow - returns = self->GetWindow(); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); - - return 1; - } - // wxHtmlContainerCell* OpenContainer() static int LUACALL wxLua_wxHtmlWinParser_OpenContainer(lua_State *L) --- 2230,2233 ---- *************** *** 2437,2440 **** --- 2441,2450 ---- static WXLUAMETHOD s_wxHtmlWinParser_methods[] = { + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + { LuaMethod, "GetWindow", wxLua_wxHtmlWinParser_GetWindow, 0, 0, { 0 } }, + { LuaGetProp, "Window", wxLua_wxHtmlWinParser_GetWindow, 0, 0, {0} }, + #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + + #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxHTML) { LuaMethod, "GetActualColor", wxLua_wxHtmlWinParser_GetActualColor, 0, 0, { 0 } }, *************** *** 2474,2478 **** { LuaMethod, "GetFontUnderlined", wxLua_wxHtmlWinParser_GetFontUnderlined, 0, 0, { 0 } }, { LuaMethod, "GetLink", wxLua_wxHtmlWinParser_GetLink, 0, 0, { 0 } }, - { LuaMethod, "GetWindow", wxLua_wxHtmlWinParser_GetWindow, 0, 0, { 0 } }, { LuaMethod, "OpenContainer", wxLua_wxHtmlWinParser_OpenContainer, 0, 0, { 0 } }, { LuaMethod, "SetAlign", wxLua_wxHtmlWinParser_SetAlign, 1, 1, { &s_wxluaarg_Number, 0 } }, --- 2484,2487 ---- *************** *** 2486,2490 **** { LuaMethod, "SetFonts", wxLua_wxHtmlWinParser_SetFonts, 3, 3, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LightUserData, 0 } }, { LuaMethod, "SetLink", wxLua_wxHtmlWinParser_SetLink, 1, 1, { &s_wxluatag_wxHtmlLinkInfo, 0 } }, - { LuaGetProp, "Window", wxLua_wxHtmlWinParser_GetWindow, 0, 0, {0} }, { LuaGetProp, "Align", wxLua_wxHtmlWinParser_GetAlign, 0, 0, {0} }, { LuaSetProp, "Align", wxLua_wxHtmlWinParser_SetAlign, 1, 1, {0} }, --- 2495,2498 ---- Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** wx_bind.cpp 8 Aug 2006 22:54:37 -0000 1.52 --- wx_bind.cpp 24 Aug 2006 05:12:27 -0000 1.53 *************** *** 559,563 **** { "wxINVERT", wxINVERT }, { "wxMORE", wxMORE }, - { "wxMOTIF_X", wxMOTIF_X }, { "wxNO", wxNO }, { "wxNO_3D", wxNO_3D }, --- 559,562 ---- *************** *** 591,595 **** { "wxVSCROLL", wxVSCROLL }, { "wxWANTS_CHARS", wxWANTS_CHARS }, - { "wxWINDOWS", wxWINDOWS }, { "wxWS_EX_BLOCK_EVENTS", wxWS_EX_BLOCK_EVENTS }, { "wxWS_EX_PROCESS_IDLE", wxWS_EX_PROCESS_IDLE }, --- 590,593 ---- *************** *** 597,601 **** { "wxWS_EX_TRANSIENT", wxWS_EX_TRANSIENT }, { "wxWS_EX_VALIDATE_RECURSIVELY", wxWS_EX_VALIDATE_RECURSIVELY }, - { "wxXVIEW_X", wxXVIEW_X }, { "wxYES", wxYES }, { "wxYES_DEFAULT", wxYES_DEFAULT }, --- 595,598 ---- *************** *** 1351,1354 **** --- 1348,1389 ---- // -------------------------------------------------------------------- + #if !wxCHECK_VERSION(2,7,0) + { "wxBEOS", wxBEOS }, + { "wxCOSE_X", wxCOSE_X }, + { "wxCURSES", wxCURSES }, + { "wxDOS", wxDOS }, + { "wxGEOS", wxGEOS }, + { "wxGTK", wxGTK }, + { "wxGTK_BEOS", wxGTK_BEOS }, + { "wxGTK_OS2", wxGTK_OS2 }, + { "wxGTK_WIN32", wxGTK_WIN32 }, + { "wxMAC", wxMAC }, + { "wxMAC_DARWIN", wxMAC_DARWIN }, + { "wxMGL_DOS", wxMGL_DOS }, + { "wxMGL_OS2", wxMGL_OS2 }, + { "wxMGL_UNIX", wxMGL_UNIX }, + { "wxMGL_WIN32", wxMGL_WIN32 }, + { "wxMGL_X", wxMGL_X }, + { "wxMICROWINDOWS", wxMICROWINDOWS }, + { "wxMOTIF_X", wxMOTIF_X }, + { "wxNEXTSTEP", wxNEXTSTEP }, + { "wxOS2_PM", wxOS2_PM }, + { "wxPALMOS", wxPALMOS }, + { "wxPENWINDOWS", wxPENWINDOWS }, + { "wxUNIX", wxUNIX }, + { "wxUNKNOWN_PLATFORM", wxUNKNOWN_PLATFORM }, + { "wxWIN32S", wxWIN32S }, + { "wxWIN386", wxWIN386 }, + { "wxWIN95", wxWIN95 }, + { "wxWINDOWS", wxWINDOWS }, + { "wxWINDOWS_CE", wxWINDOWS_CE }, + { "wxWINDOWS_NT", wxWINDOWS_NT }, + { "wxWINDOWS_OS2", wxWINDOWS_OS2 }, + { "wxWINDOWS_POCKETPC", wxWINDOWS_POCKETPC }, + { "wxWINDOWS_SMARTPHONE", wxWINDOWS_SMARTPHONE }, + { "wxX11", wxX11 }, + { "wxXVIEW_X", wxXVIEW_X }, + #endif // !wxCHECK_VERSION(2,7,0) + #if (defined(__WXMAC__)) && (wxLUA_USE_wxCursor) { "wxCURSOR_COPY_ARROW", wxCURSOR_COPY_ARROW }, *************** *** 1540,1544 **** { "wxALIGN_TOP", wxALIGN_TOP }, { "wxALL", wxALL }, - { "wxBEOS", wxBEOS }, { "wxBG_STYLE_COLOUR", wxBG_STYLE_COLOUR }, { "wxBG_STYLE_CUSTOM", wxBG_STYLE_CUSTOM }, --- 1575,1578 ---- *************** *** 1577,1593 **** { "wxBOTH", wxBOTH }, { "wxBOTTOM", wxBOTTOM }, - { "wxCOSE_X", wxCOSE_X }, - { "wxCURSES", wxCURSES }, - { "wxDOS", wxDOS }, { "wxDOWN", wxDOWN }, { "wxEAST", wxEAST }, { "wxEXPAND", wxEXPAND }, { "wxFILE_MUST_EXIST", wxFILE_MUST_EXIST }, - { "wxGEOS", wxGEOS }, { "wxGROW", wxGROW }, - { "wxGTK", wxGTK }, - { "wxGTK_BEOS", wxGTK_BEOS }, - { "wxGTK_OS2", wxGTK_OS2 }, - { "wxGTK_WIN32", wxGTK_WIN32 }, { "wxHORIZONTAL", wxHORIZONTAL }, { "wxIDLE_PROCESS_ALL", wxIDLE_PROCESS_ALL }, --- 1611,1619 ---- *************** *** 1596,1608 **** { "wxIMAGE_RESOLUTION_INCHES", wxIMAGE_RESOLUTION_INCHES }, { "wxLEFT", wxLEFT }, - { "wxMAC", wxMAC }, - { "wxMAC_DARWIN", wxMAC_DARWIN }, - { "wxMGL_DOS", wxMGL_DOS }, - { "wxMGL_OS2", wxMGL_OS2 }, - { "wxMGL_UNIX", wxMGL_UNIX }, - { "wxMGL_WIN32", wxMGL_WIN32 }, - { "wxMGL_X", wxMGL_X }, - { "wxMICROWINDOWS", wxMICROWINDOWS }, - { "wxMOTIF_X", wxMOTIF_X }, { "wxMOUSE_BTN_ANY", wxMOUSE_BTN_ANY }, { "wxMOUSE_BTN_LEFT", wxMOUSE_BTN_LEFT }, --- 1622,1625 ---- *************** *** 1611,1621 **** { "wxMOUSE_BTN_RIGHT", wxMOUSE_BTN_RIGHT }, { "wxMULTIPLE", wxMULTIPLE }, - { "wxNEXTSTEP", wxNEXTSTEP }, { "wxNORTH", wxNORTH }, { "wxOPEN", wxOPEN }, - { "wxOS2_PM", wxOS2_PM }, { "wxOVERWRITE_PROMPT", wxOVERWRITE_PROMPT }, - { "wxPALMOS", wxPALMOS }, - { "wxPENWINDOWS", wxPENWINDOWS }, { "wxRIGHT", wxRIGHT }, { "wxSAVE", wxSAVE }, --- 1628,1634 ---- *************** *** 1625,1630 **** { "wxSTRETCH_NOT", wxSTRETCH_NOT }, { "wxTOP", wxTOP }, - { "wxUNIX", wxUNIX }, - { "wxUNKNOWN_PLATFORM", wxUNKNOWN_PLATFORM }, { "wxUP", wxUP }, { "wxUPDATE_UI_FROMIDLE", wxUPDATE_UI_FROMIDLE }, --- 1638,1641 ---- *************** *** 1635,1647 **** { "wxVERTICAL", wxVERTICAL }, { "wxWEST", wxWEST }, - { "wxWIN32S", wxWIN32S }, - { "wxWIN386", wxWIN386 }, - { "wxWIN95", wxWIN95 }, - { "wxWINDOWS", wxWINDOWS }, - { "wxWINDOWS_CE", wxWINDOWS_CE }, - { "wxWINDOWS_NT", wxWINDOWS_NT }, - { "wxWINDOWS_OS2", wxWINDOWS_OS2 }, - { "wxWINDOWS_POCKETPC", wxWINDOWS_POCKETPC }, - { "wxWINDOWS_SMARTPHONE", wxWINDOWS_SMARTPHONE }, { "wxWINDOW_VARIANT_LARGE", wxWINDOW_VARIANT_LARGE }, { "wxWINDOW_VARIANT_MAX", wxWINDOW_VARIANT_MAX }, --- 1646,1649 ---- *************** *** 1649,1654 **** { "wxWINDOW_VARIANT_NORMAL", wxWINDOW_VARIANT_NORMAL }, { "wxWINDOW_VARIANT_SMALL", wxWINDOW_VARIANT_SMALL }, - { "wxX11", wxX11 }, - { "wxXVIEW_X", wxXVIEW_X }, #if WXWIN_COMPATIBILITY_2_4 --- 1651,1654 ---- |
|
From: John L. <jr...@us...> - 2006-08-24 05:12:31
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15690/wxLua/bindings/wxwidgets Modified Files: defsutil.i html.i Log Message: update bindings to 2.7 Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** defsutil.i 9 Jun 2006 22:51:30 -0000 1.26 --- defsutil.i 24 Aug 2006 05:12:27 -0000 1.27 *************** *** 121,124 **** --- 121,125 ---- // Network, user, and OS functions + %if !%wxchkver27 %enum wxUNKNOWN_PLATFORM *************** *** 158,161 **** --- 159,163 ---- wxDOS %endenum + %endif // !%wxchkver27 // !%wxchkver27 %function long wxGetFreeMemory() FIXME need to add wxLongLong - maybe always return longlong here? *************** *** 473,477 **** %define wxINVERT %define wxMORE - %define wxMOTIF_X %define wxNO %define wxNO_BORDER --- 475,478 ---- *************** *** 496,502 **** %define wxUNKNOWN_PLATFORM //%define wxUSER_COLOURS deprecated use wxNO_3D - %define wxWINDOWS %define wxWS_EX_VALIDATE_RECURSIVELY - %define wxXVIEW_X %define wxYES %define wxYES_DEFAULT --- 497,501 ---- Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** html.i 12 Jun 2006 03:50:36 -0000 1.9 --- html.i 24 Aug 2006 05:12:27 -0000 1.10 *************** *** 262,266 **** wxColour GetLinkColor() const //wxFontEncoding GetOutputEncoding() const ! wxWindow* GetWindow() wxHtmlContainerCell* OpenContainer() void SetActualColor(const wxColour& clr) --- 262,266 ---- wxColour GetLinkColor() const //wxFontEncoding GetOutputEncoding() const ! !%wxchkver27 wxWindow* GetWindow() wxHtmlContainerCell* OpenContainer() void SetActualColor(const wxColour& clr) *************** *** 279,283 **** void SetLinkColor(const wxColour& clr) ! %property=Window, read %property=ActualColor, read, write %property=Align, read, write --- 279,283 ---- void SetLinkColor(const wxColour& clr) ! !%wxchkver27 %property=Window, read %property=ActualColor, read, write %property=Align, read, write |
|
From: John L. <jr...@us...> - 2006-08-23 04:57:59
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18179/wxLua/bindings/wxwidgets Modified Files: appframe.i windows.i Log Message: update for wxWidgets 2.7, Get/SetDefaultItem is now in toplevel not in window update wxluaedit for wxstedit 1.2.3 Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** windows.i 12 Jun 2006 02:48:09 -0000 1.20 --- windows.i 23 Aug 2006 04:57:52 -0000 1.21 *************** *** 128,131 **** --- 128,132 ---- wxCursor GetCursor() const //virtual wxVisualAttributes GetDefaultAttributes() const + !%wxchkver27 wxWindow* GetDefaultItem() const wxDropTarget* GetDropTarget() const wxEvtHandler* GetEventHandler() const *************** *** 218,221 **** --- 219,223 ---- virtual void SetCursor(const wxCursor& cursor) !%wxchkver26 void SetConstraints(wxLayoutConstraints* constraints) + !%wxchkver27 wxWindow* SetDefaultItem(wxWindow *win) // virtual void SetInitialBestSize(const wxSize& size) protected void SetMaxSize(const wxSize& size) *************** *** 277,280 **** --- 279,283 ---- %property=ClientSize, read, write %property=Constraints, read, write + !%wxchkver27 %property=DefaultItem, read, write %property=DropTarget, read, write %property=EventHandler, read, write *************** *** 316,326 **** bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "wxPanel") ! wxWindow* GetDefaultItem() const void InitDialog() ! void SetDefaultItem(wxButton *btn) //virtual void SetFocus() - see wxWindow virtual void SetFocusIgnoringChildren() - - %property=DefaultItem, read, write %endclass --- 319,327 ---- bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "wxPanel") ! //!%wxchkver27 wxWindow* GetDefaultItem() const - see wxWindow void InitDialog() ! //!%wxchkver27 wxWindow* SetDefaultItem(wxWindow *win) - see wxWindow //virtual void SetFocus() - see wxWindow virtual void SetFocusIgnoringChildren() %endclass Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** appframe.i 26 May 2006 03:19:51 -0000 1.19 --- appframe.i 23 Aug 2006 04:57:52 -0000 1.20 *************** *** 97,103 **** --- 97,105 ---- // No constructors, virtual base class, use wxFrame or wxDialog + %wxchkver27 wxWindow* GetDefaultItem() const wxIcon GetIcon() const //const wxIconBundle& GetIcons() const wxString GetTitle() const + %wxchkver27 wxWindow* GetTmpDefaultItem() const bool IsActive() const void Iconize(bool iconize) *************** *** 107,110 **** --- 109,113 ---- void Maximize(bool maximize) void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) + %wxchkver27 wxWindow* SetDefaultItem(wxWindow *win) void SetIcon(const wxIcon& icon) //void SetIcons(const wxIconBundle& icons) *************** *** 113,118 **** --- 116,124 ---- bool SetShape(const wxRegion& region) virtual void SetTitle(const wxString& title) + %wxchkver27 wxWindow* SetTmpDefaultItem(wxWindow *win) %win bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) + %wxchkver27 %property=DefaultItem, read, write + %wxchkver27 %property=TmpDefaultItem, read, write %property=Title, read, write %endclass |
|
From: John L. <jr...@us...> - 2006-08-23 04:57:59
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18179/wxLua/apps/wxluaedit/src Modified Files: wxluaedit.cpp Log Message: update for wxWidgets 2.7, Get/SetDefaultItem is now in toplevel not in window update wxluaedit for wxstedit 1.2.3 Index: wxluaedit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxluaedit.cpp 9 Jun 2006 03:24:49 -0000 1.19 --- wxluaedit.cpp 23 Aug 2006 04:57:52 -0000 1.20 *************** *** 243,248 **** #if wxCHECK_STE_VERSION(1,2,2) ! m_fileTreeCtrl = new wxTreeCtrl(m_sideNotebook, ID_STF_FILETREECTRL, ! wxDefaultPosition, wxDefaultSize, wxTR_SINGLE|wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT ); m_fileTreeCtrl->SetIndent(5); m_fileTreeCtrl->AddRoot(wxT("Files")); --- 243,253 ---- #if wxCHECK_STE_VERSION(1,2,2) ! #if wxCHECK_STE_VERSION(1,2,3) ! m_fileTreeCtrl = new wxTreeCtrl(m_sideNotebook, ID_STF_FILE_TREECTRL, ! wxDefaultPosition, wxDefaultSize, wxTR_SINGLE|wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT ); ! #else ! m_fileTreeCtrl = new wxTreeCtrl(m_sideNotebook, ID_STF_FILETREECTRL, ! wxDefaultPosition, wxDefaultSize, wxTR_SINGLE|wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT ); ! #endif m_fileTreeCtrl->SetIndent(5); m_fileTreeCtrl->AddRoot(wxT("Files")); |
|
From: John L. <jr...@us...> - 2006-08-23 04:57:59
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18179/wxLua/modules/wxbind/src Modified Files: appframe.cpp windows.cpp Log Message: update for wxWidgets 2.7, Get/SetDefaultItem is now in toplevel not in window update wxluaedit for wxstedit 1.2.3 Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** windows.cpp 12 Jun 2006 02:48:09 -0000 1.25 --- windows.cpp 23 Aug 2006 04:57:52 -0000 1.26 *************** *** 278,281 **** --- 278,296 ---- } + // !%wxchkver27 wxWindow* GetDefaultItem() const + static int LUACALL wxLua_wxWindow_GetDefaultItem(lua_State *L) + { + wxLuaState wxlState(L); + wxWindow *returns; + // get this + wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call GetDefaultItem + returns = self->GetDefaultItem(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); + + return 1; + } + // !%wxchkver27 virtual wxString GetTitle() static int LUACALL wxLua_wxWindow_GetTitle(lua_State *L) *************** *** 293,296 **** --- 308,328 ---- } + // !%wxchkver27 wxWindow* SetDefaultItem(wxWindow *win) + static int LUACALL wxLua_wxWindow_SetDefaultItem(lua_State *L) + { + wxLuaState wxlState(L); + wxWindow *returns; + // wxWindow win + wxWindow * win = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); + // get this + wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call SetDefaultItem + returns = self->SetDefaultItem(win); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); + + return 1; + } + // !%wxchkver27 virtual void SetTitle(const wxString& title) static int LUACALL wxLua_wxWindow_SetTitle(lua_State *L) *************** *** 3416,3421 **** --- 3448,3457 ---- { LuaMethod, "CenterOnScreen", wxLua_wxWindow_CenterOnScreen, 1, 0, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "CentreOnScreen", wxLua_wxWindow_CentreOnScreen, 1, 0, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "GetDefaultItem", wxLua_wxWindow_GetDefaultItem, 0, 0, { 0 } }, { LuaMethod, "GetTitle", wxLua_wxWindow_GetTitle, 0, 0, { 0 } }, + { LuaMethod, "SetDefaultItem", wxLua_wxWindow_SetDefaultItem, 1, 1, { &s_wxluatag_wxWindow, 0 } }, { LuaMethod, "SetTitle", wxLua_wxWindow_SetTitle, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaGetProp, "DefaultItem", wxLua_wxWindow_GetDefaultItem, 0, 0, {0} }, + { LuaSetProp, "DefaultItem", wxLua_wxWindow_SetDefaultItem, 1, 1, {0} }, { LuaGetProp, "Title", wxLua_wxWindow_GetTitle, 0, 0, {0} }, { LuaSetProp, "Title", wxLua_wxWindow_SetTitle, 1, 1, {0} }, *************** *** 3820,3838 **** } - // wxWindow* GetDefaultItem() const - static int LUACALL wxLua_wxPanel_GetDefaultItem(lua_State *L) - { - wxLuaState wxlState(L); - wxWindow *returns; - // get this - wxPanel * self = (wxPanel *)wxlState.GetUserDataType(1, s_wxluatag_wxPanel); - // call GetDefaultItem - returns = self->GetDefaultItem(); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); - - return 1; - } - // void InitDialog() static int LUACALL wxLua_wxPanel_InitDialog(lua_State *L) --- 3856,3859 ---- *************** *** 3865,3886 **** - #if wxLUA_USE_wxButton - // void SetDefaultItem(wxButton *btn) - static int LUACALL wxLua_wxPanel_SetDefaultItem(lua_State *L) - { - wxLuaState wxlState(L); - // wxButton btn - wxButton * btn = (wxButton *)wxlState.GetUserDataType(2, s_wxluatag_wxButton); - // get this - wxPanel * self = (wxPanel *)wxlState.GetUserDataType(1, s_wxluatag_wxPanel); - // call SetDefaultItem - self->SetDefaultItem(btn); - - return 0; - } - - #endif // wxLUA_USE_wxButton - - #if wxLUA_USE_wxPointSizeRect // wxPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "wxPanel") --- 3886,3889 ---- *************** *** 3952,3967 **** static WXLUAMETHOD s_wxPanel_methods[] = { { LuaConstructor, "wxPanelDefault", wxLua_wxPanelDefault_constructor, 0, 0, { 0 } }, - { LuaMethod, "GetDefaultItem", wxLua_wxPanel_GetDefaultItem, 0, 0, { 0 } }, { LuaMethod, "InitDialog", wxLua_wxPanel_InitDialog, 0, 0, { 0 } }, { LuaMethod, "SetFocusIgnoringChildren", wxLua_wxPanel_SetFocusIgnoringChildren, 0, 0, { 0 } }, - { LuaGetProp, "DefaultItem", wxLua_wxPanel_GetDefaultItem, 0, 0, {0} }, - { LuaSetProp, "DefaultItem", wxLua_wxPanel_SetDefaultItem, 1, 1, {0} }, { LuaDelete, "wxPanel", wxLua_wxPanel_destructor, 0, 0, {0} }, - #if wxLUA_USE_wxButton - { LuaMethod, "SetDefaultItem", wxLua_wxPanel_SetDefaultItem, 1, 1, { &s_wxluatag_wxButton, 0 } }, - #endif // wxLUA_USE_wxButton - - #if wxLUA_USE_wxPointSizeRect { LuaConstructor, "wxPanel", wxLua_wxPanel_constructor, 6, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, --- 3955,3962 ---- Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** appframe.cpp 9 Jun 2006 22:51:31 -0000 1.21 --- appframe.cpp 23 Aug 2006 04:57:52 -0000 1.22 *************** *** 417,420 **** --- 417,488 ---- + #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog) + // %wxchkver27 wxWindow* GetDefaultItem() const + static int LUACALL wxLua_wxTopLevelWindow_GetDefaultItem(lua_State *L) + { + wxLuaState wxlState(L); + wxWindow *returns; + // get this + wxTopLevelWindow * self = (wxTopLevelWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxTopLevelWindow); + // call GetDefaultItem + returns = self->GetDefaultItem(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); + + return 1; + } + + // %wxchkver27 wxWindow* GetTmpDefaultItem() const + static int LUACALL wxLua_wxTopLevelWindow_GetTmpDefaultItem(lua_State *L) + { + wxLuaState wxlState(L); + wxWindow *returns; + // get this + wxTopLevelWindow * self = (wxTopLevelWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxTopLevelWindow); + // call GetTmpDefaultItem + returns = self->GetTmpDefaultItem(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); + + return 1; + } + + // %wxchkver27 wxWindow* SetDefaultItem(wxWindow *win) + static int LUACALL wxLua_wxTopLevelWindow_SetDefaultItem(lua_State *L) + { + wxLuaState wxlState(L); + wxWindow *returns; + // wxWindow win + wxWindow * win = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); + // get this + wxTopLevelWindow * self = (wxTopLevelWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxTopLevelWindow); + // call SetDefaultItem + returns = self->SetDefaultItem(win); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); + + return 1; + } + + // %wxchkver27 wxWindow* SetTmpDefaultItem(wxWindow *win) + static int LUACALL wxLua_wxTopLevelWindow_SetTmpDefaultItem(lua_State *L) + { + wxLuaState wxlState(L); + wxWindow *returns; + // wxWindow win + wxWindow * win = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); + // get this + wxTopLevelWindow * self = (wxTopLevelWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxTopLevelWindow); + // call SetTmpDefaultItem + returns = self->SetTmpDefaultItem(win); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); + + return 1; + } + + #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog) + + #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog) // wxIcon GetIcon() const *************** *** 623,626 **** --- 691,706 ---- + #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog) + { LuaMethod, "GetDefaultItem", wxLua_wxTopLevelWindow_GetDefaultItem, 0, 0, { 0 } }, + { LuaMethod, "GetTmpDefaultItem", wxLua_wxTopLevelWindow_GetTmpDefaultItem, 0, 0, { 0 } }, + { LuaMethod, "SetDefaultItem", wxLua_wxTopLevelWindow_SetDefaultItem, 1, 1, { &s_wxluatag_wxWindow, 0 } }, + { LuaMethod, "SetTmpDefaultItem", wxLua_wxTopLevelWindow_SetTmpDefaultItem, 1, 1, { &s_wxluatag_wxWindow, 0 } }, + { LuaGetProp, "DefaultItem", wxLua_wxTopLevelWindow_GetDefaultItem, 0, 0, {0} }, + { LuaSetProp, "DefaultItem", wxLua_wxTopLevelWindow_SetDefaultItem, 1, 1, {0} }, + { LuaGetProp, "TmpDefaultItem", wxLua_wxTopLevelWindow_GetTmpDefaultItem, 0, 0, {0} }, + { LuaSetProp, "TmpDefaultItem", wxLua_wxTopLevelWindow_SetTmpDefaultItem, 1, 1, {0} }, + #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog) + + #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog) { LuaMethod, "GetIcon", wxLua_wxTopLevelWindow_GetIcon, 0, 0, { 0 } }, |
|
From: John L. <jr...@us...> - 2006-08-09 03:34:52
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6858/wxLua/build/autoconf Modified Files: configure.ac Log Message: fix configure to allow setting wxstedit path and lib name Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** configure.ac 21 May 2006 19:16:59 -0000 1.29 --- configure.ac 9 Aug 2006 03:34:48 -0000 1.30 *************** *** 234,238 **** if test $ac_cv_prog_stedit_set = "1"; then # add to the library to link to the wxStEdit lib ! WX_LIBS="-lstedit $WX_LIBS" else AM_SET_WXBUILD_STR --- 234,240 ---- if test $ac_cv_prog_stedit_set = "1"; then # add to the library to link to the wxStEdit lib ! #WX_LIBS="-lstedit $WX_LIBS" ! WX_LIBS="$wxstedit_lib $WX_LIBS" ! else AM_SET_WXBUILD_STR |
|
From: John L. <jr...@us...> - 2006-08-09 03:34:51
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6858/wxLua Modified Files: configure Log Message: fix configure to allow setting wxstedit path and lib name Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** configure 8 Aug 2006 22:54:36 -0000 1.38 --- configure 9 Aug 2006 03:34:48 -0000 1.39 *************** *** 882,885 **** --- 882,893 ---- --with-wx-exec-prefix=PREFIX Exec prefix where wxWidgets is installed (optional) + + --with-wxstedit-prefix=PATH + Prefix where wxStEdit is installed + eg. $PATH/include/wx/stedit/*.h (optional) + --with-wxstedit-lib=NAME + Specify directly the lib (and -L path) to link to + eg. -lstedit for shared lib (optional) + --with-motif Uses the wxMotif port (default is auto) --with-gtk Uses the wxGTK port (default is auto) *************** *** 1718,1721 **** --- 1726,1747 ---- wx_config_exec_prefix="" fi; + + # Check whether --with-wxstedit-prefix or --without-wxstedit-prefix was given. + if test "${with_wxstedit_prefix+set}" = set; then + withval="$with_wxstedit_prefix" + wxstedit_prefix="$withval" + else + wxstedit_prefix="" + fi; + + # Check whether --with-wxstedit-lib or --without-wxstedit-lib was given. + if test "${with_wxstedit_lib+set}" = set; then + withval="$with_wxstedit_lib" + wxstedit_lib="$withval" + else + # note an example libwx_gtk2ud_stedit-2.7.so, use "-lwx_gtk2ud_stedit-2.7" + wxstedit_lib="-lstedit" # probably will never exist, only a placeholder + fi; + # don't touch this macro *************** *** 4160,4173 **** fi - - - - - - - - - - if test "$wxWin" != 1; then --- 4186,4189 ---- *************** *** 4206,4230 **** { (exit 1); exit 1; }; } else ! true; fi ! WX_VERSION_FULL="$WX_VERSION" ! WX_VERSION_MAJOR=`echo $WX_VERSION | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` WX_VERSION_MINOR=`echo $WX_VERSION | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` WX_VERSION=$wx_config_major_version$wx_config_minor_version - - - if test "$DBG_CONFIGURE" = "1"; then echo "[dbg] WX_VERSION: $WX_VERSION" fi ! if test $WX_SHARED = "1"; then STATIC=0 elif test $WX_SHARED = "0"; then --- 4222,4243 ---- { (exit 1); exit 1; }; } else ! true; fi ! WX_VERSION_FULL="$WX_VERSION" ! WX_VERSION_MAJOR=`echo $WX_VERSION | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` WX_VERSION_MINOR=`echo $WX_VERSION | \ ! sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` WX_VERSION=$wx_config_major_version$wx_config_minor_version if test "$DBG_CONFIGURE" = "1"; then echo "[dbg] WX_VERSION: $WX_VERSION" fi ! if test $WX_SHARED = "1"; then STATIC=0 elif test $WX_SHARED = "0"; then *************** *** 4236,4500 **** if test $WX_VERSION -gt 26 ; then ! WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config) ! if test "$DBG_CONFIGURE" = "1"; then echo "[dbg] Using wx-config --selected_config" echo "[dbg] WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG" fi ! if test "$UNICODE" = "auto" ; then ! ! echo "$as_me:$LINENO: checking if wxWidgets was built with UNICODE enabled" >&5 ! echo $ECHO_N "checking if wxWidgets was built with UNICODE enabled... $ECHO_C" >&6 ! WX_UNICODE=$(expr "$WX_SELECTEDCONFIG" : ".*unicode.*") ! if test "$WX_UNICODE" != "0"; then ! WX_UNICODE=1 ! echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 ! : else - WX_UNICODE=0 - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 - : - fi - else - - WX_UNICODE=$UNICODE - fi if test "$DEBUG" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets was built in DEBUG mode" >&5 ! echo $ECHO_N "checking if wxWidgets was built in DEBUG mode... $ECHO_C" >&6 ! ! WX_DEBUG=$(expr "$WX_SELECTEDCONFIG" : ".*debug.*") if test "$WX_DEBUG" != "0"; then WX_DEBUG=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 : else WX_DEBUG=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_DEBUG=$DEBUG fi - if test "$STATIC" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets was built in STATIC mode" >&5 ! echo $ECHO_N "checking if wxWidgets was built in STATIC mode... $ECHO_C" >&6 ! ! WX_STATIC=$(expr "$WX_SELECTEDCONFIG" : ".*static.*") if test "$WX_STATIC" != "0"; then WX_STATIC=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 : else WX_STATIC=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_STATIC=$STATIC fi ! WX_PORT="unknown" if test "$GTKPORT" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets port is wxGTK" >&5 ! echo $ECHO_N "checking if wxWidgets port is wxGTK... $ECHO_C" >&6 ! ! WX_GTKPORT=$(expr "$WX_SELECTEDCONFIG" : ".*gtk.*") if test "$WX_GTKPORT" != "0"; then WX_GTKPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="gtk" else WX_GTKPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_GTKPORT=$GTKPORT fi - if test "$MOTIFPORT" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets port is wxMotif" >&5 ! echo $ECHO_N "checking if wxWidgets port is wxMotif... $ECHO_C" >&6 ! ! WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*") if test "$WX_MOTIFPORT" != "0"; then WX_MOTIFPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="motif" else WX_MOTIFPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_MOTIFPORT=$MOTIFPORT fi if test "$MACPORT" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets port is wxMac" >&5 ! echo $ECHO_N "checking if wxWidgets port is wxMac... $ECHO_C" >&6 ! ! WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*") if test "$WX_MACPORT" != "0"; then WX_MACPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="mac" else WX_MACPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_MACPORT=$MACPORT fi if test "$X11PORT" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets port is wxX11" >&5 ! echo $ECHO_N "checking if wxWidgets port is wxX11... $ECHO_C" >&6 ! ! WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*") if test "$WX_X11PORT" != "0"; then WX_X11PORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="x11" else WX_X11PORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_X11PORT=$X11PORT fi - if test "$MGLPORT" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets port is wxMGL" >&5 ! echo $ECHO_N "checking if wxWidgets port is wxMGL... $ECHO_C" >&6 ! ! WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*") if test "$WX_MGLPORT" != "0"; then WX_MGLPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="mgl" else WX_MGLPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_MGLPORT=$MGLPORT fi - if test "$MSWPORT" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets port is wxMSW" >&5 ! echo $ECHO_N "checking if wxWidgets port is wxMSW... $ECHO_C" >&6 ! ! WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*") if test "$WX_MSWPORT" != "0"; then WX_MSWPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="msw" else WX_MSWPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! ! WX_MSWPORT=$MSWPORT fi ! if test "$WX_PORT" = "gtk"; then ! TEMP=auto ! ! if test "$TEMP" = "auto" ; then ! ! echo "$as_me:$LINENO: checking if wxGTK uses GTK 2.x (instead of GTK 1.x)" >&5 ! echo $ECHO_N "checking if wxGTK uses GTK 2.x (instead of GTK 1.x)... $ECHO_C" >&6 ! WX_TEMP=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*") ! if test "$WX_TEMP" != "0"; then ! WX_TEMP=1 ! echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 ! WX_GTKPORT_VERSION=2 else ! WX_TEMP=0 ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! WX_GTKPORT_VERSION=1 fi - else - WX_TEMP=$TEMP fi - - fi else ! ! if test "$DBG_CONFIGURE" = "1"; then echo "Using WX_CPPFLAGS: $WX_CPPFLAGS" fi - if test "$UNICODE" = "auto" ; then --- 4249,4486 ---- if test $WX_VERSION -gt 26 ; then ! WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config) ! if test "$DBG_CONFIGURE" = "1"; then echo "[dbg] Using wx-config --selected_config" echo "[dbg] WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG" fi + if test "$UNICODE" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxWidgets was built with UNICODE enabled" >&5 ! echo $ECHO_N "checking if wxWidgets was built with UNICODE enabled... $ECHO_C" >&6 ! WX_UNICODE=$(expr "$WX_SELECTEDCONFIG" : ".*unicode.*") ! if test "$WX_UNICODE" != "0"; then ! WX_UNICODE=1 ! echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 ! : ! else ! WX_UNICODE=0 ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! : ! fi else + WX_UNICODE=$UNICODE + fi if test "$DEBUG" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets was built in DEBUG mode" >&5 + echo $ECHO_N "checking if wxWidgets was built in DEBUG mode... $ECHO_C" >&6 ! WX_DEBUG=$(expr "$WX_SELECTEDCONFIG" : ".*debug.*") if test "$WX_DEBUG" != "0"; then WX_DEBUG=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 : else WX_DEBUG=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_DEBUG=$DEBUG fi if test "$STATIC" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets was built in STATIC mode" >&5 + echo $ECHO_N "checking if wxWidgets was built in STATIC mode... $ECHO_C" >&6 ! WX_STATIC=$(expr "$WX_SELECTEDCONFIG" : ".*static.*") if test "$WX_STATIC" != "0"; then WX_STATIC=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 : else WX_STATIC=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_STATIC=$STATIC fi ! WX_PORT="unknown" if test "$GTKPORT" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets port is wxGTK" >&5 + echo $ECHO_N "checking if wxWidgets port is wxGTK... $ECHO_C" >&6 ! WX_GTKPORT=$(expr "$WX_SELECTEDCONFIG" : ".*gtk.*") if test "$WX_GTKPORT" != "0"; then WX_GTKPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="gtk" else WX_GTKPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_GTKPORT=$GTKPORT fi if test "$MOTIFPORT" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets port is wxMotif" >&5 + echo $ECHO_N "checking if wxWidgets port is wxMotif... $ECHO_C" >&6 ! WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*") if test "$WX_MOTIFPORT" != "0"; then WX_MOTIFPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="motif" else WX_MOTIFPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_MOTIFPORT=$MOTIFPORT fi if test "$MACPORT" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets port is wxMac" >&5 + echo $ECHO_N "checking if wxWidgets port is wxMac... $ECHO_C" >&6 ! WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*") if test "$WX_MACPORT" != "0"; then WX_MACPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="mac" else WX_MACPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_MACPORT=$MACPORT fi if test "$X11PORT" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets port is wxX11" >&5 + echo $ECHO_N "checking if wxWidgets port is wxX11... $ECHO_C" >&6 ! WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*") if test "$WX_X11PORT" != "0"; then WX_X11PORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="x11" else WX_X11PORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_X11PORT=$X11PORT fi if test "$MGLPORT" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets port is wxMGL" >&5 + echo $ECHO_N "checking if wxWidgets port is wxMGL... $ECHO_C" >&6 ! WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*") if test "$WX_MGLPORT" != "0"; then WX_MGLPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="mgl" else WX_MGLPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_MGLPORT=$MGLPORT fi if test "$MSWPORT" = "auto" ; then + echo "$as_me:$LINENO: checking if wxWidgets port is wxMSW" >&5 + echo $ECHO_N "checking if wxWidgets port is wxMSW... $ECHO_C" >&6 ! WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*") if test "$WX_MSWPORT" != "0"; then WX_MSWPORT=1 echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 WX_PORT="msw" else WX_MSWPORT=0 echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 : fi else ! WX_MSWPORT=$MSWPORT fi + if test "$WX_PORT" = "gtk"; then + TEMP=auto ! if test "$TEMP" = "auto" ; then ! echo "$as_me:$LINENO: checking if wxGTK uses GTK 2.x (instead of GTK 1.x)" >&5 ! echo $ECHO_N "checking if wxGTK uses GTK 2.x (instead of GTK 1.x)... $ECHO_C" >&6 ! WX_TEMP=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*") ! if test "$WX_TEMP" != "0"; then ! WX_TEMP=1 ! echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 ! WX_GTKPORT_VERSION=2 ! else ! WX_TEMP=0 ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! WX_GTKPORT_VERSION=1 ! fi else ! WX_TEMP=$TEMP fi fi else ! if test "$DBG_CONFIGURE" = "1"; then echo "Using WX_CPPFLAGS: $WX_CPPFLAGS" fi if test "$UNICODE" = "auto" ; then *************** *** 5802,5807 **** echo $ECHO_N "(cached) $ECHO_C" >&6 else - - SAVED_CPPFLAGS="$CPPFLAGS" SAVED_CXXFLAGS="$CXXFLAGS" --- 5788,5791 ---- *************** *** 5809,5827 **** SAVED_LIBS="$LIBS" ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! ! OLD_WXLIBS=$WX_LIBS ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS stc,$WX_ADDITIONAL_LIBS --libs)" ! LIBS="$LIBS $WX_LIBS" ! echo "$as_me:$LINENO: checking if wxSTC contrib is available" >&5 ! echo $ECHO_N "checking if wxSTC contrib is available... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 5793,5810 ---- SAVED_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! OLD_WXLIBS=$WX_LIBS ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS stc,$WX_ADDITIONAL_LIBS --libs)" ! LIBS="$LIBS $WX_LIBS" ! echo "$as_me:$LINENO: checking if wxSTC contrib is available" >&5 ! echo $ECHO_N "checking if wxSTC contrib is available... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext *************** *** 5869,5883 **** conftest$ac_exeext conftest.$ac_ext ! if test "$WXSTC_PRESENCE" = "1"; then ! echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 ! ac_cv_prog_stc_set=1 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! ac_cv_prog_stc_set=0 ! fi ! WX_LIBS=$OLD_WXLIBS CPPFLAGS="$SAVED_CPPFLAGS" --- 5852,5866 ---- conftest$ac_exeext conftest.$ac_ext ! if test "$WXSTC_PRESENCE" = "1"; then ! echo "$as_me:$LINENO: result: yes" >&5 ! echo "${ECHO_T}yes" >&6 ! ac_cv_prog_stc_set=1 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! ac_cv_prog_stc_set=0 ! fi ! WX_LIBS=$OLD_WXLIBS CPPFLAGS="$SAVED_CPPFLAGS" *************** *** 5886,5890 **** LIBS="$SAVED_LIBS" - fi --- 5869,5872 ---- *************** *** 5893,5897 **** # add to the library to link to the wxSTC lib ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS stc,$WX_ADDITIONAL_LIBS --libs)" else --- 5875,5879 ---- # add to the library to link to the wxSTC lib ! WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS stc,$WX_ADDITIONAL_LIBS --libs)" else *************** *** 5968,6002 **** minversion="1.2.0" ! major=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\1/'` ! minor=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\2/'` ! release=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\3/'` ! ! majsym="STE_""MAJOR""_VERSION" ! minsym="STE_""MINOR""_VERSION" ! relsym="STE_""RELEASE""_VERSION" ! ! COMPCHECK_MSG="if wxStEdit (version >= $minversion) is available" ! SAVED_CPPFLAGS="$CPPFLAGS" ! SAVED_CXXFLAGS="$CXXFLAGS" ! SAVED_CFLAGS="$CFLAGS" ! SAVED_LIBS="$LIBS" ! CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" ! CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! CXXFLAGS="-I$WXSTEDIT/include $CXXFLAGS" ! LIBS="$LIBS -lstedit $WX_LIBS" ! if test -z "$COMPCHECK_MSG"; then ! COMPCHECK_MSG="if wxStEdit is available" ! fi ! echo "$as_me:$LINENO: checking $COMPCHECK_MSG" >&5 ! echo $ECHO_N "checking $COMPCHECK_MSG... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 5950,5984 ---- minversion="1.2.0" + major=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\1/'` + minor=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\2/'` + release=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\3/'` ! majsym="STE_""MAJOR""_VERSION" ! minsym="STE_""MINOR""_VERSION" ! relsym="STE_""RELEASE""_VERSION" + COMPCHECK_MSG="if wxStEdit (version >= $minversion) is available" ! SAVED_CPPFLAGS="$CPPFLAGS" ! SAVED_CXXFLAGS="$CXXFLAGS" ! SAVED_CFLAGS="$CFLAGS" ! SAVED_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + if test "x$wxstedit_prefix" != x ; then + CXXFLAGS="-I$wxstedit_prefix/include $CXXFLAGS" + fi ! LIBS="$LIBS $wxstedit_lib $WX_LIBS" ! if test -z "$COMPCHECK_MSG"; then ! COMPCHECK_MSG="if wxStEdit is available" ! fi ! echo "$as_me:$LINENO: checking $COMPCHECK_MSG" >&5 ! echo $ECHO_N "checking $COMPCHECK_MSG... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext *************** *** 6007,6026 **** main () { ! wxSTEditor dummy; ! ! // version check ! #if defined($majsym) && defined($minsym) && defined($relsym) ! #if ($majsym > ($major) || \ ! ($majsym == ($major) && $minsym > ($minor)) || \ ! ($majsym == ($major) && $minsym == ($minor) && $relsym >= ($release))) ! // this component is recent enough ! #else ! #error wxStEdit is too old ! At least version $minversion is required ! #endif ! #else ! #error wxStEdit does not define its version symbols $majsym, $minsym, $relsym ! #endif ! ; return 0; --- 5989,6006 ---- main () { + wxSTEditor dummy; ! // version check ! #if defined($majsym) && defined($minsym) && defined($relsym) ! #if ($majsym > ($major) || \ ! ($majsym == ($major) && $minsym > ($minor)) || \ ! ($majsym == ($major) && $minsym == ($minor) && $relsym >= ($release))) ! // this component is recent enough ! #else ! #error wxStEdit is too old ! At least version $minversion is required ! #endif ! #else ! #error wxStEdit does not define its version symbols $majsym, $minsym, $relsym ! #endif ; return 0; *************** *** 6080,6084 **** if test $ac_cv_prog_stedit_set = "1"; then # add to the library to link to the wxStEdit lib ! WX_LIBS="-lstedit $WX_LIBS" else --- 6060,6065 ---- if test $ac_cv_prog_stedit_set = "1"; then # add to the library to link to the wxStEdit lib ! WX_LIBS="$wxstedit_lib $WX_LIBS" ! CXXFLAGS="-I$wxstedit_prefix/include $CXXFLAGS" else |
|
From: John L. <jr...@us...> - 2006-08-09 03:34:51
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6858/wxLua/apps Modified Files: Makefile.in Log Message: fix configure to allow setting wxstedit path and lib name Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** Makefile.in 21 May 2006 09:55:23 -0000 1.41 --- Makefile.in 9 Aug 2006 03:34:48 -0000 1.42 *************** *** 40,44 **** ### Variables: ### ! DESTDIR = APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(top_srcdir)/apps/../modules/lua/include $(WX_CFLAGS) \ --- 40,44 ---- ### Variables: ### ! DESTDIR = APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(top_srcdir)/apps/../modules/lua/include $(WX_CFLAGS) \ *************** *** 172,176 **** $(STRIP) $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! clean: rm -rf ./.deps ./.pch rm -f ./*.o --- 172,176 ---- $(STRIP) $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! clean: rm -rf ./.deps ./.pch rm -f ./*.o *************** *** 187,262 **** $(top_builddir)bin/wxlua-lua$(EXEEXT): $(APP_LUA_OBJECTS) $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lm -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) ! $(__app_lua___mac_setfilecmd) ! install_app_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_lua: rm -f $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) $(top_builddir)bin/lua5.1$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lm -llua5.1 ! $(__app_verbatimlua___mac_setfilecmd) ! install_app_verbatimlua: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(top_builddir)bin/lua5.1$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_verbatimlua: rm -f $(DESTDIR)$(bindir)/lua5.1$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___os2_emxbindcmd) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@install_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@uninstall_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lstedit $(WX_LIBS) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___os2_emxbindcmd) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@install_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) @COND_USE_WXLUACANAPP_1@$(top_builddir)bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___os2_emxbindcmd) ! @COND_USE_WXLUACANAPP_1@install_app_wxluacan: @COND_USE_WXLUACANAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXLUACANAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluacan$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXLUACANAPP_1@uninstall_app_wxluacan: @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___os2_emxbindcmd) ! @COND_USE_WXLUAFREEZEAPP_1@install_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluafreeze$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAFREEZEAPP_1@uninstall_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) --- 187,262 ---- $(top_builddir)bin/wxlua-lua$(EXEEXT): $(APP_LUA_OBJECTS) $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lm -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) ! $(__app_lua___mac_setfilecmd) ! install_app_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_lua: rm -f $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) $(top_builddir)bin/lua5.1$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lm -llua5.1 ! $(__app_verbatimlua___mac_setfilecmd) ! install_app_verbatimlua: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(top_builddir)bin/lua5.1$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_verbatimlua: rm -f $(DESTDIR)$(bindir)/lua5.1$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___os2_emxbindcmd) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@install_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@uninstall_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___os2_emxbindcmd) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@install_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) @COND_USE_WXLUACANAPP_1@$(top_builddir)bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___os2_emxbindcmd) ! @COND_USE_WXLUACANAPP_1@install_app_wxluacan: @COND_USE_WXLUACANAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXLUACANAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluacan$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXLUACANAPP_1@uninstall_app_wxluacan: @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___os2_emxbindcmd) ! @COND_USE_WXLUAFREEZEAPP_1@install_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluafreeze$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAFREEZEAPP_1@uninstall_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) |
|
From: John L. <jr...@us...> - 2006-08-08 22:54:44
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20786/wxLua/bindings/wxwidgets Modified Files: wx_rules.lua Log Message: more small compilation fixes for gcc in MSW (cygwin) Index: wx_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_rules.lua,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wx_rules.lua 7 Aug 2006 21:17:12 -0000 1.21 --- wx_rules.lua 8 Aug 2006 22:54:37 -0000 1.22 *************** *** 119,123 **** "wxCursor* wxLua_wxCROSS_CURSOR = NULL;\n".. "\n".. ! "#ifdef __MINGW32__ // dll creation fix\n".. " const wxPoint wxDefaultPositionHack = wxDefaultPosition;\n".. " const wxSize wxDefaultSizeHack = wxDefaultSize;\n".. --- 119,124 ---- "wxCursor* wxLua_wxCROSS_CURSOR = NULL;\n".. "\n".. ! "#if defined(__MINGW32__) || defined(__GNUWIN32__)\n".. ! " // FIX: \"internal compiler error: output_operand: invalid expression as operand\"\n".. " const wxPoint wxDefaultPositionHack = wxDefaultPosition;\n".. " const wxSize wxDefaultSizeHack = wxDefaultSize;\n".. |
|
From: John L. <jr...@us...> - 2006-08-08 22:54:42
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20786/wxLua/modules/wxbind/src Modified Files: wx_bind.cpp Log Message: more small compilation fixes for gcc in MSW (cygwin) Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** wx_bind.cpp 7 Aug 2006 21:17:12 -0000 1.51 --- wx_bind.cpp 8 Aug 2006 22:54:37 -0000 1.52 *************** *** 61,65 **** wxCursor* wxLua_wxCROSS_CURSOR = NULL; ! #ifdef __MINGW32__ // dll creation fix const wxPoint wxDefaultPositionHack = wxDefaultPosition; const wxSize wxDefaultSizeHack = wxDefaultSize; --- 61,66 ---- wxCursor* wxLua_wxCROSS_CURSOR = NULL; ! #if defined(__MINGW32__) || defined(__GNUWIN32__) ! // FIX: "internal compiler error: output_operand: invalid expression as operand" const wxPoint wxDefaultPositionHack = wxDefaultPosition; const wxSize wxDefaultSizeHack = wxDefaultSize; |
|
From: John L. <jr...@us...> - 2006-08-08 22:54:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20786/wxLua/modules/wxluadebug/src Modified Files: splttree.cpp Log Message: more small compilation fixes for gcc in MSW (cygwin) Index: splttree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** splttree.cpp 8 Aug 2006 03:25:25 -0000 1.13 --- splttree.cpp 8 Aug 2006 22:54:38 -0000 1.14 *************** *** 38,52 **** #ifdef __WXMSW__ ! #include <windows.h> ! #include "wx/msw/winundef.h" ! #endif #include "wxluadebug/include/splttree.h" #include <math.h> - #if defined(__MINGW32__) && defined(UNREFERENCED_PARAMETER) - #undef UNREFERENCED_PARAMETER - #endif // __MINGW32__ - static wxTreeItemId defaultTreeItemId; --- 38,48 ---- #ifdef __WXMSW__ ! #include <windows.h> ! #include "wx/msw/winundef.h" ! #endif // __WXMSW__ #include "wxluadebug/include/splttree.h" #include <math.h> static wxTreeItemId defaultTreeItemId; *************** *** 259,263 **** #else # ifdef UNREFERENCED_PARAMETER ! UNREFERENCED_PARAMETER(dc); # endif #endif --- 255,259 ---- #else # ifdef UNREFERENCED_PARAMETER ! // UNREFERENCED_PARAMETER(dc); can't set dc = dc; # endif #endif |
|
From: John L. <jr...@us...> - 2006-08-08 22:54:41
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20786/wxLua Modified Files: configure Log Message: more small compilation fixes for gcc in MSW (cygwin) Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** configure 21 May 2006 19:16:58 -0000 1.37 --- configure 8 Aug 2006 22:54:36 -0000 1.38 *************** *** 5988,5992 **** CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! LIBS="$LIBS -lstedit $WX_LIBS" --- 5988,5992 ---- CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" ! CXXFLAGS="-I$WXSTEDIT/include $CXXFLAGS" LIBS="$LIBS -lstedit $WX_LIBS" |
|
From: John L. <jr...@us...> - 2006-08-08 22:54:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20786/wxLua/modules/wxluadebug/include Modified Files: wxldebug.h Log Message: more small compilation fixes for gcc in MSW (cygwin) Index: wxldebug.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxldebug.h 30 May 2006 22:56:29 -0000 1.17 --- wxldebug.h 8 Aug 2006 22:54:38 -0000 1.18 *************** *** 139,143 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaCheckStack { public: --- 139,143 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaCheckStack { public: |
|
From: John L. <jr...@us...> - 2006-08-08 03:25:28
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23873/modules/wxluadebug/src Modified Files: splttree.cpp Log Message: change #ifdef to #if defined(...) Index: splttree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** splttree.cpp 7 Aug 2006 21:17:12 -0000 1.12 --- splttree.cpp 8 Aug 2006 03:25:25 -0000 1.13 *************** *** 45,49 **** #include <math.h> ! #ifdef __MINGW32__ && defined(UNREFERENCED_PARAMETER) #undef UNREFERENCED_PARAMETER #endif // __MINGW32__ --- 45,49 ---- #include <math.h> ! #if defined(__MINGW32__) && defined(UNREFERENCED_PARAMETER) #undef UNREFERENCED_PARAMETER #endif // __MINGW32__ |
|
From: John L. <jr...@us...> - 2006-08-07 21:17:21
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31484/wxLua/modules/wxluadebug/src Modified Files: splttree.cpp Log Message: compilation fixes for mingw creating dlls Index: splttree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** splttree.cpp 15 May 2006 05:28:53 -0000 1.11 --- splttree.cpp 7 Aug 2006 21:17:12 -0000 1.12 *************** *** 45,48 **** --- 45,52 ---- #include <math.h> + #ifdef __MINGW32__ && defined(UNREFERENCED_PARAMETER) + #undef UNREFERENCED_PARAMETER + #endif // __MINGW32__ + static wxTreeItemId defaultTreeItemId; |
|
From: John L. <jr...@us...> - 2006-08-07 21:17:21
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31484/wxLua/bindings/wxwidgets Modified Files: wx_rules.lua Log Message: compilation fixes for mingw creating dlls Index: wx_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_rules.lua,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wx_rules.lua 21 Jun 2006 03:58:02 -0000 1.20 --- wx_rules.lua 7 Aug 2006 21:17:12 -0000 1.21 *************** *** 83,86 **** --- 83,87 ---- -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = + "// wxWidgets >= 2.7 doesn't have static versions of stock GDI objects anymore\n".. "wxColour* wxLua_wxBLACK = NULL;\n".. "wxColour* wxLua_wxWHITE = NULL;\n".. *************** *** 116,120 **** "wxCursor* wxLua_wxSTANDARD_CURSOR = NULL;\n".. "wxCursor* wxLua_wxHOURGLASS_CURSOR = NULL;\n".. ! "wxCursor* wxLua_wxCROSS_CURSOR = NULL;\n" --============================================================================= --- 117,128 ---- "wxCursor* wxLua_wxSTANDARD_CURSOR = NULL;\n".. "wxCursor* wxLua_wxHOURGLASS_CURSOR = NULL;\n".. ! "wxCursor* wxLua_wxCROSS_CURSOR = NULL;\n".. ! "\n".. ! "#ifdef __MINGW32__ // dll creation fix\n".. ! " const wxPoint wxDefaultPositionHack = wxDefaultPosition;\n".. ! " const wxSize wxDefaultSizeHack = wxDefaultSize;\n".. ! " #define wxDefaultPosition wxDefaultPositionHack\n".. ! " #define wxDefaultSize wxDefaultSizeHack\n".. ! "#endif //__MINGW32__ \n" --============================================================================= |
|
From: John L. <jr...@us...> - 2006-08-07 21:17:21
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31484/wxLua/modules/wxbind/src Modified Files: wx_bind.cpp Log Message: compilation fixes for mingw creating dlls Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** wx_bind.cpp 21 Jun 2006 03:58:02 -0000 1.50 --- wx_bind.cpp 7 Aug 2006 21:17:12 -0000 1.51 *************** *** 25,28 **** --- 25,29 ---- #endif + // wxWidgets >= 2.7 doesn't have static versions of stock GDI objects anymore wxColour* wxLua_wxBLACK = NULL; wxColour* wxLua_wxWHITE = NULL; *************** *** 60,63 **** --- 61,71 ---- wxCursor* wxLua_wxCROSS_CURSOR = NULL; + #ifdef __MINGW32__ // dll creation fix + const wxPoint wxDefaultPositionHack = wxDefaultPosition; + const wxSize wxDefaultSizeHack = wxDefaultSize; + #define wxDefaultPosition wxDefaultPositionHack + #define wxDefaultSize wxDefaultSizeHack + #endif //__MINGW32__ + // ---------------------------------------------------------------------------- // wxLuaGetEventList_wx() is called to register events |
|
From: John L. <jr...@us...> - 2006-08-02 04:13:46
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1613/wxLua/docs Modified Files: changelog.txt Log Message: fix wxSocketBase::ReadMsg for reading less than specified number of bytes Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** changelog.txt 20 Jul 2006 16:17:37 -0000 1.14 --- changelog.txt 2 Aug 2006 04:13:41 -0000 1.15 *************** *** 6,9 **** --- 6,10 ---- -------------------------------------------------------------------- + - Fixed wxSocketBase::ReadMsg for reading less bytes, Steve Kieu - Fixed unicode conversion in wx2lua and lua2wx, thanks Steve Kieu - Switched from lua 5.0 to lua 5.1, updated to 5.1.1 (6/11/06) |
|
From: John L. <jr...@us...> - 2006-08-02 04:13:46
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1613/wxLua/modules/wxbind/src Modified Files: socket.cpp Log Message: fix wxSocketBase::ReadMsg for reading less than specified number of bytes Index: socket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/socket.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** socket.cpp 9 Jun 2006 22:51:33 -0000 1.17 --- socket.cpp 2 Aug 2006 04:13:41 -0000 1.18 *************** *** 450,454 **** self->ReadMsg(buffer, nbytes); // return the number of parameters ! lua_pushlstring(L, (const char *)buffer, nbytes); free(buffer); return 1; --- 450,454 ---- self->ReadMsg(buffer, nbytes); // return the number of parameters ! lua_pushlstring(L, (const char *)buffer, self->LastCount()); // not nbytes since it may return less free(buffer); return 1; |
|
From: John L. <jr...@us...> - 2006-08-02 04:13:46
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1613/wxLua/bindings/wxwidgets Modified Files: override.hpp Log Message: fix wxSocketBase::ReadMsg for reading less than specified number of bytes Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** override.hpp 12 Jun 2006 03:50:36 -0000 1.51 --- override.hpp 2 Aug 2006 04:13:41 -0000 1.52 *************** *** 3921,3925 **** self->ReadMsg(buffer, nbytes); // return the number of parameters ! lua_pushlstring(L, (const char *)buffer, nbytes); free(buffer); return 1; --- 3921,3925 ---- self->ReadMsg(buffer, nbytes); // return the number of parameters ! lua_pushlstring(L, (const char *)buffer, self->LastCount()); // not nbytes since it may return less free(buffer); return 1; |
|
From: John L. <jr...@us...> - 2006-07-24 20:26:18
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21989/wxLua/bindings Modified Files: genwxbind.lua Log Message: made error messages more descriptive Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** genwxbind.lua 12 Jun 2006 03:50:35 -0000 1.75 --- genwxbind.lua 24 Jul 2006 20:26:10 -0000 1.76 *************** *** 61,72 **** ------------------------------------------------------------------------------- function CheckRules() ! assert(type(interface_filepath) == "string", "interface_filepath is not a string") ! assert(type(output_cpp_filepath) == "string", "output_cpp_filepath is not a string") ! assert(type(output_cpp_header_filepath) == "string", "output_cpp_header_filepath is not a string") ! assert(type(output_cpp_impexpsymbol) == "string", "output_cpp_impexpsymbol is not a string") ! assert(type(output_cpp_impexpdatasymbol) == "string", "output_cpp_impexpdatasymbol is not a string") ! assert(type(hook_lua_namespace) == "string", "hook_lua_namespace is not a string") ! assert(type(hook_cpp_namespace) == "string", "hook_cpp_namespace is not a string") end --- 61,72 ---- ------------------------------------------------------------------------------- function CheckRules() ! assert(type(interface_filepath) == "string", "Rules file ERROR: 'interface_filepath' is not a string") ! assert(type(output_cpp_filepath) == "string", "Rules file ERROR: 'output_cpp_filepath' is not a string") ! assert(type(output_cpp_header_filepath) == "string", "Rules file ERROR: 'output_cpp_header_filepath' is not a string") ! assert(type(output_cpp_impexpsymbol) == "string", "Rules file ERROR: 'output_cpp_impexpsymbol' is not a string") ! assert(type(output_cpp_impexpdatasymbol) == "string", "Rules file ERROR: 'output_cpp_impexpdatasymbol' is not a string") ! assert(type(hook_lua_namespace) == "string", "Rules file ERROR: 'hook_lua_namespace' is not a string") ! assert(type(hook_cpp_namespace) == "string", "Rules file ERROR: 'hook_cpp_namespace' is not a string") end |
|
From: John L. <jr...@us...> - 2006-07-20 16:17:41
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7443/wxLua/docs Modified Files: changelog.txt Log Message: fix unicode conversion wx2lua and lua2wx, thanks Steve Kieu Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** changelog.txt 12 Jun 2006 03:50:36 -0000 1.13 --- changelog.txt 20 Jul 2006 16:17:37 -0000 1.14 *************** *** 6,10 **** -------------------------------------------------------------------- ! - Switched from lua 5.0 to lua 5.1, updated to 5.1.1 (6/11/06) - All bindings for wxWidgets have been updated to 2.6.3 - Reordered bindings/wxwidgets/overrides.hpp to follow binding *.i files --- 6,11 ---- -------------------------------------------------------------------- ! - Fixed unicode conversion in wx2lua and lua2wx, thanks Steve Kieu ! - Switched from lua 5.0 to lua 5.1, updated to 5.1.1 (6/11/06) - All bindings for wxWidgets have been updated to 2.6.3 - Reordered bindings/wxwidgets/overrides.hpp to follow binding *.i files |
|
From: John L. <jr...@us...> - 2006-07-20 16:16:36
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6592/wxLua/modules/wxlua/include Modified Files: wxlstate.h Log Message: fix unicode conversion wx2lua and lua2wx, thanks Steve Kieu Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** wxlstate.h 6 Jun 2006 05:14:32 -0000 1.48 --- wxlstate.h 20 Jul 2006 16:16:32 -0000 1.49 *************** *** 62,69 **** inline WXDLLIMPEXP_WXLUA wxString lua2wx(const char* luastr) { ! if (luastr == NULL) ! return wxEmptyString; ! return wxConvertMB2WX(luastr); // this fails on NULL } --- 62,74 ---- inline WXDLLIMPEXP_WXLUA wxString lua2wx(const char* luastr) { ! if (luastr == NULL) return wxEmptyString; // check for NULL ! #if wxUSE_UNICODE ! return wxString(luastr, wxConvUTF8); ! #else ! return wxString(wxConvUTF8.cMB2WC(luastr), *wxConvCurrent); ! #endif // wxUSE_UNICODE ! ! //return wxConvertMB2WX(luastr); // old way that mostly works } *************** *** 71,75 **** inline const WXDLLIMPEXP_WXLUA wxCharBuffer wx2lua(const wxString& wxstr) { ! wxCharBuffer buffer(wxConvertWX2MB(wxstr.c_str())); return buffer; } --- 76,81 ---- inline const WXDLLIMPEXP_WXLUA wxCharBuffer wx2lua(const wxString& wxstr) { ! //wxCharBuffer buffer(wxConvertWX2MB(wxstr.c_str())); // old way that mostly works ! wxCharBuffer buffer(wxConvUTF8.cWC2MB(wxstr.wc_str(*wxConvCurrent))); // skieu return buffer; } *************** *** 81,86 **** wxLuaCharBuffer(const wxString &wxstr) : m_buffer((const char *)NULL) { ! wxCharBuffer charBuffer = wxConvertWX2MB(wxstr.c_str()); ! m_buffer = charBuffer; } --- 87,92 ---- wxLuaCharBuffer(const wxString &wxstr) : m_buffer((const char *)NULL) { ! //wxCharBuffer charBuffer = wxConvertWX2MB(wxstr.c_str()); ! m_buffer = wxCharBuffer(wxConvUTF8.cWC2MB(wxstr.wc_str(*wxConvCurrent))); // skieu } |
