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...> - 2011-06-10 03:08:10
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src
In directory vz-cvs-4.sog:/tmp/cvs-serv31813/modules/wxluadebug/src
Modified Files:
wxlstack.cpp
Log Message:
Allow copying whole row to the clipboard
Index: wxlstack.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** wxlstack.cpp 22 Dec 2009 22:57:02 -0000 1.36
--- wxlstack.cpp 10 Jun 2011 03:08:06 -0000 1.37
***************
*** 146,150 ****
if (!wxDialog::Create(parent, id, title, pos, size,
! wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxMAXIMIZE_BOX | wxRESIZE_BORDER))
return false;
--- 146,151 ----
if (!wxDialog::Create(parent, id, title, pos, size,
! wxDEFAULT_DIALOG_STYLE | wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxRESIZE_BORDER,
! wxT("wxLuaStackDialog")))
return false;
***************
*** 284,288 ****
m_listCtrl = new wxLuaStackListCtrl(this, m_splitterWin, ID_WXLUA_STACK_LISTCTRL,
wxDefaultPosition, wxDefaultSize,
! wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_HRULES|wxLC_VRULES|wxLC_VIRTUAL );
m_listCtrl->SetImageList(m_imageList, wxIMAGE_LIST_SMALL);
--- 285,289 ----
m_listCtrl = new wxLuaStackListCtrl(this, m_splitterWin, ID_WXLUA_STACK_LISTCTRL,
wxDefaultPosition, wxDefaultSize,
! wxLC_REPORT|wxLC_HRULES|wxLC_VRULES|wxLC_VIRTUAL ); // wxLC_SINGLE_SEL
m_listCtrl->SetImageList(m_imageList, wxIMAGE_LIST_SMALL);
***************
*** 307,315 ****
m_listMenu = new wxMenu(wxEmptyString, 0);
! m_listMenu->Append(ID_WXLUA_STACK_LISTMENU_COPY0, wxT("Copy name"), wxT("Copy name to clipboard"), wxITEM_NORMAL);
! m_listMenu->Append(ID_WXLUA_STACK_LISTMENU_COPY1, wxT("Copy level"), wxT("Copy level to clipboard"), wxITEM_NORMAL);
! m_listMenu->Append(ID_WXLUA_STACK_LISTMENU_COPY2, wxT("Copy key type"), wxT("Copy key type to clipboard"), wxITEM_NORMAL);
! m_listMenu->Append(ID_WXLUA_STACK_LISTMENU_COPY3, wxT("Copy value type"), wxT("Copy value type to clipboard"), wxITEM_NORMAL);
! m_listMenu->Append(ID_WXLUA_STACK_LISTMENU_COPY4, wxT("Copy value"), wxT("Copy value to clipboard"), wxITEM_NORMAL);
// -----------------------------------------------------------------------
--- 308,317 ----
m_listMenu = new wxMenu(wxEmptyString, 0);
! m_listMenu->Append(ID_WXLUA_STACK_LISTMENU_COPY_ROW, wxT("Copy row"), wxT("Copy whole row clipboard"), wxITEM_NORMAL);
! m_listMenu->Append(ID_WXLUA_STACK_LISTMENU_COPY_COL0, wxT("Copy name"), wxT("Copy name to clipboard"), wxITEM_NORMAL);
! m_listMenu->Append(ID_WXLUA_STACK_LISTMENU_COPY_COL1, wxT("Copy level"), wxT("Copy level to clipboard"), wxITEM_NORMAL);
! m_listMenu->Append(ID_WXLUA_STACK_LISTMENU_COPY_COL2, wxT("Copy key type"), wxT("Copy key type to clipboard"), wxITEM_NORMAL);
! m_listMenu->Append(ID_WXLUA_STACK_LISTMENU_COPY_COL3, wxT("Copy value type"), wxT("Copy value type to clipboard"), wxITEM_NORMAL);
! m_listMenu->Append(ID_WXLUA_STACK_LISTMENU_COPY_COL4, wxT("Copy value"), wxT("Copy value to clipboard"), wxITEM_NORMAL);
// -----------------------------------------------------------------------
***************
*** 329,333 ****
Maximize();
-
EnumerateStack();
--- 331,334 ----
***************
*** 821,839 ****
m_findMenu->Check(ID_WXLUA_STACK_FINDMENU_ALL, all_checked);
}
! else if ((id >= ID_WXLUA_STACK_LISTMENU_COPY0) && (id <= ID_WXLUA_STACK_LISTMENU_COPY4))
{
long list_item = m_listCtrl->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
! // they must select an item
! if (list_item >= 0)
{
! wxString s(GetItemText(list_item, id - ID_WXLUA_STACK_LISTMENU_COPY0, true));
!
! if (wxTheClipboard->Open())
{
! // These data objects are held by the clipboard,
! // so do not delete them in the app.
! wxTheClipboard->SetData( new wxTextDataObject(s) );
! wxTheClipboard->Close();
}
}
}
--- 822,856 ----
m_findMenu->Check(ID_WXLUA_STACK_FINDMENU_ALL, all_checked);
}
! else if ((id >= ID_WXLUA_STACK_LISTMENU_COPY_ROW) && (id <= ID_WXLUA_STACK_LISTMENU_COPY_COL4))
{
+ wxString s;
+
long list_item = m_listCtrl->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
! // iterate all selected items, separated by \n
! while (list_item >= 0)
{
! if (!s.IsEmpty()) s += wxT("\n");
!
! if (id == ID_WXLUA_STACK_LISTMENU_COPY_ROW)
{
! s += GetItemText(list_item, 0, true);
!
! for (int i = 1; i < LIST_COL__MAX; ++i)
! s += wxT("\t") + GetItemText(list_item, i, true);
! }
! else // ((id >= ID_WXLUA_STACK_LISTMENU_COPY_COL0) && (id <= ID_WXLUA_STACK_LISTMENU_COPY_COL4))
! {
! s += GetItemText(list_item, id - ID_WXLUA_STACK_LISTMENU_COPY_COL0, true);
}
+
+ list_item = m_listCtrl->GetNextItem(list_item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ }
+
+ if (wxTheClipboard->Open())
+ {
+ // These data objects are held by the clipboard,
+ // so do not delete them in the app.
+ wxTheClipboard->SetData( new wxTextDataObject(s) );
+ wxTheClipboard->Close();
}
}
|
|
From: John L. <jr...@us...> - 2011-06-10 03:08:08
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include
In directory vz-cvs-4.sog:/tmp/cvs-serv31813/modules/wxluadebug/include
Modified Files:
wxlstack.h
Log Message:
Allow copying whole row to the clipboard
Index: wxlstack.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxlstack.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wxlstack.h 23 Nov 2009 05:28:59 -0000 1.21
--- wxlstack.h 10 Jun 2011 03:08:06 -0000 1.22
***************
*** 44,52 ****
ID_WXLUA_STACK_TREECTRL,
! ID_WXLUA_STACK_LISTMENU_COPY0,
! ID_WXLUA_STACK_LISTMENU_COPY1,
! ID_WXLUA_STACK_LISTMENU_COPY2,
! ID_WXLUA_STACK_LISTMENU_COPY3,
! ID_WXLUA_STACK_LISTMENU_COPY4,
ID_WXLUA_STACK_FINDMENU_CASE,
--- 44,53 ----
ID_WXLUA_STACK_TREECTRL,
! ID_WXLUA_STACK_LISTMENU_COPY_ROW,
! ID_WXLUA_STACK_LISTMENU_COPY_COL0,
! ID_WXLUA_STACK_LISTMENU_COPY_COL1,
! ID_WXLUA_STACK_LISTMENU_COPY_COL2,
! ID_WXLUA_STACK_LISTMENU_COPY_COL3,
! ID_WXLUA_STACK_LISTMENU_COPY_COL4,
ID_WXLUA_STACK_FINDMENU_CASE,
|
|
From: John L. <jr...@us...> - 2011-05-11 04:24:15
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory vz-cvs-4.sog:/tmp/cvs-serv27889/bindings/wxwidgets
Modified Files:
wxadv_grid.i
Log Message:
%ungc the attrs, editors, and renderers set to a wxGrid
Index: wxadv_grid.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_grid.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxadv_grid.i 11 May 2011 04:08:23 -0000 1.6
--- wxadv_grid.i 11 May 2011 04:24:12 -0000 1.7
***************
*** 696,705 ****
void SetDefaultRenderer(%ungc wxGridCellRenderer *renderer)
! void SetCellRenderer(int row, int col, wxGridCellRenderer *renderer)
wxGridCellRenderer* GetDefaultRenderer() const
wxGridCellRenderer* GetCellRenderer(int row, int col)
void SetDefaultEditor(%ungc wxGridCellEditor *editor)
! void SetCellEditor(int row, int col, wxGridCellEditor *editor)
wxGridCellEditor* GetDefaultEditor() const
wxGridCellEditor* GetCellEditor(int row, int col)
--- 696,705 ----
void SetDefaultRenderer(%ungc wxGridCellRenderer *renderer)
! void SetCellRenderer(int row, int col, %ungc wxGridCellRenderer *renderer)
wxGridCellRenderer* GetDefaultRenderer() const
wxGridCellRenderer* GetCellRenderer(int row, int col)
void SetDefaultEditor(%ungc wxGridCellEditor *editor)
! void SetCellEditor(int row, int col, %ungc wxGridCellEditor *editor)
wxGridCellEditor* GetDefaultEditor() const
wxGridCellEditor* GetCellEditor(int row, int col)
***************
*** 739,743 ****
void SetSelectionForeground(const wxColour& c)
! void RegisterDataType(const wxString& typeName, wxGridCellRenderer* renderer, wxGridCellEditor* editor)
wxGridCellEditor* GetDefaultEditorForCell(int row, int col) const
//wxGridCellEditor* GetDefaultEditorForCell(const wxGridCellCoords& coords) const
--- 739,743 ----
void SetSelectionForeground(const wxColour& c)
! void RegisterDataType(const wxString& typeName, %ungc wxGridCellRenderer* renderer, %ungc wxGridCellEditor* editor)
wxGridCellEditor* GetDefaultEditorForCell(int row, int col) const
//wxGridCellEditor* GetDefaultEditorForCell(const wxGridCellCoords& coords) const
|
|
From: John L. <jr...@us...> - 2011-05-11 04:08:26
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory vz-cvs-4.sog:/tmp/cvs-serv24331/bindings/wxwidgets
Modified Files:
wxadv_grid.i wxadv_rules.lua
Log Message:
Only have the wxGridCellWorker::GetRef() function available for non-dll builds since
we wrote it and so it's not actually exported from the dll.
Index: wxadv_grid.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_grid.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxadv_grid.i 1 Oct 2009 04:21:00 -0000 1.5
--- wxadv_grid.i 11 May 2011 04:08:23 -0000 1.6
***************
*** 46,50 ****
--- 46,54 ----
void DecRef()
+ %if !defined(WXUSINGDLL)
+ // Getting the value of the ref count is only possible in non-dll
+ // wxWidgets library.
int GetRef() const // wxLua added function to help track if it needs to be refed
+ %endif
virtual void SetParameters(const wxString& params)
Index: wxadv_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_rules.lua,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxadv_rules.lua 20 Apr 2011 02:38:58 -0000 1.8
--- wxadv_rules.lua 11 May 2011 04:08:23 -0000 1.9
***************
*** 69,72 ****
--- 69,74 ----
#include "wx/window.h"
+ #ifndef WXUSINGDLL
+
// Hack to add accessor to get the ref count
#define wxGridCellWorkerDummyFriend wxGridCellWorkerDummyFriend; \
***************
*** 80,83 ****
--- 82,87 ----
#include "wx/grid.h"
+ #endif // WXUSINGDLL
+
]]
|
|
From: John L. <jr...@us...> - 2011-05-11 02:29:59
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory vz-cvs-4.sog:/tmp/cvs-serv9777/bindings/wxwidgets
Modified Files:
wxcore_image.i
Log Message:
Use .PHONY in bindings Makefile to always have it run.
Don't return *this in wxImageHistogram::iterator++
Index: wxcore_image.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_image.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxcore_image.i 1 Oct 2009 04:21:01 -0000 1.6
--- wxcore_image.i 11 May 2011 02:29:56 -0000 1.7
***************
*** 224,228 ****
// operator used to compare with wxImageHistogram::end() iterator
%operator bool operator==(const wxImageHistogram::iterator& other) const
! %operator wxImageHistogram::iterator& operator++()
%endclass
--- 224,230 ----
// operator used to compare with wxImageHistogram::end() iterator
%operator bool operator==(const wxImageHistogram::iterator& other) const
!
! //%operator wxImageHistogram::iterator& operator++() // it just returns *this
! %operator void operator++() // it's best if we don't return the iterator
%endclass
|
|
From: John L. <jr...@us...> - 2011-05-11 02:29:58
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory vz-cvs-4.sog:/tmp/cvs-serv9777/modules/wxbind/src
Modified Files:
wxcore_image.cpp
Log Message:
Use .PHONY in bindings Makefile to always have it run.
Don't return *this in wxImageHistogram::iterator++
Index: wxcore_image.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_image.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wxcore_image.cpp 1 Oct 2009 04:21:01 -0000 1.20
--- wxcore_image.cpp 11 May 2011 02:29:56 -0000 1.21
***************
*** 2300,2304 ****
static int LUACALL wxLua_wxImageHistogram_iterator_op_inc(lua_State *L);
static wxLuaBindCFunc s_wxluafunc_wxLua_wxImageHistogram_iterator_op_inc[1] = {{ wxLua_wxImageHistogram_iterator_op_inc, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxImageHistogram_iterator_op_inc }};
! // %operator wxImageHistogram::iterator& operator++()
static int LUACALL wxLua_wxImageHistogram_iterator_op_inc(lua_State *L)
{
--- 2300,2304 ----
static int LUACALL wxLua_wxImageHistogram_iterator_op_inc(lua_State *L);
static wxLuaBindCFunc s_wxluafunc_wxLua_wxImageHistogram_iterator_op_inc[1] = {{ wxLua_wxImageHistogram_iterator_op_inc, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxImageHistogram_iterator_op_inc }};
! // %operator void operator++() // it's best if we don't return the iterator
static int LUACALL wxLua_wxImageHistogram_iterator_op_inc(lua_State *L)
{
***************
*** 2306,2314 ****
wxImageHistogram::iterator * self = (wxImageHistogram::iterator *)wxluaT_getuserdatatype(L, 1, wxluatype_wxImageHistogram_iterator);
// call op_inc
! wxImageHistogram::iterator* returns = &((*self)++);
! // push the result datatype
! wxluaT_pushuserdatatype(L, returns, wxluatype_wxImageHistogram_iterator);
! return 1;
}
--- 2306,2312 ----
wxImageHistogram::iterator * self = (wxImageHistogram::iterator *)wxluaT_getuserdatatype(L, 1, wxluatype_wxImageHistogram_iterator);
// call op_inc
! (*self)++;
! return 0;
}
|
|
From: John L. <jr...@us...> - 2011-05-04 04:43:04
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory vz-cvs-4.sog:/tmp/cvs-serv5883/modules/wxbind/src
Modified Files:
wxbase_bind.cpp
Log Message:
Add wxLUASTATE_ROOTSTATE to wxLuaState from lua_State to always get the root
lua_State, even if called with a coroutine lua_State.
Used in wxLuaObject so that we can unref it from the parent.
Index: wxbase_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** wxbase_bind.cpp 21 Dec 2009 04:06:12 -0000 1.25
--- wxbase_bind.cpp 4 May 2011 04:43:02 -0000 1.26
***************
*** 1133,1137 ****
static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxGetEmailAddress[1] = {{ wxLua_function_wxGetEmailAddress, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }};
! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxGetEnv[] = { &wxluatype_TSTRING, &wxluatype_TSTRING, NULL };
// %override wxLua_function_wxGetEnv
// %function bool wxGetEnv(const wxString& var, wxString *value)
--- 1133,1137 ----
static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxGetEmailAddress[1] = {{ wxLua_function_wxGetEmailAddress, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }};
! static wxLuaArgType s_wxluatypeArray_wxLua_function_wxGetEnv[] = { &wxluatype_TSTRING, NULL };
// %override wxLua_function_wxGetEnv
// %function bool wxGetEnv(const wxString& var, wxString *value)
***************
*** 1149,1153 ****
}
! static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxGetEnv[1] = {{ wxLua_function_wxGetEnv, WXLUAMETHOD_CFUNCTION, 2, 2, s_wxluatypeArray_wxLua_function_wxGetEnv }};
--- 1149,1153 ----
}
! static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxGetEnv[1] = {{ wxLua_function_wxGetEnv, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_wxGetEnv }};
|
|
From: John L. <jr...@us...> - 2011-04-30 19:26:41
|
Update of /cvsroot/wxlua/wxLua In directory vz-cvs-4.sog:/tmp/cvs-serv15709 Modified Files: .cvsignore Log Message: Also ignore *.d for gcc Index: .cvsignore =================================================================== RCS file: /cvsroot/wxlua/wxLua/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 20 Nov 2005 11:40:15 -0000 1.1 --- .cvsignore 30 Apr 2011 19:26:39 -0000 1.2 *************** *** 3,4 **** --- 3,6 ---- bk-deps *.o + *.d + |
|
From: John L. <jr...@us...> - 2011-04-30 16:48:31
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory vz-cvs-4.sog:/tmp/cvs-serv7280/modules/wxlua/src
Modified Files:
wxlbind.cpp
Log Message:
Speedup complilation with Makefiles by exporting values to sub Makefiles
some cleanup in wxlbind.cpp
Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** wxlbind.cpp 27 Apr 2011 03:39:22 -0000 1.131
--- wxlbind.cpp 30 Apr 2011 16:48:28 -0000 1.132
***************
*** 88,93 ****
m_reference = LUA_NOREF;
}
! else if (!m_wxlState->IsClosing())
! wxPrintf(wxT("~wxLuaObject %d %d %d\n"), (int)m_reference, (int)m_wxlState->Ok(), (int)m_wxlState->IsClosing());
if (m_alloc_flag == wxLUAOBJECT_STRING)
--- 88,93 ----
m_reference = LUA_NOREF;
}
! //else if (!m_wxlState->IsClosing())
! // wxPrintf(wxT("~wxLuaObject %d %d %d\n"), (int)m_reference, (int)m_wxlState->Ok(), (int)m_wxlState->IsClosing());
if (m_alloc_flag == wxLUAOBJECT_STRING)
***************
*** 362,366 ****
int LUACALL wxlua_wxLuaBindClass__index(lua_State *L)
{
! // This function is called for the __index metable of the wxLua userdata
// for class instances.
--- 362,366 ----
int LUACALL wxlua_wxLuaBindClass__index(lua_State *L)
{
! // This function is called for the __index metatable of the wxLua userdata
// for class instances.
***************
*** 410,414 ****
wxLuaBindMethod* wxlMethod = wxLuaBinding::GetClassMethod(wxlClass, name, WXLUAMETHOD_METHOD|WXLUAMETHOD_GETPROP, true);
! if (wxlMethod != NULL)
{
if (WXLUA_HASBIT(wxlMethod->method_type, WXLUAMETHOD_GETPROP))
--- 410,414 ----
wxLuaBindMethod* wxlMethod = wxLuaBinding::GetClassMethod(wxlClass, name, WXLUAMETHOD_METHOD|WXLUAMETHOD_GETPROP, true);
! if ((wxlMethod != NULL) && (wxlMethod->wxluacfuncs != NULL))
{
if (WXLUA_HASBIT(wxlMethod->method_type, WXLUAMETHOD_GETPROP))
***************
*** 516,523 ****
(*wxlMethod->wxluacfuncs[0].lua_cfunc)(L);
}
!
! // Maybe this is an undeclared property? Prepend 'Set' and try again.
! if (!found)
{
int len = strlen(name);
wxCharBuffer buf(len + 4);
--- 516,522 ----
(*wxlMethod->wxluacfuncs[0].lua_cfunc)(L);
}
! else
{
+ // Maybe this is an undeclared property? Prepend 'Set' and try again.
int len = strlen(name);
wxCharBuffer buf(len + 4);
|
|
From: John L. <jr...@us...> - 2011-04-27 03:39:24
|
Update of /cvsroot/wxlua/wxLua/bindings/wxlua
In directory vz-cvs-4.sog:/tmp/cvs-serv31919/bindings/wxlua
Modified Files:
override.hpp
Log Message:
Fix wxLuaObject:SetObject() so it gets the right item on the stack.
Fully test wxLuaObjects in coroutines
Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** override.hpp 3 Dec 2010 04:39:43 -0000 1.26
--- override.hpp 27 Apr 2011 03:39:22 -0000 1.27
***************
*** 919,923 ****
wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject);
// call SetObject
! self->SetObject(L, 1);
// return the number of parameters
return 0;
--- 919,923 ----
wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject);
// call SetObject
! self->SetObject(L, 2);
// return the number of parameters
return 0;
|
|
From: John L. <jr...@us...> - 2011-04-22 02:49:20
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory vz-cvs-4.sog:/tmp/cvs-serv5863/bindings/wxwidgets
Modified Files:
wx_datatypes.lua wxcore_controls.i wxcore_override.hpp
Log Message:
Added wxTreeCtrl methods, use wxLuaTreeItemData and allow it to take any Lua object.
Add WXLUA_TPOINTER as as type that lua_topointer() could return.
Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** wx_datatypes.lua 12 Aug 2010 23:41:09 -0000 1.105
--- wx_datatypes.lua 22 Apr 2011 02:49:17 -0000 1.106
***************
*** 20,23 ****
--- 20,24 ----
wxTextCoord = "long",
wxTraceMask = "unsigned long",
+ wxTreeItemIdValue = "double",
}
***************
*** 58,61 ****
--- 59,67 ----
ValueType = "number",
},
+ any = {
+ IsNumber = true,
+ Name = "any",
+ ValueType = "special",
+ },
bool = {
IsNumber = true,
***************
*** 4702,4709 ****
},
wxTreeItemIdValue = {
- Condition = "wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL",
IsNumber = true,
Name = "wxTreeItemIdValue",
! ValueType = "enum",
},
wxTreebook = {
--- 4708,4714 ----
},
wxTreeItemIdValue = {
IsNumber = true,
Name = "wxTreeItemIdValue",
! ValueType = "number",
},
wxTreebook = {
Index: wxcore_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** wxcore_override.hpp 3 Dec 2010 04:39:43 -0000 1.22
--- wxcore_override.hpp 22 Apr 2011 02:49:18 -0000 1.23
***************
*** 525,537 ****
%override wxLua_wxTreeCtrl_GetFirstChild
! // wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const
static int LUACALL wxLua_wxTreeCtrl_GetFirstChild(lua_State *L)
{
- #if wxCHECK_VERSION(2, 5, 0)
wxTreeItemIdValue cookie = 0;
! #else
! // long& cookie
! long cookie = 0;
! #endif
// const wxTreeItemId& item
const wxTreeItemId *item = (wxTreeItemId *)wxluaT_getuserdatatype(L, 2, wxluatype_wxTreeItemId);
--- 525,533 ----
%override wxLua_wxTreeCtrl_GetFirstChild
! // wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const
static int LUACALL wxLua_wxTreeCtrl_GetFirstChild(lua_State *L)
{
wxTreeItemIdValue cookie = 0;
!
// const wxTreeItemId& item
const wxTreeItemId *item = (wxTreeItemId *)wxluaT_getuserdatatype(L, 2, wxluatype_wxTreeItemId);
***************
*** 545,554 ****
// push the result datatype
wxluaT_pushuserdatatype(L, returns, wxluatype_wxTreeItemId);
- #if wxCHECK_VERSION(2, 5, 0)
- lua_pushnumber(L, (long)cookie); // wxTreeItemIdValue is void*
- #else
// push the cookie
! lua_pushnumber(L, cookie);
! #endif
// return the number of parameters
return 2;
--- 541,546 ----
// push the result datatype
wxluaT_pushuserdatatype(L, returns, wxluatype_wxTreeItemId);
// push the cookie
! lua_pushlightuserdata(L, cookie); // wxTreeItemIdValue is void*
// return the number of parameters
return 2;
***************
*** 557,569 ****
%override wxLua_wxTreeCtrl_GetNextChild
! // wxTreeItemId GetNextChild(const wxTreeItemId& item, long& cookie) const
static int LUACALL wxLua_wxTreeCtrl_GetNextChild(lua_State *L)
{
! #if wxCHECK_VERSION(2, 5, 0)
! wxTreeItemIdValue cookie = (wxTreeItemIdValue)(long)wxlua_getintegertype(L, 3);
! #else
! // long& cookie
! long cookie = (long)lua_tonumber(L, 3);
! #endif
// const wxTreeItemId& item
const wxTreeItemId *item = (wxTreeItemId *)wxluaT_getuserdatatype(L, 2, wxluatype_wxTreeItemId);
--- 549,557 ----
%override wxLua_wxTreeCtrl_GetNextChild
! // wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const
static int LUACALL wxLua_wxTreeCtrl_GetNextChild(lua_State *L)
{
! wxTreeItemIdValue cookie = (wxTreeItemIdValue)wxlua_getpointertype(L, 3);
!
// const wxTreeItemId& item
const wxTreeItemId *item = (wxTreeItemId *)wxluaT_getuserdatatype(L, 2, wxluatype_wxTreeItemId);
***************
*** 577,586 ****
// push the result datatype
wxluaT_pushuserdatatype(L, returns, wxluatype_wxTreeItemId);
- #if wxCHECK_VERSION(2, 5, 0)
- lua_pushnumber(L, (long)cookie);
- #else
// push the cookie
! lua_pushnumber(L, cookie);
! #endif
// return the number of parameters
return 2;
--- 565,570 ----
// push the result datatype
wxluaT_pushuserdatatype(L, returns, wxluatype_wxTreeItemId);
// push the cookie
! lua_pushlightuserdata(L, cookie); // wxTreeItemIdValue is void*
// return the number of parameters
return 2;
***************
*** 637,640 ****
--- 621,678 ----
%end
+ %override wxLua_wxLuaTreeItemData_GetData
+ // wxLuaObject* GetData() const;
+ static int LUACALL wxLua_wxLuaTreeItemData_GetData(lua_State *L)
+ {
+ // get this
+ wxLuaTreeItemData * self = (wxLuaTreeItemData *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaTreeItemData);
+ // call GetData
+ wxLuaObject* returns = (wxLuaObject*)self->GetData();
+ // push the result datatype
+ if ((returns == NULL) || !returns->GetObject(L))
+ lua_pushnil(L);
+
+ return 1;
+ }
+ %end
+
+ %override wxLua_wxLuaTreeItemData_SetData
+ // void SetData(%ungc wxLuaObject* obj); // obj is deleted when tree item data is deleted
+ static int LUACALL wxLua_wxLuaTreeItemData_SetData(lua_State *L)
+ {
+ // wxLuaObject obj
+ //wxLuaObject * obj = (wxLuaObject *)wxluaT_getuserdatatype(L, 2, wxluatype_wxLuaObject);
+ //if (wxluaO_isgcobject(L, obj)) wxluaO_undeletegcobject(L, obj);
+ wxLuaObject* obj = new wxLuaObject(L, 2);
+
+ // get this
+ wxLuaTreeItemData * self = (wxLuaTreeItemData *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaTreeItemData);
+ // call SetData
+ self->SetData(obj);
+
+ return 0;
+ }
+ %end
+
+ %override wxLua_wxLuaTreeItemData_constructor1
+ // wxLuaTreeItemData(%ungc wxLuaObject* obj) // obj is deleted when tree item data is deleted
+ static int LUACALL wxLua_wxLuaTreeItemData_constructor1(lua_State *L)
+ {
+ // wxLuaObject obj
+ //wxLuaObject * obj = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject);
+ //if (wxluaO_isgcobject(L, obj)) wxluaO_undeletegcobject(L, obj);
+ wxLuaObject* obj = new wxLuaObject(L, 1);
+
+ // call constructor
+ wxLuaTreeItemData* returns = new wxLuaTreeItemData(obj);
+ // add to tracked memory list
+ wxluaO_addgcobject(L, returns, wxluatype_wxLuaTreeItemData);
+ // push the constructed class pointer
+ wxluaT_pushuserdatatype(L, returns, wxluatype_wxLuaTreeItemData);
+
+ return 1;
+ }
+ %end
+
%override wxLua_wxTextValidator_constructor
Index: wxcore_controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_controls.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wxcore_controls.i 1 Oct 2009 04:21:00 -0000 1.10
--- wxcore_controls.i 22 Apr 2011 02:49:18 -0000 1.11
***************
*** 1071,1080 ****
bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTR_HAS_BUTTONS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxTreeCtrl")
! wxTreeItemId AddRoot(const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL)
! wxTreeItemId AppendItem(const wxTreeItemId& parent, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL)
//void AssignButtonsImageList(wxImageList* imageList)
void AssignImageList(%ungc wxImageList* imageList)
void AssignStateImageList(%ungc wxImageList* imageList)
void Collapse(const wxTreeItemId& item)
void CollapseAndReset(const wxTreeItemId& item)
void Delete(const wxTreeItemId& item)
--- 1071,1082 ----
bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTR_HAS_BUTTONS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxTreeCtrl")
! wxTreeItemId AddRoot(const wxString& text, int image = -1, int selImage = -1, %ungc wxLuaTreeItemData* data = NULL)
! wxTreeItemId AppendItem(const wxTreeItemId& parent, const wxString& text, int image = -1, int selImage = -1, %ungc wxLuaTreeItemData* data = NULL)
//void AssignButtonsImageList(wxImageList* imageList)
void AssignImageList(%ungc wxImageList* imageList)
void AssignStateImageList(%ungc wxImageList* imageList)
void Collapse(const wxTreeItemId& item)
+ void CollapseAll()
+ void CollapseAllChildren(const wxTreeItemId& item)
void CollapseAndReset(const wxTreeItemId& item)
void Delete(const wxTreeItemId& item)
***************
*** 1085,1093 ****
void EnsureVisible(const wxTreeItemId& item)
void Expand(const wxTreeItemId& item)
bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, bool textOnly = false) const
//wxImageList* GetButtonsImageList() const
size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = true) const
int GetCount() const
! //wxTextCtrl* GetEditControl() const
// %override [wxTreeItemId, wxTreeItemIdValue cookie] wxTreeCtrl::GetFirstChild(const wxTreeItemId& item)
--- 1087,1097 ----
void EnsureVisible(const wxTreeItemId& item)
void Expand(const wxTreeItemId& item)
+ void ExpandAll()
+ void ExpandAllChildren(const wxTreeItemId& item)
bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, bool textOnly = false) const
//wxImageList* GetButtonsImageList() const
size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = true) const
int GetCount() const
! //wxTextCtrl* GetEditControl() const // MSW only
// %override [wxTreeItemId, wxTreeItemIdValue cookie] wxTreeCtrl::GetFirstChild(const wxTreeItemId& item)
***************
*** 1099,1103 ****
int GetIndent() const
wxColour GetItemBackgroundColour(const wxTreeItemId& item) const
! wxTreeItemData* GetItemData(const wxTreeItemId& item) const
wxFont GetItemFont(const wxTreeItemId& item) const
int GetItemImage(const wxTreeItemId& item, wxTreeItemIcon which = wxTreeItemIcon_Normal) const
--- 1103,1107 ----
int GetIndent() const
wxColour GetItemBackgroundColour(const wxTreeItemId& item) const
! wxLuaTreeItemData* GetItemData(const wxTreeItemId& item) const
wxFont GetItemFont(const wxTreeItemId& item) const
int GetItemImage(const wxTreeItemId& item, wxTreeItemIcon which = wxTreeItemIcon_Normal) const
***************
*** 1108,1112 ****
// %override [wxTreeItemId, wxTreeItemIdValue cookie] wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long cookie)
// C++ Func: wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const
! wxTreeItemId GetNextChild(const wxTreeItemId& item, long cookie) const
wxTreeItemId GetNextSibling(const wxTreeItemId& item) const
--- 1112,1116 ----
// %override [wxTreeItemId, wxTreeItemIdValue cookie] wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long cookie)
// C++ Func: wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const
! wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const
wxTreeItemId GetNextSibling(const wxTreeItemId& item) const
***************
*** 1116,1120 ****
wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const
wxTreeItemId GetRootItem() const
! //!%wxchkver_2_6|%wxcompat_2_4 int GetItemSelectedImage(const wxTreeItemId& item) const
wxTreeItemId GetSelection() const
--- 1120,1125 ----
wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const
wxTreeItemId GetRootItem() const
! bool GetQuickBestSize() const
! //!%wxchkver_2_6|%wxcompat_2_4 int GetItemSelectedImage(const wxTreeItemId& item) const // obsolete function
wxTreeItemId GetSelection() const
***************
*** 1129,1135 ****
wxTreeItemId HitTest(const wxPoint& point)
! wxTreeItemId InsertItem(const wxTreeItemId& parent, const wxTreeItemId& previous, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL)
! wxTreeItemId InsertItem(const wxTreeItemId& parent, size_t before, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL)
bool IsBold(const wxTreeItemId& item) const
bool IsExpanded(const wxTreeItemId& item) const
bool IsSelected(const wxTreeItemId& item) const
--- 1134,1141 ----
wxTreeItemId HitTest(const wxPoint& point)
! wxTreeItemId InsertItem(const wxTreeItemId& parent, const wxTreeItemId& previous, const wxString& text, int image = -1, int selImage = -1, %ungc wxLuaTreeItemData* data = NULL)
! wxTreeItemId InsertItem(const wxTreeItemId& parent, size_t before, const wxString& text, int image = -1, int selImage = -1, %ungc wxLuaTreeItemData* data = NULL)
bool IsBold(const wxTreeItemId& item) const
+ bool IsEmpty() const
bool IsExpanded(const wxTreeItemId& item) const
bool IsSelected(const wxTreeItemId& item) const
***************
*** 1137,1141 ****
bool ItemHasChildren(const wxTreeItemId& item) const
//int OnCompareItems(const wxTreeItemId& item1, const wxTreeItemId& item2)
! wxTreeItemId PrependItem(const wxTreeItemId& parent, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL)
void ScrollTo(const wxTreeItemId& item)
void SelectItem(const wxTreeItemId& item, bool select = true)
--- 1143,1147 ----
bool ItemHasChildren(const wxTreeItemId& item) const
//int OnCompareItems(const wxTreeItemId& item1, const wxTreeItemId& item2)
! wxTreeItemId PrependItem(const wxTreeItemId& parent, const wxString& text, int image = -1, int selImage = -1, %ungc wxLuaTreeItemData* data = NULL)
void ScrollTo(const wxTreeItemId& item)
void SelectItem(const wxTreeItemId& item, bool select = true)
***************
*** 1145,1156 ****
void SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col)
void SetItemBold(const wxTreeItemId& item, bool bold = true)
! void SetItemData(const wxTreeItemId& item, wxTreeItemData* data)
void SetItemDropHighlight(const wxTreeItemId& item, boolhighlight = true)
void SetItemFont(const wxTreeItemId& item, const wxFont& font)
void SetItemHasChildren(const wxTreeItemId& item, bool hasChildren = true)
void SetItemImage(const wxTreeItemId& item, int image, wxTreeItemIcon which = wxTreeItemIcon_Normal)
! //!%wxchkver_2_6|%wxcompat_2_4 void SetItemSelectedImage(const wxTreeItemId& item, int selImage)
void SetItemText(const wxTreeItemId& item, const wxString& text)
void SetItemTextColour(const wxTreeItemId& item, const wxColour& col)
void SetStateImageList(wxImageList* imageList)
// void SetWindowStyle(long styles) - see wxWindow
--- 1151,1163 ----
void SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col)
void SetItemBold(const wxTreeItemId& item, bool bold = true)
! void SetItemData(const wxTreeItemId& item, %ungc wxLuaTreeItemData* data)
void SetItemDropHighlight(const wxTreeItemId& item, boolhighlight = true)
void SetItemFont(const wxTreeItemId& item, const wxFont& font)
void SetItemHasChildren(const wxTreeItemId& item, bool hasChildren = true)
void SetItemImage(const wxTreeItemId& item, int image, wxTreeItemIcon which = wxTreeItemIcon_Normal)
! //!%wxchkver_2_6|%wxcompat_2_4 void SetItemSelectedImage(const wxTreeItemId& item, int selImage) // obsolete function
void SetItemText(const wxTreeItemId& item, const wxString& text)
void SetItemTextColour(const wxTreeItemId& item, const wxColour& col)
+ void SetQuickBestSize(bool quickBestSize)
void SetStateImageList(wxImageList* imageList)
// void SetWindowStyle(long styles) - see wxWindow
***************
*** 1186,1202 ****
// wxTreeItemIdValue - wxTreeCtrl
! //%if %wxchkver_2_6
! //%class wxTreeItemIdValue
! //%endclass
! //%endif
// ---------------------------------------------------------------------------
// wxTreeItemId - wxTreeCtrl
- %enum wxTreeItemIdValue
- // FAKE enum, actually typedef void* wxTreeItemIdValue
- // but Lua only uses double. This gets around compiler errors/warnings
- %endenum
-
%class %delete wxTreeItemId
wxTreeItemId()
--- 1193,1203 ----
// wxTreeItemIdValue - wxTreeCtrl
! // FAKE typedef, actually typedef void* wxTreeItemIdValue
! // Since we override the functions that use it we handle it as a pointer.
! %typedef double wxTreeItemIdValue
// ---------------------------------------------------------------------------
// wxTreeItemId - wxTreeCtrl
%class %delete wxTreeItemId
wxTreeItemId()
***************
*** 1243,1250 ****
// wxTreeItemData - wxTreeCtrl, see also wxLuaTreeItemData
//
! // No %delete since the wxTreeCtrl should do it and you should only create one
! // of these if you're going to attach it to a wxTreeCtrl to avoid memory leaks.
! %class wxTreeItemData, wxClientData
wxTreeItemData()
--- 1244,1251 ----
// wxTreeItemData - wxTreeCtrl, see also wxLuaTreeItemData
//
! // No %delete since the wxTreeCtrl will delete it when set as the data for an item.
! // Only create a wxTreeItemData if you're going to attach it to a wxTreeCtrl item to avoid memory leaks.
! %class %delete wxTreeItemData, wxClientData
wxTreeItemData()
***************
*** 1254,1269 ****
// ---------------------------------------------------------------------------
! // wxLuaTreeItemData
//
! // No %delete since the wxTreeCtrl should do it and you should only create one
! // of these if you're going to attach it to a wxTreeCtrl to avoid memory leaks.
%include "wxbind/include/wxcore_wxlcore.h"
! %class wxLuaTreeItemData, wxTreeItemData
! wxLuaTreeItemData(double value = 0)
! double GetValue() const;
! void SetValue(double value);
%endclass
--- 1255,1278 ----
// ---------------------------------------------------------------------------
! // wxLuaTreeItemData -
//
! // No %delete since the wxTreeCtrl will delete it when set as the data for an item.
! // Only create a wxLuaTreeItemData if you're going to attach it to a wxTreeCtrl item to avoid memory leaks.
%include "wxbind/include/wxcore_wxlcore.h"
! %class %delete wxLuaTreeItemData, wxTreeItemData
! wxLuaTreeItemData()
! // %override wxLuaTreeItemData(any)
! // C++ Func: wxLuaTreeItemData(wxLuaObject* obj)
! wxLuaTreeItemData(any)
!
! // %override any wxLuaTreeItemData::GetData() const
! // C++ Func: wxLuaObject* GetData() const
! any GetData() const;
! // %override void wxLuaTreeItemData::SetData(any)
! // C++ Func: void SetData(wxLuaObject* obj)
! void SetData(any);
%endclass
|
|
From: John L. <jr...@us...> - 2011-04-20 02:39:01
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory vz-cvs-4.sog:/tmp/cvs-serv25861/bindings/wxwidgets
Modified Files:
wxadv_rules.lua wxaui_aui.i
Log Message:
Delete the wxAuiManager when garbage collected
Index: wxaui_aui.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxaui_aui.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxaui_aui.i 1 Oct 2009 04:21:00 -0000 1.5
--- wxaui_aui.i 20 Apr 2011 02:38:58 -0000 1.6
***************
*** 623,627 ****
// wxAuiManager
! %class wxAuiManager, wxEvtHandler
wxAuiManager(wxWindow* managed_wnd = NULL, unsigned int flags = wxAUI_MGR_DEFAULT);
--- 623,627 ----
// wxAuiManager
! %class %delete wxAuiManager, wxEvtHandler
wxAuiManager(wxWindow* managed_wnd = NULL, unsigned int flags = wxAUI_MGR_DEFAULT);
Index: wxadv_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_rules.lua,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxadv_rules.lua 1 Oct 2009 04:21:00 -0000 1.7
--- wxadv_rules.lua 20 Apr 2011 02:38:58 -0000 1.8
***************
*** 67,79 ****
hook_cpp_binding_includes = [[
! #include "wx/wxprec.h"
!
! #ifdef __BORLANDC__
! #pragma hdrstop
! #endif
!
! #ifndef WX_PRECOMP
! #include "wx/wx.h"
! #endif
// Hack to add accessor to get the ref count
--- 67,71 ----
hook_cpp_binding_includes = [[
! #include "wx/window.h"
// Hack to add accessor to get the ref count
|
|
From: John L. <jr...@us...> - 2011-04-04 01:00:17
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory vz-cvs-4.sog:/tmp/cvs-serv20366/modules/wxbind/src
Modified Files:
wxadv_bind.cpp wxcore_appframe.cpp
Log Message:
wxFrame::ShowFullScreen() is now supported in GTK
Index: wxcore_appframe.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_appframe.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxcore_appframe.cpp 1 Oct 2009 04:21:01 -0000 1.15
--- wxcore_appframe.cpp 4 Apr 2011 01:00:15 -0000 1.16
***************
*** 703,711 ****
#endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
- #if (defined(__WXMSW__)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
static wxLuaArgType s_wxluatypeArray_wxLua_wxTopLevelWindow_ShowFullScreen[] = { &wxluatype_wxTopLevelWindow, &wxluatype_TBOOLEAN, &wxluatype_TNUMBER, NULL };
static int LUACALL wxLua_wxTopLevelWindow_ShowFullScreen(lua_State *L);
static wxLuaBindCFunc s_wxluafunc_wxLua_wxTopLevelWindow_ShowFullScreen[1] = {{ wxLua_wxTopLevelWindow_ShowFullScreen, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxTopLevelWindow_ShowFullScreen }};
! // %win bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL)
static int LUACALL wxLua_wxTopLevelWindow_ShowFullScreen(lua_State *L)
{
--- 703,710 ----
#endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
static wxLuaArgType s_wxluatypeArray_wxLua_wxTopLevelWindow_ShowFullScreen[] = { &wxluatype_wxTopLevelWindow, &wxluatype_TBOOLEAN, &wxluatype_TNUMBER, NULL };
static int LUACALL wxLua_wxTopLevelWindow_ShowFullScreen(lua_State *L);
static wxLuaBindCFunc s_wxluafunc_wxLua_wxTopLevelWindow_ShowFullScreen[1] = {{ wxLua_wxTopLevelWindow_ShowFullScreen, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxTopLevelWindow_ShowFullScreen }};
! // bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL)
static int LUACALL wxLua_wxTopLevelWindow_ShowFullScreen(lua_State *L)
{
***************
*** 726,730 ****
}
- #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
--- 725,728 ----
***************
*** 779,785 ****
#endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
- #if (defined(__WXMSW__)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
{ "ShowFullScreen", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTopLevelWindow_ShowFullScreen, 1, NULL },
- #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
{ 0, 0, 0, 0 },
--- 777,781 ----
Index: wxadv_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** wxadv_bind.cpp 10 Mar 2011 22:34:14 -0000 1.28
--- wxadv_bind.cpp 4 Apr 2011 01:00:15 -0000 1.29
***************
*** 1,4 ****
// ---------------------------------------------------------------------------
! // ../modules/wxbind/src/wxadv_adv.cpp was generated by genwxbind.lua
//
// Any changes made to this file will be lost when the file is regenerated.
--- 1,4 ----
// ---------------------------------------------------------------------------
! // ../modules/wxbind/src/wxadv_adv.cpp was generated by genwxbind.lua
//
// Any changes made to this file will be lost when the file is regenerated.
***************
*** 28,39 ****
- #ifdef __BORLANDC__
- #pragma hdrstop
- #endif
-
- #ifndef WX_PRECOMP
- #include "wx/wx.h"
- #endif
-
#include "wxlua/include/wxlstate.h"
#include "wxbind/include/wxadv_bind.h"
--- 28,31 ----
***************
*** 7333,7337 ****
// ---------------------------------------------------------------------------
! // ../modules/wxbind/src/wxadv_grid.cpp was generated by genwxbind.lua
//
// Any changes made to this file will be lost when the file is regenerated.
--- 7325,7329 ----
// ---------------------------------------------------------------------------
! // ../modules/wxbind/src/wxadv_grid.cpp was generated by genwxbind.lua
//
// Any changes made to this file will be lost when the file is regenerated.
***************
*** 15828,15832 ****
// ---------------------------------------------------------------------------
! // ../modules/wxbind/src/wxadv_bind.cpp was generated by genwxbind.lua
//
// Any changes made to this file will be lost when the file is regenerated.
--- 15820,15824 ----
// ---------------------------------------------------------------------------
! // ../modules/wxbind/src/wxadv_bind.cpp was generated by genwxbind.lua
//
// Any changes made to this file will be lost when the file is regenerated.
***************
*** 16131,16135 ****
! { 0, 0, 0, 0 },
};
count = sizeof(functionList)/sizeof(wxLuaBindMethod) - 1;
--- 16123,16127 ----
! { 0, 0, 0, 0 },
};
count = sizeof(functionList)/sizeof(wxLuaBindMethod) - 1;
***************
*** 16550,16660 ****
{
#if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
! { wxluaclassname_wxAboutDialogInfo, wxAboutDialogInfo_methods, wxAboutDialogInfo_methodCount, NULL, &wxluatype_wxAboutDialogInfo, NULL, NULL, NULL, NULL, NULL, 0, &wxLua_wxAboutDialogInfo_delete_function, },
#endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
#if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL
! { wxluaclassname_wxAnimation, wxAnimation_methods, wxAnimation_methodCount, CLASSINFO(wxAnimation), &wxluatype_wxAnimation, wxluabaseclassnames_wxAnimation, wxluabaseclassbinds_wxAnimation, NULL, NULL, NULL, 0, &wxLua_wxAnimation_delete_function, },
! { wxluaclassname_wxAnimationCtrl, wxAnimationCtrl_methods, wxAnimationCtrl_methodCount, CLASSINFO(wxAnimationCtrl), &wxluatype_wxAnimationCtrl, wxluabaseclassnames_wxAnimationCtrl, wxluabaseclassbinds_wxAnimationCtrl, NULL, NULL, NULL, 0, &wxLua_wxAnimationCtrl_delete_function, },
#endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL
#if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX
! { wxluaclassname_wxBitmapComboBox, wxBitmapComboBox_methods, wxBitmapComboBox_methodCount, CLASSINFO(wxBitmapComboBox), &wxluatype_wxBitmapComboBox, wxluabaseclassnames_wxBitmapComboBox, wxluabaseclassbinds_wxBitmapComboBox, NULL, NULL, NULL, 0, &wxLua_wxBitmapComboBox_delete_function, },
#endif // wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX
#if wxLUA_USE_wxSashWindow && wxUSE_SASH
! { wxluaclassname_wxCalculateLayoutEvent, wxCalculateLayoutEvent_methods, wxCalculateLayoutEvent_methodCount, CLASSINFO(wxCalculateLayoutEvent), &wxluatype_wxCalculateLayoutEvent, wxluabaseclassnames_wxCalculateLayoutEvent, wxluabaseclassbinds_wxCalculateLayoutEvent, NULL, NULL, NULL, 0, &wxLua_wxCalculateLayoutEvent_delete_function, },
#endif // wxLUA_USE_wxSashWindow && wxUSE_SASH
#if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL
! { wxluaclassname_wxCalendarCtrl, wxCalendarCtrl_methods, wxCalendarCtrl_methodCount, CLASSINFO(wxCalendarCtrl), &wxluatype_wxCalendarCtrl, wxluabaseclassnames_wxCalendarCtrl, wxluabaseclassbinds_wxCalendarCtrl, NULL, NULL, NULL, 0, &wxLua_wxCalendarCtrl_delete_function, },
! { wxluaclassname_wxCalendarDateAttr, wxCalendarDateAttr_methods, wxCalendarDateAttr_methodCount, NULL, &wxluatype_wxCalendarDateAttr, NULL, NULL, NULL, NULL, NULL, 0, &wxLua_wxCalendarDateAttr_delete_function, },
! { wxluaclassname_wxCalendarEvent, wxCalendarEvent_methods, wxCalendarEvent_methodCount, CLASSINFO(wxCalendarEvent), &wxluatype_wxCalendarEvent, wxluabaseclassnames_wxCalendarEvent, wxluabaseclassbinds_wxCalendarEvent, NULL, NULL, NULL, 0, &wxLua_wxCalendarEvent_delete_function, },
! { wxluaclassname_wxDateEvent, wxDateEvent_methods, wxDateEvent_methodCount, CLASSINFO(wxDateEvent), &wxluatype_wxDateEvent, wxluabaseclassnames_wxDateEvent, wxluabaseclassbinds_wxDateEvent, NULL, NULL, NULL, 0, &wxLua_wxDateEvent_delete_function, },
#endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL
#if wxLUA_USE_wxGrid && wxUSE_GRID
! { wxluaclassname_wxGrid, wxGrid_methods, wxGrid_methodCount, CLASSINFO(wxGrid), &wxluatype_wxGrid, wxluabaseclassnames_wxGrid, wxluabaseclassbinds_wxGrid, NULL, NULL, wxGrid_enums, wxGrid_enumCount, &wxLua_wxGrid_delete_function, },
! { wxluaclassname_wxGridCellAttr, wxGridCellAttr_methods, wxGridCellAttr_methodCount, NULL, &wxluatype_wxGridCellAttr, wxluabaseclassnames_wxGridCellAttr, wxluabaseclassbinds_wxGridCellAttr, NULL, NULL, wxGridCellAttr_enums, wxGridCellAttr_enumCount, &wxLua_wxGridCellAttr_delete_function, },
! { wxluaclassname_wxGridCellAttrProvider, wxGridCellAttrProvider_methods, wxGridCellAttrProvider_methodCount, NULL, &wxluatype_wxGridCellAttrProvider, wxluabaseclassnames_wxGridCellAttrProvider, wxluabaseclassbinds_wxGridCellAttrProvider, NULL, NULL, NULL, 0, &wxLua_wxGridCellAttrProvider_delete_function, },
! { wxluaclassname_wxGridCellAutoWrapStringEditor, wxGridCellAutoWrapStringEditor_methods, wxGridCellAutoWrapStringEditor_methodCount, NULL, &wxluatype_wxGridCellAutoWrapStringEditor, wxluabaseclassnames_wxGridCellAutoWrapStringEditor, wxluabaseclassbinds_wxGridCellAutoWrapStringEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellAutoWrapStringEditor_delete_function, },
! { wxluaclassname_wxGridCellAutoWrapStringRenderer, wxGridCellAutoWrapStringRenderer_methods, wxGridCellAutoWrapStringRenderer_methodCount, NULL, &wxluatype_wxGridCellAutoWrapStringRenderer, wxluabaseclassnames_wxGridCellAutoWrapStringRenderer, wxluabaseclassbinds_wxGridCellAutoWrapStringRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellAutoWrapStringRenderer_delete_function, },
! { wxluaclassname_wxGridCellBoolEditor, wxGridCellBoolEditor_methods, wxGridCellBoolEditor_methodCount, NULL, &wxluatype_wxGridCellBoolEditor, wxluabaseclassnames_wxGridCellBoolEditor, wxluabaseclassbinds_wxGridCellBoolEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellBoolEditor_delete_function, },
! { wxluaclassname_wxGridCellBoolRenderer, wxGridCellBoolRenderer_methods, wxGridCellBoolRenderer_methodCount, NULL, &wxluatype_wxGridCellBoolRenderer, wxluabaseclassnames_wxGridCellBoolRenderer, wxluabaseclassbinds_wxGridCellBoolRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellBoolRenderer_delete_function, },
! { wxluaclassname_wxGridCellChoiceEditor, wxGridCellChoiceEditor_methods, wxGridCellChoiceEditor_methodCount, NULL, &wxluatype_wxGridCellChoiceEditor, wxluabaseclassnames_wxGridCellChoiceEditor, wxluabaseclassbinds_wxGridCellChoiceEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellChoiceEditor_delete_function, },
! { wxluaclassname_wxGridCellCoords, wxGridCellCoords_methods, wxGridCellCoords_methodCount, NULL, &wxluatype_wxGridCellCoords, NULL, NULL, NULL, NULL, NULL, 0, &wxLua_wxGridCellCoords_delete_function, },
! { wxluaclassname_wxGridCellCoordsArray, wxGridCellCoordsArray_methods, wxGridCellCoordsArray_methodCount, NULL, &wxluatype_wxGridCellCoordsArray, NULL, NULL, NULL, NULL, NULL, 0, &wxLua_wxGridCellCoordsArray_delete_function, },
! { wxluaclassname_wxGridCellDateTimeRenderer, wxGridCellDateTimeRenderer_methods, wxGridCellDateTimeRenderer_methodCount, NULL, &wxluatype_wxGridCellDateTimeRenderer, wxluabaseclassnames_wxGridCellDateTimeRenderer, wxluabaseclassbinds_wxGridCellDateTimeRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellDateTimeRenderer_delete_function, },
! { wxluaclassname_wxGridCellEditor, wxGridCellEditor_methods, wxGridCellEditor_methodCount, NULL, &wxluatype_wxGridCellEditor, wxluabaseclassnames_wxGridCellEditor, wxluabaseclassbinds_wxGridCellEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellEditor_delete_function, },
! { wxluaclassname_wxGridCellEnumEditor, wxGridCellEnumEditor_methods, wxGridCellEnumEditor_methodCount, NULL, &wxluatype_wxGridCellEnumEditor, wxluabaseclassnames_wxGridCellEnumEditor, wxluabaseclassbinds_wxGridCellEnumEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellEnumEditor_delete_function, },
! { wxluaclassname_wxGridCellEnumRenderer, wxGridCellEnumRenderer_methods, wxGridCellEnumRenderer_methodCount, NULL, &wxluatype_wxGridCellEnumRenderer, wxluabaseclassnames_wxGridCellEnumRenderer, wxluabaseclassbinds_wxGridCellEnumRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellEnumRenderer_delete_function, },
! { wxluaclassname_wxGridCellFloatEditor, wxGridCellFloatEditor_methods, wxGridCellFloatEditor_methodCount, NULL, &wxluatype_wxGridCellFloatEditor, wxluabaseclassnames_wxGridCellFloatEditor, wxluabaseclassbinds_wxGridCellFloatEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellFloatEditor_delete_function, },
! { wxluaclassname_wxGridCellFloatRenderer, wxGridCellFloatRenderer_methods, wxGridCellFloatRenderer_methodCount, NULL, &wxluatype_wxGridCellFloatRenderer, wxluabaseclassnames_wxGridCellFloatRenderer, wxluabaseclassbinds_wxGridCellFloatRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellFloatRenderer_delete_function, },
! { wxluaclassname_wxGridCellNumberEditor, wxGridCellNumberEditor_methods, wxGridCellNumberEditor_methodCount, NULL, &wxluatype_wxGridCellNumberEditor, wxluabaseclassnames_wxGridCellNumberEditor, wxluabaseclassbinds_wxGridCellNumberEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellNumberEditor_delete_function, },
! { wxluaclassname_wxGridCellNumberRenderer, wxGridCellNumberRenderer_methods, wxGridCellNumberRenderer_methodCount, NULL, &wxluatype_wxGridCellNumberRenderer, wxluabaseclassnames_wxGridCellNumberRenderer, wxluabaseclassbinds_wxGridCellNumberRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellNumberRenderer_delete_function, },
! { wxluaclassname_wxGridCellRenderer, wxGridCellRenderer_methods, wxGridCellRenderer_methodCount, NULL, &wxluatype_wxGridCellRenderer, wxluabaseclassnames_wxGridCellRenderer, wxluabaseclassbinds_wxGridCellRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellRenderer_delete_function, },
! { wxluaclassname_wxGridCellStringRenderer, wxGridCellStringRenderer_methods, wxGridCellStringRenderer_methodCount, NULL, &wxluatype_wxGridCellStringRenderer, wxluabaseclassnames_wxGridCellStringRenderer, wxluabaseclassbinds_wxGridCellStringRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellStringRenderer_delete_function, },
! { wxluaclassname_wxGridCellTextEditor, wxGridCellTextEditor_methods, wxGridCellTextEditor_methodCount, NULL, &wxluatype_wxGridCellTextEditor, wxluabaseclassnames_wxGridCellTextEditor, wxluabaseclassbinds_wxGridCellTextEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellTextEditor_delete_function, },
! { wxluaclassname_wxGridCellWorker, wxGridCellWorker_methods, wxGridCellWorker_methodCount, NULL, &wxluatype_wxGridCellWorker, wxluabaseclassnames_wxGridCellWorker, wxluabaseclassbinds_wxGridCellWorker, NULL, NULL, NULL, 0, &wxLua_wxGridCellWorker_delete_function, },
! { wxluaclassname_wxGridEditorCreatedEvent, wxGridEditorCreatedEvent_methods, wxGridEditorCreatedEvent_methodCount, CLASSINFO(wxGridEditorCreatedEvent), &wxluatype_wxGridEditorCreatedEvent, wxluabaseclassnames_wxGridEditorCreatedEvent, wxluabaseclassbinds_wxGridEditorCreatedEvent, NULL, NULL, NULL, 0, &wxLua_wxGridEditorCreatedEvent_delete_function, },
! { wxluaclassname_wxGridEvent, wxGridEvent_methods, wxGridEvent_methodCount, CLASSINFO(wxGridEvent), &wxluatype_wxGridEvent, wxluabaseclassnames_wxGridEvent, wxluabaseclassbinds_wxGridEvent, NULL, NULL, NULL, 0, &wxLua_wxGridEvent_delete_function, },
! { wxluaclassname_wxGridRangeSelectEvent, wxGridRangeSelectEvent_methods, wxGridRangeSelectEvent_methodCount, CLASSINFO(wxGridRangeSelectEvent), &wxluatype_wxGridRangeSelectEvent, wxluabaseclassnames_wxGridRangeSelectEvent, wxluabaseclassbinds_wxGridRangeSelectEvent, NULL, NULL, NULL, 0, &wxLua_wxGridRangeSelectEvent_delete_function, },
! { wxluaclassname_wxGridSizeEvent, wxGridSizeEvent_methods, wxGridSizeEvent_methodCount, CLASSINFO(wxGridSizeEvent), &wxluatype_wxGridSizeEvent, wxluabaseclassnames_wxGridSizeEvent, wxluabaseclassbinds_wxGridSizeEvent, NULL, NULL, NULL, 0, &wxLua_wxGridSizeEvent_delete_function, },
! { wxluaclassname_wxGridStringTable, wxGridStringTable_methods, wxGridStringTable_methodCount, CLASSINFO(wxGridStringTable), &wxluatype_wxGridStringTable, wxluabaseclassnames_wxGridStringTable, wxluabaseclassbinds_wxGridStringTable, NULL, NULL, NULL, 0, &wxLua_wxGridStringTable_delete_function, },
! { wxluaclassname_wxGridTableBase, wxGridTableBase_methods, wxGridTableBase_methodCount, CLASSINFO(wxGridTableBase), &wxluatype_wxGridTableBase, wxluabaseclassnames_wxGridTableBase, wxluabaseclassbinds_wxGridTableBase, NULL, NULL, NULL, 0, &wxLua_wxGridTableBase_delete_function, },
! { wxluaclassname_wxGridTableMessage, wxGridTableMessage_methods, wxGridTableMessage_methodCount, NULL, &wxluatype_wxGridTableMessage, NULL, NULL, NULL, NULL, NULL, 0, &wxLua_wxGridTableMessage_delete_function, },
#endif // wxLUA_USE_wxGrid && wxUSE_GRID
#if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl
! { wxluaclassname_wxHyperlinkCtrl, wxHyperlinkCtrl_methods, wxHyperlinkCtrl_methodCount, CLASSINFO(wxHyperlinkCtrl), &wxluatype_wxHyperlinkCtrl, wxluabaseclassnames_wxHyperlinkCtrl, wxluabaseclassbinds_wxHyperlinkCtrl, NULL, NULL, NULL, 0, &wxLua_wxHyperlinkCtrl_delete_function, },
! { wxluaclassname_wxHyperlinkEvent, wxHyperlinkEvent_methods, wxHyperlinkEvent_methodCount, CLASSINFO(wxHyperlinkEvent), &wxluatype_wxHyperlinkEvent, wxluabaseclassnames_wxHyperlinkEvent, wxluabaseclassbinds_wxHyperlinkEvent, NULL, NULL, NULL, 0, &wxLua_wxHyperlinkEvent_delete_function, },
#endif // wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl
#if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK
! { wxluaclassname_wxJoystick, wxJoystick_methods, wxJoystick_methodCount, CLASSINFO(wxJoystick), &wxluatype_wxJoystick, wxluabaseclassnames_wxJoystick, wxluabaseclassbinds_wxJoystick, NULL, NULL, NULL, 0, &wxLua_wxJoystick_delete_function, },
! { wxluaclassname_wxJoystickEvent, wxJoystickEvent_methods, wxJoystickEvent_methodCount, CLASSINFO(wxJoystickEvent), &wxluatype_wxJoystickEvent, wxluabaseclassnames_wxJoystickEvent, wxluabaseclassbinds_wxJoystickEvent, NULL, NULL, NULL, 0, &wxLua_wxJoystickEvent_delete_function, },
#endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK
#if wxLUA_USE_wxSashWindow && wxUSE_SASH
! { wxluaclassname_wxLayoutAlgorithm, wxLayoutAlgorithm_methods, wxLayoutAlgorithm_methodCount, CLASSINFO(wxLayoutAlgorithm), &wxluatype_wxLayoutAlgorithm, wxluabaseclassnames_wxLayoutAlgorithm, wxluabaseclassbinds_wxLayoutAlgorithm, NULL, NULL, NULL, 0, &wxLua_wxLayoutAlgorithm_delete_function, },
#endif // wxLUA_USE_wxSashWindow && wxUSE_SASH
#if wxLUA_USE_wxGrid && wxUSE_GRID
! { wxluaclassname_wxLuaGridTableBase, wxLuaGridTableBase_methods, wxLuaGridTableBase_methodCount, CLASSINFO(wxLuaGridTableBase), &wxluatype_wxLuaGridTableBase, wxluabaseclassnames_wxLuaGridTableBase, wxluabaseclassbinds_wxLuaGridTableBase, NULL, NULL, NULL, 0, &wxLua_wxLuaGridTableBase_delete_function, },
#endif // wxLUA_USE_wxGrid && wxUSE_GRID
#if wxLUA_USE_wxSashWindow && wxUSE_SASH
! { wxluaclassname_wxQueryLayoutInfoEvent, wxQueryLayoutInfoEvent_methods, wxQueryLayoutInfoEvent_methodCount, CLASSINFO(wxQueryLayoutInfoEvent), &wxluatype_wxQueryLayoutInfoEvent, wxluabaseclassnames_wxQueryLayoutInfoEvent, wxluabaseclassbinds_wxQueryLayoutInfoEvent, NULL, NULL, NULL, 0, &wxLua_wxQueryLayoutInfoEvent_delete_function, },
! { wxluaclassname_wxSashEvent, wxSashEvent_methods, wxSashEvent_methodCount, CLASSINFO(wxSashEvent), &wxluatype_wxSashEvent, wxluabaseclassnames_wxSashEvent, wxluabaseclassbinds_wxSashEvent, NULL, NULL, NULL, 0, &wxLua_wxSashEvent_delete_function, },
! { wxluaclassname_wxSashLayoutWindow, wxSashLayoutWindow_methods, wxSashLayoutWindow_methodCount, CLASSINFO(wxSashLayoutWindow), &wxluatype_wxSashLayoutWindow, wxluabaseclassnames_wxSashLayoutWindow, wxluabaseclassbinds_wxSashLayoutWindow, NULL, NULL, NULL, 0, &wxLua_wxSashLayoutWindow_delete_function, },
! { wxluaclassname_wxSashWindow, wxSashWindow_methods, wxSashWindow_methodCount, CLASSINFO(wxSashWindow), &wxluatype_wxSashWindow, wxluabaseclassnames_wxSashWindow, wxluabaseclassbinds_wxSashWindow, NULL, NULL, NULL, 0, &wxLua_wxSashWindow_delete_function, },
#endif // wxLUA_USE_wxSashWindow && wxUSE_SASH
#if (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND)
! { wxluaclassname_wxSound, wxSound_methods, wxSound_methodCount, CLASSINFO(wxSound), &wxluatype_wxSound, wxluabaseclassnames_wxSound, wxluabaseclassbinds_wxSound, NULL, NULL, NULL, 0, &wxLua_wxSound_delete_function, },
#endif // (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND)
#if wxLUA_USE_wxSplashScreen
! { wxluaclassname_wxSplashScreen, wxSplashScreen_methods, wxSplashScreen_methodCount, CLASSINFO(wxSplashScreen), &wxluatype_wxSplashScreen, wxluabaseclassnames_wxSplashScreen, wxluabaseclassbinds_wxSplashScreen, NULL, NULL, NULL, 0, &wxLua_wxSplashScreen_delete_function, },
! { wxluaclassname_wxSplashScreenWindow, wxSplashScreenWindow_methods, wxSplashScreenWindow_methodCount, CLASSINFO(wxSplashScreenWindow), &wxluatype_wxSplashScreenWindow, wxluabaseclassnames_wxSplashScreenWindow, wxluabaseclassbinds_wxSplashScreenWindow, NULL, NULL, NULL, 0, &wxLua_wxSplashScreenWindow_delete_function, },
#endif // wxLUA_USE_wxSplashScreen
#if wxLUA_USE_wxTaskBarIcon && defined (wxHAS_TASK_BAR_ICON )
! { wxluaclassname_wxTaskBarIcon, wxTaskBarIcon_methods, wxTaskBarIcon_methodCount, CLASSINFO(wxTaskBarIcon), &wxluatype_wxTaskBarIcon, wxluabaseclassnames_wxTaskBarIcon, wxluabaseclassbinds_wxTaskBarIcon, NULL, NULL, NULL, 0, &wxLua_wxTaskBarIcon_delete_function, },
! { wxluaclassname_wxTaskBarIconEvent, wxTaskBarIconEvent_methods, wxTaskBarIconEvent_methodCount, CLASSINFO(wxTaskBarIconEvent), &wxluatype_wxTaskBarIconEvent, wxluabaseclassnames_wxTaskBarIconEvent, wxluabaseclassbinds_wxTaskBarIconEvent, NULL, NULL, NULL, 0, &wxLua_wxTaskBarIconEvent_delete_function, },
#endif // wxLUA_USE_wxTaskBarIcon && defined (wxHAS_TASK_BAR_ICON )
#if (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE)
! { wxluaclassname_wxWave, wxWave_methods, wxWave_methodCount, CLASSINFO(wxWave), &wxluatype_wxWave, wxluabaseclassnames_wxWave, wxluabaseclassbinds_wxWave, NULL, NULL, NULL, 0, &wxLua_wxWave_delete_function, },
#endif // (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE)
#if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
! { wxluaclassname_wxWizard, wxWizard_methods, wxWizard_methodCount, CLASSINFO(wxWizard), &wxluatype_wxWizard, wxluabaseclassnames_wxWizard, wxluabaseclassbinds_wxWizard, NULL, NULL, NULL, 0, &wxLua_wxWizard_delete_function, },
! { wxluaclassname_wxWizardEvent, wxWizardEvent_methods, wxWizardEvent_methodCount, CLASSINFO(wxWizardEvent), &wxluatype_wxWizardEvent, wxluabaseclassnames_wxWizardEvent, wxluabaseclassbinds_wxWizardEvent, NULL, NULL, NULL, 0, &wxLua_wxWizardEvent_delete_function, },
! { wxluaclassname_wxWizardPage, wxWizardPage_methods, wxWizardPage_methodCount, CLASSINFO(wxWizardPage), &wxluatype_wxWizardPage, wxluabaseclassnames_wxWizardPage, wxluabaseclassbinds_wxWizardPage, NULL, NULL, NULL, 0, &wxLua_wxWizardPage_delete_function, },
! { wxluaclassname_wxWizardPageSimple, wxWizardPageSimple_methods, wxWizardPageSimple_methodCount, CLASSINFO(wxWizardPageSimple), &wxluatype_wxWizardPageSimple, wxluabaseclassnames_wxWizardPageSimple, wxluabaseclassbinds_wxWizardPageSimple, NULL, NULL, NULL, 0, &wxLua_wxWizardPageSimple_delete_function, },
#endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
! { 0, 0, 0, 0, 0, 0, 0 },
};
count = sizeof(classList)/sizeof(wxLuaBindClass) - 1;
--- 16542,16652 ----
{
#if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
! { wxluaclassname_wxAboutDialogInfo, wxAboutDialogInfo_methods, wxAboutDialogInfo_methodCount, NULL, &wxluatype_wxAboutDialogInfo, NULL, NULL, NULL, NULL, NULL, 0, &wxLua_wxAboutDialogInfo_delete_function, },
#endif // wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog
#if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL
! { wxluaclassname_wxAnimation, wxAnimation_methods, wxAnimation_methodCount, CLASSINFO(wxAnimation), &wxluatype_wxAnimation, wxluabaseclassnames_wxAnimation, wxluabaseclassbinds_wxAnimation, NULL, NULL, NULL, 0, &wxLua_wxAnimation_delete_function, },
! { wxluaclassname_wxAnimationCtrl, wxAnimationCtrl_methods, wxAnimationCtrl_methodCount, CLASSINFO(wxAnimationCtrl), &wxluatype_wxAnimationCtrl, wxluabaseclassnames_wxAnimationCtrl, wxluabaseclassbinds_wxAnimationCtrl, NULL, NULL, NULL, 0, &wxLua_wxAnimationCtrl_delete_function, },
#endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL
#if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX
! { wxluaclassname_wxBitmapComboBox, wxBitmapComboBox_methods, wxBitmapComboBox_methodCount, CLASSINFO(wxBitmapComboBox), &wxluatype_wxBitmapComboBox, wxluabaseclassnames_wxBitmapComboBox, wxluabaseclassbinds_wxBitmapComboBox, NULL, NULL, NULL, 0, &wxLua_wxBitmapComboBox_delete_function, },
#endif // wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX
#if wxLUA_USE_wxSashWindow && wxUSE_SASH
! { wxluaclassname_wxCalculateLayoutEvent, wxCalculateLayoutEvent_methods, wxCalculateLayoutEvent_methodCount, CLASSINFO(wxCalculateLayoutEvent), &wxluatype_wxCalculateLayoutEvent, wxluabaseclassnames_wxCalculateLayoutEvent, wxluabaseclassbinds_wxCalculateLayoutEvent, NULL, NULL, NULL, 0, &wxLua_wxCalculateLayoutEvent_delete_function, },
#endif // wxLUA_USE_wxSashWindow && wxUSE_SASH
#if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL
! { wxluaclassname_wxCalendarCtrl, wxCalendarCtrl_methods, wxCalendarCtrl_methodCount, CLASSINFO(wxCalendarCtrl), &wxluatype_wxCalendarCtrl, wxluabaseclassnames_wxCalendarCtrl, wxluabaseclassbinds_wxCalendarCtrl, NULL, NULL, NULL, 0, &wxLua_wxCalendarCtrl_delete_function, },
! { wxluaclassname_wxCalendarDateAttr, wxCalendarDateAttr_methods, wxCalendarDateAttr_methodCount, NULL, &wxluatype_wxCalendarDateAttr, NULL, NULL, NULL, NULL, NULL, 0, &wxLua_wxCalendarDateAttr_delete_function, },
! { wxluaclassname_wxCalendarEvent, wxCalendarEvent_methods, wxCalendarEvent_methodCount, CLASSINFO(wxCalendarEvent), &wxluatype_wxCalendarEvent, wxluabaseclassnames_wxCalendarEvent, wxluabaseclassbinds_wxCalendarEvent, NULL, NULL, NULL, 0, &wxLua_wxCalendarEvent_delete_function, },
! { wxluaclassname_wxDateEvent, wxDateEvent_methods, wxDateEvent_methodCount, CLASSINFO(wxDateEvent), &wxluatype_wxDateEvent, wxluabaseclassnames_wxDateEvent, wxluabaseclassbinds_wxDateEvent, NULL, NULL, NULL, 0, &wxLua_wxDateEvent_delete_function, },
#endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL
#if wxLUA_USE_wxGrid && wxUSE_GRID
! { wxluaclassname_wxGrid, wxGrid_methods, wxGrid_methodCount, CLASSINFO(wxGrid), &wxluatype_wxGrid, wxluabaseclassnames_wxGrid, wxluabaseclassbinds_wxGrid, NULL, NULL, wxGrid_enums, wxGrid_enumCount, &wxLua_wxGrid_delete_function, },
! { wxluaclassname_wxGridCellAttr, wxGridCellAttr_methods, wxGridCellAttr_methodCount, NULL, &wxluatype_wxGridCellAttr, wxluabaseclassnames_wxGridCellAttr, wxluabaseclassbinds_wxGridCellAttr, NULL, NULL, wxGridCellAttr_enums, wxGridCellAttr_enumCount, &wxLua_wxGridCellAttr_delete_function, },
! { wxluaclassname_wxGridCellAttrProvider, wxGridCellAttrProvider_methods, wxGridCellAttrProvider_methodCount, NULL, &wxluatype_wxGridCellAttrProvider, wxluabaseclassnames_wxGridCellAttrProvider, wxluabaseclassbinds_wxGridCellAttrProvider, NULL, NULL, NULL, 0, &wxLua_wxGridCellAttrProvider_delete_function, },
! { wxluaclassname_wxGridCellAutoWrapStringEditor, wxGridCellAutoWrapStringEditor_methods, wxGridCellAutoWrapStringEditor_methodCount, NULL, &wxluatype_wxGridCellAutoWrapStringEditor, wxluabaseclassnames_wxGridCellAutoWrapStringEditor, wxluabaseclassbinds_wxGridCellAutoWrapStringEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellAutoWrapStringEditor_delete_function, },
! { wxluaclassname_wxGridCellAutoWrapStringRenderer, wxGridCellAutoWrapStringRenderer_methods, wxGridCellAutoWrapStringRenderer_methodCount, NULL, &wxluatype_wxGridCellAutoWrapStringRenderer, wxluabaseclassnames_wxGridCellAutoWrapStringRenderer, wxluabaseclassbinds_wxGridCellAutoWrapStringRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellAutoWrapStringRenderer_delete_function, },
! { wxluaclassname_wxGridCellBoolEditor, wxGridCellBoolEditor_methods, wxGridCellBoolEditor_methodCount, NULL, &wxluatype_wxGridCellBoolEditor, wxluabaseclassnames_wxGridCellBoolEditor, wxluabaseclassbinds_wxGridCellBoolEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellBoolEditor_delete_function, },
! { wxluaclassname_wxGridCellBoolRenderer, wxGridCellBoolRenderer_methods, wxGridCellBoolRenderer_methodCount, NULL, &wxluatype_wxGridCellBoolRenderer, wxluabaseclassnames_wxGridCellBoolRenderer, wxluabaseclassbinds_wxGridCellBoolRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellBoolRenderer_delete_function, },
! { wxluaclassname_wxGridCellChoiceEditor, wxGridCellChoiceEditor_methods, wxGridCellChoiceEditor_methodCount, NULL, &wxluatype_wxGridCellChoiceEditor, wxluabaseclassnames_wxGridCellChoiceEditor, wxluabaseclassbinds_wxGridCellChoiceEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellChoiceEditor_delete_function, },
! { wxluaclassname_wxGridCellCoords, wxGridCellCoords_methods, wxGridCellCoords_methodCount, NULL, &wxluatype_wxGridCellCoords, NULL, NULL, NULL, NULL, NULL, 0, &wxLua_wxGridCellCoords_delete_function, },
! { wxluaclassname_wxGridCellCoordsArray, wxGridCellCoordsArray_methods, wxGridCellCoordsArray_methodCount, NULL, &wxluatype_wxGridCellCoordsArray, NULL, NULL, NULL, NULL, NULL, 0, &wxLua_wxGridCellCoordsArray_delete_function, },
! { wxluaclassname_wxGridCellDateTimeRenderer, wxGridCellDateTimeRenderer_methods, wxGridCellDateTimeRenderer_methodCount, NULL, &wxluatype_wxGridCellDateTimeRenderer, wxluabaseclassnames_wxGridCellDateTimeRenderer, wxluabaseclassbinds_wxGridCellDateTimeRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellDateTimeRenderer_delete_function, },
! { wxluaclassname_wxGridCellEditor, wxGridCellEditor_methods, wxGridCellEditor_methodCount, NULL, &wxluatype_wxGridCellEditor, wxluabaseclassnames_wxGridCellEditor, wxluabaseclassbinds_wxGridCellEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellEditor_delete_function, },
! { wxluaclassname_wxGridCellEnumEditor, wxGridCellEnumEditor_methods, wxGridCellEnumEditor_methodCount, NULL, &wxluatype_wxGridCellEnumEditor, wxluabaseclassnames_wxGridCellEnumEditor, wxluabaseclassbinds_wxGridCellEnumEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellEnumEditor_delete_function, },
! { wxluaclassname_wxGridCellEnumRenderer, wxGridCellEnumRenderer_methods, wxGridCellEnumRenderer_methodCount, NULL, &wxluatype_wxGridCellEnumRenderer, wxluabaseclassnames_wxGridCellEnumRenderer, wxluabaseclassbinds_wxGridCellEnumRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellEnumRenderer_delete_function, },
! { wxluaclassname_wxGridCellFloatEditor, wxGridCellFloatEditor_methods, wxGridCellFloatEditor_methodCount, NULL, &wxluatype_wxGridCellFloatEditor, wxluabaseclassnames_wxGridCellFloatEditor, wxluabaseclassbinds_wxGridCellFloatEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellFloatEditor_delete_function, },
! { wxluaclassname_wxGridCellFloatRenderer, wxGridCellFloatRenderer_methods, wxGridCellFloatRenderer_methodCount, NULL, &wxluatype_wxGridCellFloatRenderer, wxluabaseclassnames_wxGridCellFloatRenderer, wxluabaseclassbinds_wxGridCellFloatRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellFloatRenderer_delete_function, },
! { wxluaclassname_wxGridCellNumberEditor, wxGridCellNumberEditor_methods, wxGridCellNumberEditor_methodCount, NULL, &wxluatype_wxGridCellNumberEditor, wxluabaseclassnames_wxGridCellNumberEditor, wxluabaseclassbinds_wxGridCellNumberEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellNumberEditor_delete_function, },
! { wxluaclassname_wxGridCellNumberRenderer, wxGridCellNumberRenderer_methods, wxGridCellNumberRenderer_methodCount, NULL, &wxluatype_wxGridCellNumberRenderer, wxluabaseclassnames_wxGridCellNumberRenderer, wxluabaseclassbinds_wxGridCellNumberRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellNumberRenderer_delete_function, },
! { wxluaclassname_wxGridCellRenderer, wxGridCellRenderer_methods, wxGridCellRenderer_methodCount, NULL, &wxluatype_wxGridCellRenderer, wxluabaseclassnames_wxGridCellRenderer, wxluabaseclassbinds_wxGridCellRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellRenderer_delete_function, },
! { wxluaclassname_wxGridCellStringRenderer, wxGridCellStringRenderer_methods, wxGridCellStringRenderer_methodCount, NULL, &wxluatype_wxGridCellStringRenderer, wxluabaseclassnames_wxGridCellStringRenderer, wxluabaseclassbinds_wxGridCellStringRenderer, NULL, NULL, NULL, 0, &wxLua_wxGridCellStringRenderer_delete_function, },
! { wxluaclassname_wxGridCellTextEditor, wxGridCellTextEditor_methods, wxGridCellTextEditor_methodCount, NULL, &wxluatype_wxGridCellTextEditor, wxluabaseclassnames_wxGridCellTextEditor, wxluabaseclassbinds_wxGridCellTextEditor, NULL, NULL, NULL, 0, &wxLua_wxGridCellTextEditor_delete_function, },
! { wxluaclassname_wxGridCellWorker, wxGridCellWorker_methods, wxGridCellWorker_methodCount, NULL, &wxluatype_wxGridCellWorker, wxluabaseclassnames_wxGridCellWorker, wxluabaseclassbinds_wxGridCellWorker, NULL, NULL, NULL, 0, &wxLua_wxGridCellWorker_delete_function, },
! { wxluaclassname_wxGridEditorCreatedEvent, wxGridEditorCreatedEvent_methods, wxGridEditorCreatedEvent_methodCount, CLASSINFO(wxGridEditorCreatedEvent), &wxluatype_wxGridEditorCreatedEvent, wxluabaseclassnames_wxGridEditorCreatedEvent, wxluabaseclassbinds_wxGridEditorCreatedEvent, NULL, NULL, NULL, 0, &wxLua_wxGridEditorCreatedEvent_delete_function, },
! { wxluaclassname_wxGridEvent, wxGridEvent_methods, wxGridEvent_methodCount, CLASSINFO(wxGridEvent), &wxluatype_wxGridEvent, wxluabaseclassnames_wxGridEvent, wxluabaseclassbinds_wxGridEvent, NULL, NULL, NULL, 0, &wxLua_wxGridEvent_delete_function, },
! { wxluaclassname_wxGridRangeSelectEvent, wxGridRangeSelectEvent_methods, wxGridRangeSelectEvent_methodCount, CLASSINFO(wxGridRangeSelectEvent), &wxluatype_wxGridRangeSelectEvent, wxluabaseclassnames_wxGridRangeSelectEvent, wxluabaseclassbinds_wxGridRangeSelectEvent, NULL, NULL, NULL, 0, &wxLua_wxGridRangeSelectEvent_delete_function, },
! { wxluaclassname_wxGridSizeEvent, wxGridSizeEvent_methods, wxGridSizeEvent_methodCount, CLASSINFO(wxGridSizeEvent), &wxluatype_wxGridSizeEvent, wxluabaseclassnames_wxGridSizeEvent, wxluabaseclassbinds_wxGridSizeEvent, NULL, NULL, NULL, 0, &wxLua_wxGridSizeEvent_delete_function, },
! { wxluaclassname_wxGridStringTable, wxGridStringTable_methods, wxGridStringTable_methodCount, CLASSINFO(wxGridStringTable), &wxluatype_wxGridStringTable, wxluabaseclassnames_wxGridStringTable, wxluabaseclassbinds_wxGridStringTable, NULL, NULL, NULL, 0, &wxLua_wxGridStringTable_delete_function, },
! { wxluaclassname_wxGridTableBase, wxGridTableBase_methods, wxGridTableBase_methodCount, CLASSINFO(wxGridTableBase), &wxluatype_wxGridTableBase, wxluabaseclassnames_wxGridTableBase, wxluabaseclassbinds_wxGridTableBase, NULL, NULL, NULL, 0, &wxLua_wxGridTableBase_delete_function, },
! { wxluaclassname_wxGridTableMessage, wxGridTableMessage_methods, wxGridTableMessage_methodCount, NULL, &wxluatype_wxGridTableMessage, NULL, NULL, NULL, NULL, NULL, 0, &wxLua_wxGridTableMessage_delete_function, },
#endif // wxLUA_USE_wxGrid && wxUSE_GRID
#if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl
! { wxluaclassname_wxHyperlinkCtrl, wxHyperlinkCtrl_methods, wxHyperlinkCtrl_methodCount, CLASSINFO(wxHyperlinkCtrl), &wxluatype_wxHyperlinkCtrl, wxluabaseclassnames_wxHyperlinkCtrl, wxluabaseclassbinds_wxHyperlinkCtrl, NULL, NULL, NULL, 0, &wxLua_wxHyperlinkCtrl_delete_function, },
! { wxluaclassname_wxHyperlinkEvent, wxHyperlinkEvent_methods, wxHyperlinkEvent_methodCount, CLASSINFO(wxHyperlinkEvent), &wxluatype_wxHyperlinkEvent, wxluabaseclassnames_wxHyperlinkEvent, wxluabaseclassbinds_wxHyperlinkEvent, NULL, NULL, NULL, 0, &wxLua_wxHyperlinkEvent_delete_function, },
#endif // wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl
#if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK
! { wxluaclassname_wxJoystick, wxJoystick_methods, wxJoystick_methodCount, CLASSINFO(wxJoystick), &wxluatype_wxJoystick, wxluabaseclassnames_wxJoystick, wxluabaseclassbinds_wxJoystick, NULL, NULL, NULL, 0, &wxLua_wxJoystick_delete_function, },
! { wxluaclassname_wxJoystickEvent, wxJoystickEvent_methods, wxJoystickEvent_methodCount, CLASSINFO(wxJoystickEvent), &wxluatype_wxJoystickEvent, wxluabaseclassnames_wxJoystickEvent, wxluabaseclassbinds_wxJoystickEvent, NULL, NULL, NULL, 0, &wxLua_wxJoystickEvent_delete_function, },
#endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK
#if wxLUA_USE_wxSashWindow && wxUSE_SASH
! { wxluaclassname_wxLayoutAlgorithm, wxLayoutAlgorithm_methods, wxLayoutAlgorithm_methodCount, CLASSINFO(wxLayoutAlgorithm), &wxluatype_wxLayoutAlgorithm, wxluabaseclassnames_wxLayoutAlgorithm, wxluabaseclassbinds_wxLayoutAlgorithm, NULL, NULL, NULL, 0, &wxLua_wxLayoutAlgorithm_delete_function, },
#endif // wxLUA_USE_wxSashWindow && wxUSE_SASH
#if wxLUA_USE_wxGrid && wxUSE_GRID
! { wxluaclassname_wxLuaGridTableBase, wxLuaGridTableBase_methods, wxLuaGridTableBase_methodCount, CLASSINFO(wxLuaGridTableBase), &wxluatype_wxLuaGridTableBase, wxluabaseclassnames_wxLuaGridTableBase, wxluabaseclassbinds_wxLuaGridTableBase, NULL, NULL, NULL, 0, &wxLua_wxLuaGridTableBase_delete_function, },
#endif // wxLUA_USE_wxGrid && wxUSE_GRID
#if wxLUA_USE_wxSashWindow && wxUSE_SASH
! { wxluaclassname_wxQueryLayoutInfoEvent, wxQueryLayoutInfoEvent_methods, wxQueryLayoutInfoEvent_methodCount, CLASSINFO(wxQueryLayoutInfoEvent), &wxluatype_wxQueryLayoutInfoEvent, wxluabaseclassnames_wxQueryLayoutInfoEvent, wxluabaseclassbinds_wxQueryLayoutInfoEvent, NULL, NULL, NULL, 0, &wxLua_wxQueryLayoutInfoEvent_delete_function, },
! { wxluaclassname_wxSashEvent, wxSashEvent_methods, wxSashEvent_methodCount, CLASSINFO(wxSashEvent), &wxluatype_wxSashEvent, wxluabaseclassnames_wxSashEvent, wxluabaseclassbinds_wxSashEvent, NULL, NULL, NULL, 0, &wxLua_wxSashEvent_delete_function, },
! { wxluaclassname_wxSashLayoutWindow, wxSashLayoutWindow_methods, wxSashLayoutWindow_methodCount, CLASSINFO(wxSashLayoutWindow), &wxluatype_wxSashLayoutWindow, wxluabaseclassnames_wxSashLayoutWindow, wxluabaseclassbinds_wxSashLayoutWindow, NULL, NULL, NULL, 0, &wxLua_wxSashLayoutWindow_delete_function, },
! { wxluaclassname_wxSashWindow, wxSashWindow_methods, wxSashWindow_methodCount, CLASSINFO(wxSashWindow), &wxluatype_wxSashWindow, wxluabaseclassnames_wxSashWindow, wxluabaseclassbinds_wxSashWindow, NULL, NULL, NULL, 0, &wxLua_wxSashWindow_delete_function, },
#endif // wxLUA_USE_wxSashWindow && wxUSE_SASH
#if (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND)
! { wxluaclassname_wxSound, wxSound_methods, wxSound_methodCount, CLASSINFO(wxSound), &wxluatype_wxSound, wxluabaseclassnames_wxSound, wxluabaseclassbinds_wxSound, NULL, NULL, NULL, 0, &wxLua_wxSound_delete_function, },
#endif // (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND)
#if wxLUA_USE_wxSplashScreen
! { wxluaclassname_wxSplashScreen, wxSplashScreen_methods, wxSplashScreen_methodCount, CLASSINFO(wxSplashScreen), &wxluatype_wxSplashScreen, wxluabaseclassnames_wxSplashScreen, wxluabaseclassbinds_wxSplashScreen, NULL, NULL, NULL, 0, &wxLua_wxSplashScreen_delete_function, },
! { wxluaclassname_wxSplashScreenWindow, wxSplashScreenWindow_methods, wxSplashScreenWindow_methodCount, CLASSINFO(wxSplashScreenWindow), &wxluatype_wxSplashScreenWindow, wxluabaseclassnames_wxSplashScreenWindow, wxluabaseclassbinds_wxSplashScreenWindow, NULL, NULL, NULL, 0, &wxLua_wxSplashScreenWindow_delete_function, },
#endif // wxLUA_USE_wxSplashScreen
#if wxLUA_USE_wxTaskBarIcon && defined (wxHAS_TASK_BAR_ICON )
! { wxluaclassname_wxTaskBarIcon, wxTaskBarIcon_methods, wxTaskBarIcon_methodCount, CLASSINFO(wxTaskBarIcon), &wxluatype_wxTaskBarIcon, wxluabaseclassnames_wxTaskBarIcon, wxluabaseclassbinds_wxTaskBarIcon, NULL, NULL, NULL, 0, &wxLua_wxTaskBarIcon_delete_function, },
! { wxluaclassname_wxTaskBarIconEvent, wxTaskBarIconEvent_methods, wxTaskBarIconEvent_methodCount, CLASSINFO(wxTaskBarIconEvent), &wxluatype_wxTaskBarIconEvent, wxluabaseclassnames_wxTaskBarIconEvent, wxluabaseclassbinds_wxTaskBarIconEvent, NULL, NULL, NULL, 0, &wxLua_wxTaskBarIconEvent_delete_function, },
#endif // wxLUA_USE_wxTaskBarIcon && defined (wxHAS_TASK_BAR_ICON )
#if (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE)
! { wxluaclassname_wxWave, wxWave_methods, wxWave_methodCount, CLASSINFO(wxWave), &wxluatype_wxWave, wxluabaseclassnames_wxWave, wxluabaseclassbinds_wxWave, NULL, NULL, NULL, 0, &wxLua_wxWave_delete_function, },
#endif // (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE)
#if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
! { wxluaclassname_wxWizard, wxWizard_methods, wxWizard_methodCount, CLASSINFO(wxWizard), &wxluatype_wxWizard, wxluabaseclassnames_wxWizard, wxluabaseclassbinds_wxWizard, NULL, NULL, NULL, 0, &wxLua_wxWizard_delete_function, },
! { wxluaclassname_wxWizardEvent, wxWizardEvent_methods, wxWizardEvent_methodCount, CLASSINFO(wxWizardEvent), &wxluatype_wxWizardEvent, wxluabaseclassnames_wxWizardEvent, wxluabaseclassbinds_wxWizardEvent, NULL, NULL, NULL, 0, &wxLua_wxWizardEvent_delete_function, },
! { wxluaclassname_wxWizardPage, wxWizardPage_methods, wxWizardPage_methodCount, CLASSINFO(wxWizardPage), &wxluatype_wxWizardPage, wxluabaseclassnames_wxWizardPage, wxluabaseclassbinds_wxWizardPage, NULL, NULL, NULL, 0, &wxLua_wxWizardPage_delete_function, },
! { wxluaclassname_wxWizardPageSimple, wxWizardPageSimple_methods, wxWizardPageSimple_methodCount, CLASSINFO(wxWizardPageSimple), &wxluatype_wxWizardPageSimple, wxluabaseclassnames_wxWizardPageSimple, wxluabaseclassbinds_wxWizardPageSimple, NULL, NULL, NULL, 0, &wxLua_wxWizardPageSimple_delete_function, },
#endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard
! { 0, 0, 0, 0, 0, 0, 0 },
};
count = sizeof(classList)/sizeof(wxLuaBindClass) - 1;
|
|
From: John L. <jr...@us...> - 2011-04-03 05:44:18
|
Update of /cvsroot/wxlua/wxLua/modules/lua/src In directory vz-cvs-4.sog:/tmp/cvs-serv7535/modules/lua/src Modified Files: Makefile Log Message: 64 compilation fix Add Makefile.wx-config to easily build all using only the wx-config script add linker --rpath so you don't have to set LD_LIBRARY_PATH to find libs Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 25 Jan 2008 23:50:51 -0000 1.9 --- Makefile 3 Apr 2011 05:44:15 -0000 1.10 *************** *** 15,20 **** LIBS= -lm $(MYLIBS) ! MYCFLAGS= ! MYLDFLAGS= MYLIBS= --- 15,20 ---- LIBS= -lm $(MYLIBS) ! MYCFLAGS= -fPIC ! MYLDFLAGS= -fPIC MYLIBS= *************** *** 97,101 **** linux: ! $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" macosx: --- 97,101 ---- linux: ! $(MAKE) all MYCFLAGS="-DLUA_USE_LINUX -fPIC" MYLIBS="-fPIC -Wl,-E -ldl -lreadline -lhistory -lncurses" macosx: |
|
From: John L. <jr...@us...> - 2011-04-03 05:44:17
|
Update of /cvsroot/wxlua/wxLua/build In directory vz-cvs-4.sog:/tmp/cvs-serv7535/build Modified Files: Makefile_wx-config.in Log Message: 64 compilation fix Add Makefile.wx-config to easily build all using only the wx-config script add linker --rpath so you don't have to set LD_LIBRARY_PATH to find libs Index: Makefile_wx-config.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile_wx-config.in 12 Aug 2010 23:41:09 -0000 1.8 --- Makefile_wx-config.in 3 Apr 2011 05:44:15 -0000 1.9 *************** *** 12,23 **** #WXLUA_DIR = ../../.. # --- wxLua parameters ------------------------------------------------------- WXLUA_LIBVERSION_CURRENT = 2 WXLUA_LIBVERSION_REVISION = 8 ! WXLUA_LIBVERSION_AGE = 7 ! # We use the wxWidgets lib dir to put our libs into (it must be writeable) ! WXLUA_LIBDIR = $(WXLIB_DIR) WXLUA_TARGET_LIBDIR = $(WXLUA_LIBDIR) --- 12,27 ---- #WXLUA_DIR = ../../.. + WXLUA_DIR_ABS := $(realpath $(WXLUA_DIR)) + # --- wxLua parameters ------------------------------------------------------- WXLUA_LIBVERSION_CURRENT = 2 WXLUA_LIBVERSION_REVISION = 8 ! WXLUA_LIBVERSION_AGE = 12 ! # We can use the wxWidgets lib dir to put our libs into (it must be writeable) ! #WXLUA_LIBDIR = $(WXLIB_DIR) ! # Put the libs into the wxLua/lib directory ! WXLUA_LIBDIR = $(WXLUA_DIR_ABS)/lib/ WXLUA_TARGET_LIBDIR = $(WXLUA_LIBDIR) *************** *** 117,121 **** CXXFLAGS := $(WXCXXFLAGS) -MMD -g -Wall -fPIC ! LDLIBS := $(WXLDLIBS) CXX := $(WXCXX) --- 121,125 ---- CXXFLAGS := $(WXCXXFLAGS) -MMD -g -Wall -fPIC ! LDLIBS := $(WXLDLIBS) -ldl -Wl,--rpath -Wl,$(WXLUA_DIR_ABS)/lib CXX := $(WXCXX) |
|
From: John L. <jr...@us...> - 2011-03-10 22:34:16
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc6 In directory vz-cvs-4.sog:/tmp/cvs-serv1609/apps/build/msvc6 Modified Files: apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp Log Message: Rebake with bakefile 0.2.9 Index: apps_app_wxluaedit.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluaedit.dsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** apps_app_wxluaedit.dsp 20 Jan 2008 22:40:04 -0000 1.13 --- apps_app_wxluaedit.dsp 10 Mar 2011 22:34:13 -0000 1.14 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode DLL Multilib" *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Multilib" *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Multilib" *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Multilib" *************** *** 266,271 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Multilib" --- 266,271 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Multilib" *************** *** 316,321 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Multilib" --- 316,321 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Multilib" *************** *** 366,371 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug DLL Multilib" --- 366,371 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug DLL Multilib" *************** *** 416,421 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Multilib" --- 416,421 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Multilib" Index: apps_app_wxluacan.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluacan.dsp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** apps_app_wxluacan.dsp 29 Jan 2008 01:38:52 -0000 1.15 --- apps_app_wxluacan.dsp 10 Mar 2011 22:34:13 -0000 1.16 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode DLL Multilib" *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode Multilib" *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release DLL Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release DLL Multilib" *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Multilib" *************** *** 266,271 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug Unicode DLL Multilib" --- 266,271 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug Unicode DLL Multilib" *************** *** 316,321 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug Unicode Multilib" --- 316,321 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug Unicode Multilib" *************** *** 366,371 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug DLL Multilib" --- 366,371 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug DLL Multilib" *************** *** 416,421 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw2... [truncated message content] |
|
From: John L. <jr...@us...> - 2011-03-10 22:34:15
|
Update of /cvsroot/wxlua/wxLua/apps In directory vz-cvs-4.sog:/tmp/cvs-serv1609/apps Modified Files: Makefile.in Log Message: Rebake with bakefile 0.2.9 Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Makefile.in 29 Jan 2008 01:38:52 -0000 1.71 --- Makefile.in 10 Mar 2011 22:34:13 -0000 1.72 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.3 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.9 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 93,99 **** @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) ! @COND_BUILD_DEBUG_UNICODE_1@WXLIBPOSTFIX = ud ! @COND_BUILD_DEBUG_UNICODE_0@WXLIBPOSTFIX = d ! @COND_BUILD_RELEASE_UNICODE_1@WXLIBPOSTFIX = u @COND_USE_SYSTEM_LUA_0@__app_lua___depname = ../bin/lua$(EXEEXT) @COND_PLATFORM_MAC_0@__app_lua___mac_setfilecmd = @true --- 93,99 ---- @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) ! @COND_BUILD_debug_UNICODE_1@WXLIBPOSTFIX = ud ! @COND_BUILD_debug_UNICODE_0@WXLIBPOSTFIX = d ! @COND_BUILD_release_UNICODE_1@WXLIBPOSTFIX = u @COND_USE_SYSTEM_LUA_0@__app_lua___depname = ../bin/lua$(EXEEXT) @COND_PLATFORM_MAC_0@__app_lua___mac_setfilecmd = @true *************** *** 204,208 **** all: $(__app_lua___depname) $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxlua_bundle___depname) $(__app_wxluaedit___depname) $(__app_wxluaedit_bundle___depname) $(__app_wxluacan___depname) $(__app_wxluacan_bundle___depname) $(__app_wxluafreeze___depname) $(__app_wxluafreeze_bundle___depname) ! install: all $(__install_app_lua___depname) $(__install_app_luac___depname) $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) uninstall: $(__uninstall_app_lua___depname) $(__uninstall_app_luac___depname) $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) --- 204,208 ---- all: $(__app_lua___depname) $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxlua_bundle___depname) $(__app_wxluaedit___depname) $(__app_wxluaedit_bundle___depname) $(__app_wxluacan___depname) $(__app_wxluacan_bundle___depname) $(__app_wxluafreeze___depname) $(__app_wxluafreeze_bundle___depname) ! install: $(__install_app_lua___depname) $(__install_app_luac___depname) $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) uninstall: $(__uninstall_app_lua___depname) $(__uninstall_app_luac___depname) $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) *************** *** 234,242 **** @COND_USE_SYSTEM_LUA_0@../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! @COND_USE_SYSTEM_LUA_0@ $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm @COND_USE_SYSTEM_LUA_0@ @COND_USE_SYSTEM_LUA_0@ $(__app_lua___mac_setfilecmd) ! @COND_USE_SYSTEM_LUA_0@install_app_lua: @COND_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_SYSTEM_LUA_0@ $(INSTALL_PROGRAM) ../bin/lua$(EXEEXT) $(DESTDIR)$(bindir) --- 234,242 ---- @COND_USE_SYSTEM_LUA_0@../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! @COND_USE_SYSTEM_LUA_0@ $(CC) -o $@ $(APP_LUA_OBJECTS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LDFLAGS) -llua5.1 -lm $(LIBS) @COND_USE_SYSTEM_LUA_0@ @COND_USE_SYSTEM_LUA_0@ $(__app_lua___mac_setfilecmd) ! @COND_USE_SYSTEM_LUA_0@install_app_lua: $(__app_lua___depname) @COND_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_SYSTEM_LUA_0@ $(INSTALL_PROGRAM) ../bin/lua$(EXEEXT) $(DESTDIR)$(bindir) *************** *** 246,254 **** @COND_SHARED_0_USE_SYSTEM_LUA_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm @COND_SHARED_0_USE_SYSTEM_LUA_0@ @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(__app_luac___mac_setfilecmd) ! @COND_SHARED_0_USE_SYSTEM_LUA_0@install_app_luac: @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(INSTALL_PROGRAM) ../bin/luac$(EXEEXT) $(DESTDIR)$(bindir) --- 246,254 ---- @COND_SHARED_0_USE_SYSTEM_LUA_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(CC) -o $@ $(APP_LUAC_OBJECTS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LDFLAGS) -llua5.1 -lm $(LIBS) @COND_SHARED_0_USE_SYSTEM_LUA_0@ @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(__app_luac___mac_setfilecmd) ! @COND_SHARED_0_USE_SYSTEM_LUA_0@install_app_luac: $(__app_luac___depname) @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(INSTALL_PROGRAM) ../bin/luac$(EXEEXT) $(DESTDIR)$(bindir) *************** *** 258,267 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../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 -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @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) ../bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) --- 258,267 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LDFLAGS) $(WXLUA_LIBS) $(WX_LIBS) $(LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @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: $(__app_wxlua___depname) @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) ../bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) *************** *** 293,302 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../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 -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @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) ../bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) --- 293,302 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LDFLAGS) $(WXLUA_LIBS) -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) $(LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @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: $(__app_wxluaedit___depname) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) ../bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) *************** *** 328,337 **** @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @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) ../bin/wxluacan$(EXEEXT) $(DESTDIR)$(bindir) --- 328,337 ---- @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LDFLAGS) $(WXLUA_LIBS) $(WX_LIBS) $(LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___os2_emxbindcmd) ! @COND_USE_WXLUACANAPP_1@install_app_wxluacan: $(__app_wxluacan___depname) @COND_USE_WXLUACANAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXLUACANAPP_1@ $(INSTALL_PROGRAM) ../bin/wxluacan$(EXEEXT) $(DESTDIR)$(bindir) *************** *** 363,372 **** @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @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) ../bin/wxluafreeze$(EXEEXT) $(DESTDIR)$(bindir) --- 363,372 ---- @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LDFLAGS) $(WXLUA_LIBS) $(WX_LIBS) $(LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___os2_emxbindcmd) ! @COND_USE_WXLUAFREEZEAPP_1@install_app_wxluafreeze: $(__app_wxluafreeze___depname) @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_PROGRAM) ../bin/wxluafreeze$(EXEEXT) $(DESTDIR)$(bindir) *************** *** 447,451 **** # Include dependency info, if present: ! @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_luac uninstall_app_luac install_app_wxlua uninstall_app_wxlua app_wxlua_bundle install_app_wxluaedit uninstall_app_wxluaedit app_wxluaedit_bundle install_app_wxluacan uninstall_app_wxluacan app_wxluacan_bundle install_app_wxluafreeze uninstall_app_wxluafreeze app_wxluafreeze_bundle --- 447,456 ---- # Include dependency info, if present: ! @IF_GNU_MAKE@-include ./.deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua \ ! install_app_luac uninstall_app_luac install_app_wxlua uninstall_app_wxlua \ ! app_wxlua_bundle install_app_wxluaedit uninstall_app_wxluaedit \ ! app_wxluaedit_bundle install_app_wxluacan uninstall_app_wxluacan \ ! app_wxluacan_bundle install_app_wxluafreeze uninstall_app_wxluafreeze \ ! app_wxluafreeze_bundle |
|
From: John L. <jr...@us...> - 2011-03-09 04:12:18
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles
In directory vz-cvs-4.sog:/tmp/cvs-serv17867
Modified Files:
wxluabase.bkl
Log Message:
Add msvc2008prj
Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** wxluabase.bkl 17 Jan 2008 00:37:37 -0000 1.48
--- wxluabase.bkl 9 Mar 2011 04:12:16 -0000 1.49
***************
*** 62,79 ****
<!-- generic linux/GNU-based system. -->
<set var="TARGETING_WIN32">
! <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">0</if>
<if cond="FORMAT!='autoconf' and FORMAT!='gnu'">1</if>
</set>
<set var="TARGETING_UNIX">
! <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">1</if>
<if cond="FORMAT!='autoconf' and FORMAT!='gnu'">0</if>
</set>
<set var="TARGETING_IDE">
! <if cond="FORMAT in [ 'msvc6prj', 'cbuilderx', 'kdevelop', 'msvs2005prj' ]">1</if>
! <if cond="FORMAT not in [ 'msvc6prj', 'cbuilderx', 'kdevelop', 'msvs2005prj' ]">0</if>
</set>
<set var="TARGETING_MAKEFILE">
! <if cond="FORMAT in [ 'msvc6prj', 'cbuilderx', 'kdevelop', 'msvs2005prj' ]">0</if>
! <if cond="FORMAT not in [ 'msvc6prj', 'cbuilderx', 'kdevelop', 'msvs2005prj' ]">1</if>
</set>
--- 62,79 ----
<!-- generic linux/GNU-based system. -->
<set var="TARGETING_WIN32">
! <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">0</if>
<if cond="FORMAT!='autoconf' and FORMAT!='gnu'">1</if>
</set>
<set var="TARGETING_UNIX">
! <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">1</if>
<if cond="FORMAT!='autoconf' and FORMAT!='gnu'">0</if>
</set>
<set var="TARGETING_IDE">
! <if cond="FORMAT in ['cbuilderx', 'kdevelop', 'msvc6prj', 'msvs2005prj', 'msvs2008prj']">1</if>
! <if cond="FORMAT not in ['cbuilderx', 'kdevelop', 'msvc6prj', 'msvs2005prj', 'msvs2008prj']">0</if>
</set>
<set var="TARGETING_MAKEFILE">
! <if cond="FORMAT in ['cbuilderx', 'kdevelop', 'msvc6prj', 'msvs2005prj', 'msvs2008prj']">0</if>
! <if cond="FORMAT not in ['cbuilderx', 'kdevelop', 'msvc6prj', 'msvs2005prj', 'msvs2008prj']">1</if>
</set>
***************
*** 113,117 ****
<set var="WXLUA_LIB_LIST">
! wxluasocket wxluadebug wxlua wxbindadv wxbindaui wxbindbase wxbindcore wxbindgl wxbindhtml wxbindmedia wxbindnet wxbindrichtext wxbindstc wxbindxml wxbindxrc lua
</set>
--- 113,132 ----
<set var="WXLUA_LIB_LIST">
! wxbindadv
! wxbindaui
! wxbindbase
! wxbindcore
! wxbindgl
! wxbindhtml
! wxbindmedia
! wxbindnet
! wxbindrichtext
! wxbindstc
! wxbindxml
! wxbindxrc
! wxluasocket
! wxluadebug
! wxlua
! lua
</set>
|
|
From: John L. <jr...@us...> - 2011-03-09 03:38:13
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles/presets
In directory vz-cvs-4.sog:/tmp/cvs-serv1424
Modified Files:
wx.bkl wx_unix.bkl wx_win32.bkl
Log Message:
Update version from wxCode
Index: wx_win32.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/presets/wx_win32.bkl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wx_win32.bkl 16 Jan 2008 16:46:11 -0000 1.3
--- wx_win32.bkl 9 Mar 2011 03:38:11 -0000 1.4
***************
*** 83,90 ****
<!-- All the possible mixes for the wx library names -->
<set var="WXLIB_BASE_NAME">
! <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)</if>
! <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d</if>
! <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u</if>
! <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud</if>
<!--
--- 83,87 ----
<!-- All the possible mixes for the wx library names -->
<set var="WXLIB_BASE_NAME">
! <if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</if>
<!--
***************
*** 94,101 ****
monolithic library
-->
! <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WX_PORT)$(WX_VERSION)</if>
! <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WX_PORT)$(WX_VERSION)d</if>
! <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WX_PORT)$(WX_VERSION)u</if>
! <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WX_PORT)$(WX_VERSION)ud</if>
</set>
--- 91,95 ----
monolithic library
-->
! <if cond="WX_MONOLITHIC=='1'">wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)</if>
</set>
***************
*** 104,120 ****
<define-global-tag name="define-wxbase-lib-name">
<set var="WXLIB_$(value.upper())_NAME">
! <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">
! wxbase$(WX_VERSION)_$(value)
! </if>
! <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">
! wxbase$(WX_VERSION)d_$(value)
! </if>
! <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">
! wxbase$(WX_VERSION)u_$(value)
! </if>
! <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">
! wxbase$(WX_VERSION)ud_$(value)
</if>
! </set>
</define-global-tag>
--- 98,105 ----
<define-global-tag name="define-wxbase-lib-name">
<set var="WXLIB_$(value.upper())_NAME">
! <if cond="WX_MONOLITHIC=='0'">
! wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
</if>
! </set>
</define-global-tag>
***************
*** 127,141 ****
<define-global-tag name="define-wxlib-name">
<set var="WXLIB_$(value.upper())_NAME">
! <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">
! wx$(WX_PORT)$(WX_VERSION)_$(value)
! </if>
! <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">
! wx$(WX_PORT)$(WX_VERSION)d_$(value)
! </if>
! <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">
! wx$(WX_PORT)$(WX_VERSION)u_$(value)
! </if>
! <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">
! wx$(WX_PORT)$(WX_VERSION)ud_$(value)
</if>
</set>
--- 112,117 ----
<define-global-tag name="define-wxlib-name">
<set var="WXLIB_$(value.upper())_NAME">
! <if cond="WX_MONOLITHIC=='0'">
! wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
</if>
</set>
***************
*** 149,158 ****
<define-wxlib-name>qa</define-wxlib-name>
<define-wxlib-name>dbgrid</define-wxlib-name>
<define-wxlib-name>aui</define-wxlib-name>
<define-wxlib-name>richtext</define-wxlib-name>
! <!-- The GL lib is not part of the monolithic build in 2.8, treat it as a contrib
! <define-wxlib-name>gl</define-wxlib-name>
! -->
--- 125,134 ----
<define-wxlib-name>qa</define-wxlib-name>
<define-wxlib-name>dbgrid</define-wxlib-name>
+ <define-wxlib-name>gl</define-wxlib-name>
<define-wxlib-name>aui</define-wxlib-name>
<define-wxlib-name>richtext</define-wxlib-name>
!
!
***************
*** 188,191 ****
--- 164,168 ----
<if cond="value=='html'"><sys-lib>$(WXLIB_HTML_NAME)</sys-lib></if>
<if cond="value=='adv'"><sys-lib>$(WXLIB_ADV_NAME)</sys-lib></if>
+ <if cond="value=='gl'"><sys-lib>$(WXLIB_GL_NAME)</sys-lib></if>
<if cond="value=='dbgrid'"><sys-lib>$(WXLIB_DBGRID_NAME)</sys-lib></if>
<if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if>
***************
*** 193,201 ****
<if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
- <!-- The GL lib isn't part of the monolithic build in 2.8, treat it as a contrib -->
- <if cond="value=='gl'">
- <sys-lib>wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
- </if>
-
<!-- wx-lib can be used also to link against contrib libraries
(which always have the same name, regardless of WX_MONOLITHIC value) -->
--- 170,173 ----
Index: wx.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/presets/wx.bkl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wx.bkl 24 Apr 2007 14:39:52 -0000 1.2
--- wx.bkl 9 Mar 2011 03:38:11 -0000 1.3
***************
*** 169,173 ****
<!-- 'gnu' format needs to redefine the following options later in wx_unix.bkl -->
! <if cond="FORMAT=='gnu'">
<set var="WX_UNICODE"/>
<set var="WX_DEBUG"/>
--- 169,173 ----
<!-- 'gnu' format needs to redefine the following options later in wx_unix.bkl -->
! <if cond="FORMAT=='gnu' or FORMAT=='xcode2'">
<set var="WX_UNICODE"/>
<set var="WX_DEBUG"/>
***************
*** 244,248 ****
<if cond="not isdefined('WX_DIR')">
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
! <option name="WX_DIR" category="path">
<default-value>$(WX_DIR_DEFAULT)</default-value>
<description>
--- 244,248 ----
<if cond="not isdefined('WX_DIR')">
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
! <option name="WX_DIR" category="path" never_empty="1">
<default-value>$(WX_DIR_DEFAULT)</default-value>
<description>
***************
*** 273,277 ****
<set var="__wx_included_impl">0</set>
! <if cond="FORMAT in ['autoconf','gnu']">
<include file="wx_unix.bkl"/>
<set var="__wx_included_impl">1</set>
--- 273,277 ----
<set var="__wx_included_impl">0</set>
! <if cond="FORMAT in ['autoconf','gnu','xcode2']">
<include file="wx_unix.bkl"/>
<set var="__wx_included_impl">1</set>
***************
*** 383,387 ****
<dirname>$(_DIRNAME)</dirname>
! <if cond="FORMAT_SUPPORTS_ACTIONS=='1'">
<set var="__mkdir_tgt">make_dir_$(id)</set>
--- 383,387 ----
<dirname>$(_DIRNAME)</dirname>
! <if cond="FORMAT_SUPPORTS_ACTIONS=='1' and FORMAT!='xcode2'">
<set var="__mkdir_tgt">make_dir_$(id)</set>
***************
*** 394,398 ****
if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
</command>
! </modify-target>
<!-- the following code is mostly equivalent to a:
--- 394,398 ----
if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
</command>
! </modify-target>
<!-- the following code is mostly equivalent to a:
***************
*** 424,428 ****
-->
<define-tag name="wxlike-paths" rules="exe,lib,dll,module">
! <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
<!-- WXLIBPATH is a path like "/lib/vc_lib"
NOTE: even if this template is going to be used for a "lib"
--- 424,428 ----
-->
<define-tag name="wxlike-paths" rules="exe,lib,dll,module">
! <if cond="FORMAT!='autoconf' and FORMAT!='gnu' and FORMAT!='xcode2'">
<!-- WXLIBPATH is a path like "/lib/vc_lib"
NOTE: even if this template is going to be used for a "lib"
Index: wx_unix.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/presets/wx_unix.bkl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wx_unix.bkl 24 Apr 2007 14:29:46 -0000 1.1
--- wx_unix.bkl 9 Mar 2011 03:38:11 -0000 1.2
***************
*** 60,64 ****
<!-- ============================================================== -->
! <if cond="FORMAT=='gnu'">
<!-- remove those WX_* vars which were created just to avoid the definition
--- 60,64 ----
<!-- ============================================================== -->
! <if cond="FORMAT=='gnu' or FORMAT=='xcode2'">
<!-- remove those WX_* vars which were created just to avoid the definition
***************
*** 80,84 ****
</set>
<option name="WX_PORT">
! <values>gtk1,gtk2,msw,x11,motif,mgl,mac,dfb</values>
<default-value force="1">$(WX_PORT_DEFAULT)</default-value>
<description>
--- 80,84 ----
</set>
<option name="WX_PORT">
! <values>gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb</values>
<default-value force="1">$(WX_PORT_DEFAULT)</default-value>
<description>
***************
*** 222,226 ****
<!-- ============================================================== -->
! <if cond="FORMAT not in ['gnu','autoconf']">
<error>
Don't include presets/wx_unix.bkl directly, use presets/wx.bkl.
--- 222,226 ----
<!-- ============================================================== -->
! <if cond="FORMAT not in ['gnu','autoconf','xcode2']">
<error>
Don't include presets/wx_unix.bkl directly, use presets/wx.bkl.
|
|
From: John L. <jr...@us...> - 2010-12-03 04:56:40
|
Update of /cvsroot/wxlua/wxLua/samples In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14413/samples Modified Files: settings.wx.lua Log Message: To wxLongLong::ToString() not ToLong() for wxGetFreeMemory() Index: settings.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/settings.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** settings.wx.lua 22 Jan 2008 04:45:39 -0000 1.5 --- settings.wx.lua 3 Dec 2010 04:56:32 -0000 1.6 *************** *** 208,212 **** AddListItem({"", ""}) AddListItem({"wx.wxGetCwd()", wx.wxGetCwd()}) ! AddListItem({"wx.wxGetFreeMemory():ToLong()", wx.wxGetFreeMemory():ToLong()}) AddListItem({"wx.wxGetHostName()", wx.wxGetHostName()}) AddListItem({"wx.wxGetFullHostName()", wx.wxGetFullHostName()}) --- 208,212 ---- AddListItem({"", ""}) AddListItem({"wx.wxGetCwd()", wx.wxGetCwd()}) ! AddListItem({"wx.wxGetFreeMemory():ToString()", wx.wxGetFreeMemory():ToString()}) AddListItem({"wx.wxGetHostName()", wx.wxGetHostName()}) AddListItem({"wx.wxGetFullHostName()", wx.wxGetFullHostName()}) |
|
From: John L. <jr...@us...> - 2010-12-03 04:39:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5929/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlstate.h Log Message: Fix wxLuaObject to take a lua_State for all functions so that it works with coroutines. Send an error message in Lua is trying to install a wxEventHandler from a coroutine since a) it will only be called when the thread is suspended or dead b) we cannot track when the coroutine state is closed so we will call an invalid lua_State Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** wxlbind.h 21 Dec 2009 04:06:13 -0000 1.92 --- wxlbind.h 3 Dec 2010 04:39:43 -0000 1.93 *************** *** 35,39 **** // and is used as an end marker for the wxLuaArgType array that // represents function prototype argument types in the wxLuaBindCFunc struct ! // and it must always be 0. The Lua type LUA_TNONE starts at 1 since // Lua arrays start at 1. --- 35,39 ---- // and is used as an end marker for the wxLuaArgType array that // represents function prototype argument types in the wxLuaBindCFunc struct ! // and it must always be 0. The Lua type LUA_TNONE starts at 1 since // Lua arrays start at 1. *************** *** 105,109 **** // Note that we do not use the original since we may not be linked // to the binding library that defines them. ! // Their values are set at compile time if linked to library, // see wxbase_rules.lua and wxcore_rules.lua extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxEvent; // wxLua type for wxEvent --- 105,109 ---- // Note that we do not use the original since we may not be linked // to the binding library that defines them. ! // Their values are set at compile time if linked to library, // see wxbase_rules.lua and wxcore_rules.lua extern WXDLLIMPEXP_DATA_WXLUA(int*) p_wxluatype_wxEvent; // wxLua type for wxEvent *************** *** 247,251 **** wxLuaBindNumber* enums; // Class member enums or NULL if none int enums_n; // number of enums ! wxlua_delete_function delete_fn; // Function that will cast the void* pointer // to the class type and then call delete on it. --- 247,251 ---- wxLuaBindNumber* enums; // Class member enums or NULL if none int enums_n; // number of enums ! wxlua_delete_function delete_fn; // Function that will cast the void* pointer // to the class type and then call delete on it. *************** *** 288,291 **** --- 288,295 ---- // Also with a simple extension by a proxy member value it can be used // to provide pointers to the wxValidator classes. + // Note that all functions take a lua_State since we may be called from a + // coroutine with a different lua_State pointer and we want to make sure + // that we push/pull our object from the right lua_State. The registry + // where we store our object is shared by coroutine states. // ---------------------------------------------------------------------------- *************** *** 305,320 **** // in the wxlua_lreg_refs_key registy table wxLuaObject(const wxLuaState& wxlState, int stack_idx); virtual ~wxLuaObject(); // Get the value of the reference object and push it onto the stack. // (or a proxy if the object has been aliased for a wxValidator class.) // returns true if the object is valid and has a reference, returns false // on failure and nothing is pushed on the stack. ! bool GetObject(); // Remove any existing reference and allocate another. // You cannot call this after calling GetXXXPtr(), but only if this wraps a // stack item. ! void SetObject(int stack_idx); // The following methods are used by the wxValidator interface --- 309,331 ---- // in the wxlua_lreg_refs_key registy table wxLuaObject(const wxLuaState& wxlState, int stack_idx); + wxLuaObject(lua_State* L, int stack_idx); virtual ~wxLuaObject(); + // YOU MUST ALWAYS CALL THIS before deleting this object! + // This is because we do not store a pointer to the lua_State in the + // constructor since we may be used in coroutines and we need to + // make sure that we push the data into the correct lua_State. + void RemoveReference(lua_State* L); + // Get the value of the reference object and push it onto the stack. // (or a proxy if the object has been aliased for a wxValidator class.) // returns true if the object is valid and has a reference, returns false // on failure and nothing is pushed on the stack. ! bool GetObject(lua_State* L); // Remove any existing reference and allocate another. // You cannot call this after calling GetXXXPtr(), but only if this wraps a // stack item. ! void SetObject(lua_State* L, int stack_idx); // The following methods are used by the wxValidator interface *************** *** 324,337 **** // a pointer to read/write from/to. // You may only call only one of these per instance of a wxLuaObject class. ! bool *GetBoolPtr(); ! int *GetIntPtr(); ! wxString *GetStringPtr(); ! wxArrayInt *GetArrayPtr(); ! // Return a flag value that indicated whether the ! // object is being used by a wxValidator class (else wxLUAOBJECT_NONE). wxLuaObject_Type GetAllocationFlag() const { return m_alloc_flag; } ! ! wxLuaState GetwxLuaState() const; protected: --- 335,349 ---- // a pointer to read/write from/to. // You may only call only one of these per instance of a wxLuaObject class. ! bool *GetBoolPtr(lua_State* L); ! int *GetIntPtr(lua_State* L); ! wxString *GetStringPtr(lua_State* L); ! wxArrayInt *GetArrayPtr(lua_State* L); ! // Return a flag value that indicated which GetXXXPrt() function was called ! // else wxLUAOBJECT_NONE. This is for using this object with a wxValidator class wxLuaObject_Type GetAllocationFlag() const { return m_alloc_flag; } ! // Returns the reference number in the wxlua_lreg_refs_key Lua Registry table ! // or LUA_NOREF if not setup. ! int GetReference() const { return m_reference; } protected: *************** *** 611,615 **** // Call only once after subclassed version is created to sort the bindings appropriately ! void InitBinding(); // Register the classes, defines, strings, events, objects, and functions --- 623,627 ---- // Call only once after subclassed version is created to sort the bindings appropriately ! void InitBinding(); // Register the classes, defines, strings, events, objects, and functions Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** wxlstate.h 30 Jan 2010 19:00:48 -0000 1.129 --- wxlstate.h 3 Dec 2010 04:39:43 -0000 1.130 *************** *** 659,663 **** //---------------------------------------------------------------------------- ! // enum wxLuaState_Type is for the function // wxLuaState::Create(lua_State* L, int state_type = wxLUASTATE_GETSTATE); enum wxLuaState_Type --- 659,664 ---- //---------------------------------------------------------------------------- ! // enum wxLuaState_Type is for the functions ! // wxLuaState(lua_State* L, int state_type = wxLUASTATE_GETSTATE) // wxLuaState::Create(lua_State* L, int state_type = wxLUASTATE_GETSTATE); enum wxLuaState_Type *************** *** 1061,1065 **** void lua_PushValue(int index); void lua_Remove(int index); ! void lua_Pop(int count); void lua_Insert(int index); void lua_Replace(int index); --- 1062,1066 ---- void lua_PushValue(int index); void lua_Remove(int index); ! void lua_Pop(int count) const; void lua_Insert(int index); void lua_Replace(int index); |
|
From: John L. <jr...@us...> - 2010-12-03 04:39:51
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5929/wxLua/bindings/wxwidgets Modified Files: wxcore_override.hpp Log Message: Fix wxLuaObject to take a lua_State for all functions so that it works with coroutines. Send an error message in Lua is trying to install a wxEventHandler from a coroutine since a) it will only be called when the thread is suspended or dead b) we cannot track when the coroutine state is closed so we will call an invalid lua_State Index: wxcore_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxcore_override.hpp 1 Oct 2009 04:21:01 -0000 1.21 --- wxcore_override.hpp 3 Dec 2010 04:39:43 -0000 1.22 *************** *** 652,656 **** { wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 2, wxluatype_wxLuaObject); ! returns = new wxTextValidator(style, valPtr->GetStringPtr()); } else --- 652,656 ---- { wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 2, wxluatype_wxLuaObject); ! returns = new wxTextValidator(style, valPtr->GetStringPtr(L)); } else *************** *** 671,675 **** wxLuaObject *boolPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(boolPtr->GetBoolPtr()); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); --- 671,675 ---- wxLuaObject *boolPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(boolPtr->GetBoolPtr(L)); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); *************** *** 688,692 **** wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(valPtr->GetStringPtr()); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); --- 688,692 ---- wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(valPtr->GetStringPtr(L)); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); *************** *** 705,709 **** wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(valPtr->GetIntPtr()); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); --- 705,709 ---- wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(valPtr->GetIntPtr(L)); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); *************** *** 722,726 **** wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(valPtr->GetArrayPtr()); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); --- 722,726 ---- wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(valPtr->GetArrayPtr(L)); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); |
|
From: John L. <jr...@us...> - 2010-12-03 04:39:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5929/wxLua/modules/wxbind/src Modified Files: wxcore_core.cpp Log Message: Fix wxLuaObject to take a lua_State for all functions so that it works with coroutines. Send an error message in Lua is trying to install a wxEventHandler from a coroutine since a) it will only be called when the thread is suspended or dead b) we cannot track when the coroutine state is closed so we will call an invalid lua_State Index: wxcore_core.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_core.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxcore_core.cpp 1 Oct 2009 04:21:01 -0000 1.15 --- wxcore_core.cpp 3 Dec 2010 04:39:43 -0000 1.16 *************** *** 657,661 **** { wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 2, wxluatype_wxLuaObject); ! returns = new wxTextValidator(style, valPtr->GetStringPtr()); } else --- 657,661 ---- { wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 2, wxluatype_wxLuaObject); ! returns = new wxTextValidator(style, valPtr->GetStringPtr(L)); } else *************** *** 725,729 **** wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(valPtr->GetArrayPtr()); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); --- 725,729 ---- wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(valPtr->GetArrayPtr(L)); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); *************** *** 745,749 **** wxLuaObject *boolPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(boolPtr->GetBoolPtr()); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); --- 745,749 ---- wxLuaObject *boolPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(boolPtr->GetBoolPtr(L)); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); *************** *** 765,769 **** wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(valPtr->GetIntPtr()); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); --- 765,769 ---- wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(valPtr->GetIntPtr(L)); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); *************** *** 785,789 **** wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(valPtr->GetStringPtr()); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); --- 785,789 ---- wxLuaObject *valPtr = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call constructor ! wxGenericValidator *returns = new wxGenericValidator(valPtr->GetStringPtr(L)); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxGenericValidator); |
|
From: John L. <jr...@us...> - 2010-12-03 04:39:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5929/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp wxlstate.cpp wxlua_bind.cpp Log Message: Fix wxLuaObject to take a lua_State for all functions so that it works with coroutines. Send an error message in Lua is trying to install a wxEventHandler from a coroutine since a) it will only be called when the thread is suspended or dead b) we cannot track when the coroutine state is closed so we will call an invalid lua_State Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.188 retrieving revision 1.189 diff -C2 -d -r1.188 -r1.189 *** wxlstate.cpp 30 Jan 2010 19:00:49 -0000 1.188 --- wxlstate.cpp 3 Dec 2010 04:39:43 -0000 1.189 *************** *** 559,563 **** lua_pop(L, 1); // pop delobj table ! // delete the object using the function stored in the wxLuaBindClass if (obj_ptr) --- 559,563 ---- lua_pop(L, 1); // pop delobj table ! // delete the object using the function stored in the wxLuaBindClass if (obj_ptr) *************** *** 1942,1945 **** --- 1942,1946 ---- // already have a method, delete it before replacing it wxLuaObject* o = (wxLuaObject*)lua_touserdata( L, -1 ); + o->RemoveReference(L); delete o; } *************** *** 1984,1988 **** { // if we've got the object, put it on top of the stack ! if (push_method && wxlObj->GetObject()) found = true; else if (!push_method) --- 1985,1989 ---- { // if we've got the object, put it on top of the stack ! if (push_method && wxlObj->GetObject(L)) found = true; else if (!push_method) *************** *** 2014,2017 **** --- 2015,2019 ---- { wxLuaObject* o = (wxLuaObject*)lua_touserdata(L, -1); + o->RemoveReference(L); delete o; } *************** *** 2642,2646 **** wxlState = (wxLuaState*)lua_touserdata( L, -1 ); ! lua_pop(L, 1); // pop the wxLuaStateRefData or nil on failure if (wxlState && (wxlState->GetLuaState() != L)) --- 2644,2648 ---- wxlState = (wxLuaState*)lua_touserdata( L, -1 ); ! lua_pop(L, 1); // pop the wxLuaState or nil on failure if (wxlState && (wxlState->GetLuaState() != L)) *************** *** 3432,3436 **** lua_remove(M_WXLSTATEDATA->m_lua_State, index); } ! void wxLuaState::lua_Pop(int count) { wxCHECK_RET(Ok(), wxT("Invalid wxLuaState")); --- 3434,3438 ---- lua_remove(M_WXLSTATEDATA->m_lua_State, index); } ! void wxLuaState::lua_Pop(int count) const { wxCHECK_RET(Ok(), wxT("Invalid wxLuaState")); Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** wxlbind.cpp 30 Jan 2010 19:00:48 -0000 1.128 --- wxlbind.cpp 3 Dec 2010 04:39:43 -0000 1.129 *************** *** 70,76 **** --- 70,94 ---- m_reference = m_wxlState->wxluaR_Ref(stack_idx, &wxlua_lreg_refs_key); } + wxLuaObject::wxLuaObject(lua_State* L, int stack_idx) + : m_alloc_flag(wxLUAOBJECT_NONE), + m_int(0) // GCC only wants one initializer + + { + m_wxlState = new wxLuaState(L, wxLUASTATE_GETSTATE); + + // set up the reference to the item on the stack + m_reference = m_wxlState->wxluaR_Ref(stack_idx, &wxlua_lreg_refs_key); + } wxLuaObject::~wxLuaObject() { + if ((m_reference != LUA_NOREF) && m_wxlState->Ok() && !m_wxlState->IsClosing()) + { + m_wxlState->wxluaR_Unref(m_reference, &wxlua_lreg_refs_key); + m_reference = LUA_NOREF; + } + else if (!m_wxlState->IsClosing()) + wxPrintf(wxT("~wxLuaObject %d %d %d\n"), (int)m_reference, (int)m_wxlState->Ok(), (int)m_wxlState->IsClosing()); + if (m_alloc_flag == wxLUAOBJECT_STRING) delete m_string; *************** *** 78,98 **** delete m_arrayInt; - // If a refererence exists, remove it, but don't bother if Lua is being closed - if ((m_reference != LUA_NOREF) && m_wxlState->Ok() && !m_wxlState->IsClosing()) - m_wxlState->wxluaR_Unref(m_reference, &wxlua_lreg_refs_key); - delete m_wxlState; } ! wxLuaState wxLuaObject::GetwxLuaState() const { ! return (m_wxlState != NULL) ? *m_wxlState : wxNullLuaState; } ! bool wxLuaObject::GetObject() { - wxCHECK_MSG(m_wxlState->Ok(), false, wxT("Invalid wxLuaState")); - lua_State* L = m_wxlState->GetLuaState(); - if (m_alloc_flag == wxLUAOBJECT_BOOL) { --- 96,113 ---- delete m_arrayInt; delete m_wxlState; } ! void wxLuaObject::RemoveReference(lua_State* L) { ! // If a refererence exists, remove it, but don't bother if Lua is being closed ! if ((m_reference != LUA_NOREF) && m_wxlState->Ok() && !m_wxlState->IsClosing()) ! wxluaR_unref(L, m_reference, &wxlua_lreg_refs_key); ! ! m_reference = LUA_NOREF; } ! bool wxLuaObject::GetObject(lua_State* L) { if (m_alloc_flag == wxLUAOBJECT_BOOL) { *************** *** 115,119 **** return true; } ! else if (wxluaR_getref(L, m_reference, &wxlua_lreg_refs_key)) return true; --- 130,134 ---- return true; } ! else if ((m_reference != LUA_NOREF) && wxluaR_getref(L, m_reference, &wxlua_lreg_refs_key)) return true; *************** *** 121,174 **** } ! void wxLuaObject::SetObject(int stack_idx) { ! wxCHECK_RET(m_wxlState->Ok(), wxT("Invalid wxLuaState")); if (m_reference != LUA_NOREF) // FIXME should this error out? ! m_wxlState->wxluaR_Unref(m_reference, &wxlua_lreg_refs_key); ! m_reference = m_wxlState->wxluaR_Ref(stack_idx, &wxlua_lreg_refs_key); } ! bool *wxLuaObject::GetBoolPtr() { ! wxCHECK_MSG(m_wxlState->Ok(), 0, wxT("Invalid wxLuaState")); ! wxCHECK_MSG(m_alloc_flag == wxLUAOBJECT_NONE, 0, wxT("wxLuaObject already initialized in wxLuaObject::GetBoolPtr")); ! if ((m_reference != LUA_NOREF) && GetObject()) { ! m_bool = (m_wxlState->lua_ToBoolean(-1) != 0); ! m_alloc_flag = wxLUAOBJECT_BOOL; ! m_wxlState->lua_Pop(1); } return &m_bool; } ! int *wxLuaObject::GetIntPtr() { ! wxCHECK_MSG(m_wxlState->Ok(), false, wxT("Invalid wxLuaState")); ! wxCHECK_MSG(m_alloc_flag == wxLUAOBJECT_NONE, 0, wxT("wxLuaObject already initialized in wxLuaObject::GetIntPtr")); ! if ((m_reference != LUA_NOREF) && GetObject()) { ! m_int = (int)m_wxlState->lua_ToNumber(-1); ! m_alloc_flag = wxLUAOBJECT_INT; ! m_wxlState->lua_Pop(1); } return &m_int; } ! wxString *wxLuaObject::GetStringPtr() { ! wxCHECK_MSG(m_wxlState->Ok(), false, wxT("Invalid wxLuaState")); ! wxCHECK_MSG(m_alloc_flag == wxLUAOBJECT_NONE, 0, wxT("wxLuaObject already initialized in wxLuaObject::GetStringPtr")); ! ! m_string = new wxString(); // create valid string for return ! if ((m_reference != LUA_NOREF) && GetObject()) { ! *m_string = m_wxlState->lua_TowxString(-1); ! m_alloc_flag = wxLUAOBJECT_STRING; ! m_wxlState->lua_Pop(1); } --- 136,200 ---- } ! void wxLuaObject::SetObject(lua_State* L, int stack_idx) { ! wxCHECK_RET(m_alloc_flag == wxLUAOBJECT_NONE, wxT("wxLuaObject already initialized by wxLuaObject::GetXXXPtr")); if (m_reference != LUA_NOREF) // FIXME should this error out? ! wxluaR_unref(L, m_reference, &wxlua_lreg_refs_key); ! m_reference = wxluaR_ref(L, stack_idx, &wxlua_lreg_refs_key); } ! bool *wxLuaObject::GetBoolPtr(lua_State* L) { ! wxCHECK_MSG((m_alloc_flag == wxLUAOBJECT_NONE) || (m_alloc_flag == wxLUAOBJECT_BOOL), ! 0, wxT("wxLuaObject already initialized in wxLuaObject::GetBoolPtr")); ! if (m_alloc_flag == wxLUAOBJECT_NONE) { ! if ((m_reference != LUA_NOREF) && GetObject(L)) ! { ! m_bool = (lua_toboolean(L, -1) != 0); ! m_alloc_flag = wxLUAOBJECT_BOOL; ! lua_pop(L, 1); ! } } + return &m_bool; } ! int *wxLuaObject::GetIntPtr(lua_State* L) { ! wxCHECK_MSG((m_alloc_flag == wxLUAOBJECT_NONE) || (m_alloc_flag == wxLUAOBJECT_INT), ! 0, wxT("wxLuaObject already initialized in wxLuaObject::GetIntPtr")); ! if (m_alloc_flag == wxLUAOBJECT_NONE) { ! if ((m_reference != LUA_NOREF) && GetObject(L)) ! { ! m_int = (int)lua_tonumber(L, -1); ! m_alloc_flag = wxLUAOBJECT_INT; ! lua_pop(L, 1); ! } } + return &m_int; } ! wxString *wxLuaObject::GetStringPtr(lua_State* L) { ! wxCHECK_MSG((m_alloc_flag == wxLUAOBJECT_NONE) || (m_alloc_flag == wxLUAOBJECT_STRING), ! 0, wxT("wxLuaObject already initialized in wxLuaObject::GetStringPtr")); ! if (m_alloc_flag == wxLUAOBJECT_NONE) { ! m_string = new wxString(); // create valid string for return ! ! if ((m_reference != LUA_NOREF) && GetObject(L)) ! { ! *m_string = lua2wx(lua_tostring(L, -1)); ! m_alloc_flag = wxLUAOBJECT_STRING; ! lua_pop(L, 1); ! } } *************** *** 176,192 **** } ! wxArrayInt *wxLuaObject::GetArrayPtr() { ! wxCHECK_MSG(m_wxlState->Ok(), false, wxT("Invalid wxLuaState")); ! wxCHECK_MSG(m_alloc_flag == wxLUAOBJECT_NONE, 0, wxT("wxLuaObject already initialized in wxLuaObject::GetArrayPtr")); ! ! m_arrayInt = new wxArrayInt(); // create valid array for return ! if ((m_reference != LUA_NOREF) && GetObject()) { ! *m_arrayInt = (wxArrayInt&)m_wxlState->GetwxArrayInt(-1); // coerce wxLuaSmartwxArrayInt ! m_alloc_flag = wxLUAOBJECT_ARRAYINT; ! m_wxlState->lua_Pop(1); } return m_arrayInt; } --- 202,222 ---- } ! wxArrayInt *wxLuaObject::GetArrayPtr(lua_State* L) { ! wxCHECK_MSG((m_alloc_flag == wxLUAOBJECT_NONE) || (m_alloc_flag == wxLUAOBJECT_ARRAYINT), ! 0, wxT("wxLuaObject already initialized in wxLuaObject::GetArrayPtr")); ! if (m_alloc_flag == wxLUAOBJECT_NONE) { ! m_arrayInt = new wxArrayInt(); // create valid array for return ! ! if ((m_reference != LUA_NOREF) && GetObject(L)) ! { ! *m_arrayInt = (wxArrayInt&)wxlua_getwxArrayInt(L, -1); // coerce wxLuaSmartwxArrayInt ! m_alloc_flag = wxLUAOBJECT_ARRAYINT; ! lua_pop(L, 1); ! } } + return m_arrayInt; } *************** *** 384,388 **** if (WXLUA_HASBIT(wxlMethod->method_type, WXLUAMETHOD_GETPROP)) { ! // The user wants to call the C++ function as a property // which is treated as though it were a member variable. // It shouldn't have been called as a function with () --- 414,418 ---- if (WXLUA_HASBIT(wxlMethod->method_type, WXLUAMETHOD_GETPROP)) { ! // The user wants to call the C++ function as a property // which is treated as though it were a member variable. // It shouldn't have been called as a function with () *************** *** 512,520 **** { found = true; - wxLuaState wxlState(L); - wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); void *obj_ptr = wxlua_touserdata(L, 1, false); ! wxLuaObject* wxlObj = new wxLuaObject(wxlState, 3); wxlua_setderivedmethod(L, obj_ptr, name, wxlObj); } --- 542,548 ---- { found = true; void *obj_ptr = wxlua_touserdata(L, 1, false); ! wxLuaObject* wxlObj = new wxLuaObject(L, 3); wxlua_setderivedmethod(L, obj_ptr, name, wxlObj); } *************** *** 1588,1592 **** // update if a binding was added or removed ! if ((sm_bindingArray_initialized == binding_count) && !force_update) return; --- 1616,1620 ---- // update if a binding was added or removed ! if ((sm_bindingArray_initialized == binding_count) && !force_update) return; Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** wxlcallb.cpp 21 Dec 2009 04:06:14 -0000 1.62 --- wxlcallb.cpp 3 Dec 2010 04:39:43 -0000 1.63 *************** *** 53,56 **** --- 53,67 ---- wxCHECK_MSG(wxlState.Ok(), wxT("Invalid wxLuaState"), wxT("Invalid wxLuaState")); + // We must always be installed into the main lua_State, never a coroutine + // 1) It will be called only when the lua_State is suspended or dead + // 2) We have no way of tracking when the coroutine state is garbage collected/dead + if (lua_pushthread(wxlState.GetLuaState()) != 1) + { + wxlState.lua_Pop(1); + return wxT("wxLua: Creating a callback function in a coroutine is not allowed since it will only be called when the thread is either suspended or dead."); + } + + wxlState.lua_Pop(1); + m_wxlState = wxlState; m_evtHandler = evtHandler; *************** *** 94,101 **** { return wxString::Format(wxT("%s(%d) -> wxLuaEventCallback(%p, ids %d, %d)|wxEvtHandler(%p) -> %s : %s"), ! lua2wx(m_wxlBindEvent ? m_wxlBindEvent->name : "?NULL?").c_str(), (int)GetEventType(), this, m_id, m_last_id, ! m_evtHandler, m_evtHandler ? m_evtHandler->GetClassInfo()->GetClassName() : wxT("?NULL?"), m_wxlState.GetwxLuaTypeName(m_wxlBindEvent ? *m_wxlBindEvent->wxluatype : WXLUA_TUNKNOWN).c_str()); --- 105,112 ---- { return wxString::Format(wxT("%s(%d) -> wxLuaEventCallback(%p, ids %d, %d)|wxEvtHandler(%p) -> %s : %s"), ! lua2wx(m_wxlBindEvent ? m_wxlBindEvent->name : "?NULL?").c_str(), (int)GetEventType(), this, m_id, m_last_id, ! m_evtHandler, m_evtHandler ? m_evtHandler->GetClassInfo()->GetClassName() : wxT("?NULL?"), m_wxlState.GetwxLuaTypeName(m_wxlBindEvent ? *m_wxlBindEvent->wxluatype : WXLUA_TUNKNOWN).c_str()); *************** *** 188,195 **** } else ! wxlState.wxlua_Error("wxLua: wxEvtHandler::Connect() in wxLuaEventCallback::OnEvent(), function is not a Lua function."); } else ! wxlState.wxlua_Error("wxLua: wxEvtHandler::Connect() in wxLuaEventCallback::OnEvent(), function to call is not refed."); wxlState.lua_SetTop(oldTop); // pop function and error message from the stack (if they're there) --- 199,206 ---- } else ! wxlState.wxlua_Error("wxLua: wxEvtHandler::Connect() in wxLuaEventCallback::OnEvent(), callback function is not a Lua function."); } else ! wxlState.wxlua_Error("wxLua: wxEvtHandler::Connect() in wxLuaEventCallback::OnEvent(), callback function to call is not refed."); wxlState.lua_SetTop(oldTop); // pop function and error message from the stack (if they're there) Index: wxlua_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wxlua_bind.cpp 21 Dec 2009 04:06:14 -0000 1.36 --- wxlua_bind.cpp 3 Dec 2010 04:39:43 -0000 1.37 *************** *** 86,90 **** wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call GetObject that push the item onto the stack, or nil ! if (self->GetObject()) return 1; --- 86,90 ---- wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call GetObject that push the item onto the stack, or nil ! if (self->GetObject(L)) return 1; *************** *** 103,107 **** wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call SetObject ! self->SetObject(1); // return the number of parameters return 0; --- 103,107 ---- wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call SetObject ! self->SetObject(L, 1); // return the number of parameters return 0; *************** *** 118,126 **** static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) { - wxLuaState wxlState(L); - wxLuaObject *returns; // call constructor ! returns = new wxLuaObject(wxlState, 1); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxLuaObject); --- 118,124 ---- static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) { wxLuaObject *returns; // call constructor ! returns = new wxLuaObject(L, 1); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxLuaObject); |
|
From: John L. <jr...@us...> - 2010-12-03 04:39:51
|
Update of /cvsroot/wxlua/wxLua/bindings/wxlua In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5929/wxLua/bindings/wxlua Modified Files: override.hpp Log Message: Fix wxLuaObject to take a lua_State for all functions so that it works with coroutines. Send an error message in Lua is trying to install a wxEventHandler from a coroutine since a) it will only be called when the thread is suspended or dead b) we cannot track when the coroutine state is closed so we will call an invalid lua_State Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** override.hpp 21 Dec 2009 04:06:10 -0000 1.25 --- override.hpp 3 Dec 2010 04:39:43 -0000 1.26 *************** *** 900,908 **** static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) { - wxLuaState wxlState(L); - wxLuaObject *returns; // call constructor ! returns = new wxLuaObject(wxlState, 1); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxLuaObject); --- 900,906 ---- static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L) { wxLuaObject *returns; // call constructor ! returns = new wxLuaObject(L, 1); // add to tracked memory list wxluaO_addgcobject(L, returns, wxluatype_wxLuaObject); *************** *** 921,925 **** wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call SetObject ! self->SetObject(1); // return the number of parameters return 0; --- 919,923 ---- wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call SetObject ! self->SetObject(L, 1); // return the number of parameters return 0; *************** *** 934,938 **** wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call GetObject that push the item onto the stack, or nil ! if (self->GetObject()) return 1; --- 932,936 ---- wxLuaObject *self = (wxLuaObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaObject); // call GetObject that push the item onto the stack, or nil ! if (self->GetObject(L)) return 1; |
