wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/modules/wxluasocket/src wxldtarg.cpp, 1.46, 1.47 wxluasocket_bind.cpp, 1.31, 1.32

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6578/wxLua/modules/wxluasocket/src

Modified Files:
	wxldtarg.cpp wxluasocket_bind.cpp 
Log Message:
Use the correct length of the char buffer from wx2lua, not the original wxString.
use better names for the parameters to wxLuaDebuggerServer::Run


Index: wxldtarg.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** wxldtarg.cpp	26 Mar 2008 05:01:34 -0000	1.46
--- wxldtarg.cpp	26 Mar 2008 05:23:48 -0000	1.47
***************
*** 132,136 ****
                  wxString buf =  luaBuffer.AfterFirst(wxT('\0'));
  
!                 int rc = m_wxlState.LuaDoBuffer(wx2lua(buf), buf.Length(),
                                              wx2lua(bufFilename));
  
--- 132,137 ----
                  wxString buf =  luaBuffer.AfterFirst(wxT('\0'));
  
!                 wxLuaCharBuffer char_buf(buf);
!                 int rc = m_wxlState.LuaDoBuffer(char_buf, char_buf.Length(),
                                              wx2lua(bufFilename));
  

Index: wxluasocket_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wxluasocket_bind.cpp	29 Jan 2008 04:22:54 -0000	1.31
--- wxluasocket_bind.cpp	26 Mar 2008 05:23:48 -0000	1.32
***************
*** 232,246 ****
  static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Run }};
! //     bool Run(const wxString &file, const wxString &fileName)
  static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L)
  {
      // const wxString fileName
!     const wxString fileName = wxlua_getwxStringtype(L, 3);
!     // const wxString file
!     const wxString file = wxlua_getwxStringtype(L, 2);
      // get this
      wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer);
      // call Run
!     bool returns = (self->Run(file, fileName));
      // push the result flag
      lua_pushboolean(L, returns);
--- 232,246 ----
  static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L);
  static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxLuaDebuggerServer_Run }};
! //     bool Run(const wxString &fileName, const wxString &buffer)
  static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L)
  {
+     // const wxString buffer
+     const wxString buffer = wxlua_getwxStringtype(L, 3);
      // const wxString fileName
!     const wxString fileName = wxlua_getwxStringtype(L, 2);
      // get this
      wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, wxluatype_wxLuaDebuggerServer);
      // call Run
!     bool returns = (self->Run(fileName, buffer));
      // push the result flag
      lua_pushboolean(L, returns);

[Wxlua-commit] wxLua/bindings/wxluasocket wxluasocket.i,1.14,1.15

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings/wxluasocket
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6578/wxLua/bindings/wxluasocket

Modified Files:
	wxluasocket.i 
Log Message:
Use the correct length of the char buffer from wx2lua, not the original wxString.
use better names for the parameters to wxLuaDebuggerServer::Run


Index: wxluasocket.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/wxluasocket.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxluasocket.i	16 Jul 2007 19:34:15 -0000	1.14
--- wxluasocket.i	26 Mar 2008 05:23:47 -0000	1.15
***************
*** 36,40 ****
      bool RemoveBreakPoint(const wxString &fileName, int lineNumber)
      bool ClearAllBreakPoints()
!     bool Run(const wxString &file, const wxString &fileName)
      bool Step()
      bool StepOver()
--- 36,40 ----
      bool RemoveBreakPoint(const wxString &fileName, int lineNumber)
      bool ClearAllBreakPoints()
!     bool Run(const wxString &fileName, const wxString &buffer)
      bool Step()
      bool StepOver()

[Wxlua-commit] wxLua/bindings/wxwidgets wxcore_controls.i,1.5,1.6

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28499/wxLua/bindings/wxwidgets

Modified Files:
	wxcore_controls.i 
Log Message:
Fix ungcobject() in Lua, compilation fix.
Switch to using wxConvCurrent for lua2wx and wx2lua
   ifdefed using WXLUA_USE_WXSTR_CONVCURRENT
Allow Continue to work in the wxLuaDebugTarget (thanks to andre arpin)


Index: wxcore_controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_controls.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxcore_controls.i	29 Jan 2008 00:49:11 -0000	1.5
--- wxcore_controls.i	26 Mar 2008 05:01:31 -0000	1.6
***************
*** 845,848 ****
--- 845,849 ----
      virtual bool CanRedo()
      virtual bool CanUndo()
+     virtual void ChangeValue(const wxString& value)
      virtual void Clear()
      virtual void Copy()

[Wxlua-commit] wxLua/bindings/wxlua override.hpp,1.21,1.22

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings/wxlua
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28499/wxLua/bindings/wxlua

Modified Files:
	override.hpp 
Log Message:
Fix ungcobject() in Lua, compilation fix.
Switch to using wxConvCurrent for lua2wx and wx2lua
   ifdefed using WXLUA_USE_WXSTR_CONVCURRENT
Allow Continue to work in the wxLuaDebugTarget (thanks to andre arpin)


Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** override.hpp	17 Mar 2008 03:05:01 -0000	1.21
--- override.hpp	26 Mar 2008 05:01:29 -0000	1.22
***************
*** 170,176 ****
  {
      bool ret = false;
!     if (wxluaO_isgcobject(L, 1))
      {
!         ret = wxluaO_undeletegcobject(L, 1);
      }
  
--- 170,184 ----
  {
      bool ret = false;
! 
!     int l_type = lua_type(L, 1);
! 
!     if (!wxlua_iswxluatype(l_type, WXLUA_TUSERDATA))
!         wxlua_argerror(L, 1, wxT("a 'userdata'"));
!     
!     void* o = wxlua_touserdata(L, 1, false);
!     
!     if (wxluaO_isgcobject(L, o))
      {
!         ret = wxluaO_undeletegcobject(L, o);
      }
  

[Wxlua-commit] wxLua/modules/wxlua/include wxlstate.h,1.120,1.121

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28499/wxLua/modules/wxlua/include

Modified Files:
	wxlstate.h 
Log Message:
Fix ungcobject() in Lua, compilation fix.
Switch to using wxConvCurrent for lua2wx and wx2lua
   ifdefed using WXLUA_USE_WXSTR_CONVCURRENT
Allow Continue to work in the wxLuaDebugTarget (thanks to andre arpin)


Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** wxlstate.h	29 Jan 2008 00:49:15 -0000	1.120
--- wxlstate.h	26 Mar 2008 05:01:33 -0000	1.121
***************
*** 28,36 ****
--- 28,43 ----
  // ----------------------------------------------------------------------------
  
+ #define WXLUA_USE_WXSTR_CONVCURRENT 1
+ 
  // Convert a 8-bit ANSI C Lua String into a wxString
  inline WXDLLIMPEXP_WXLUA wxString lua2wx(const char* luastr)
  {
+ #if WXLUA_USE_WXSTR_CONVCURRENT
+ 
      if (luastr == NULL) return wxEmptyString; // check for NULL
  
+     return wxString(luastr, *wxConvCurrent);
+ 
+ #else //!WXLUA_USE_WXSTR_CONVCURRENT
  #if wxUSE_UNICODE
      wxString str(luastr, wxConvUTF8);
***************
*** 43,46 ****
--- 50,54 ----
  
      return str;
+ #endif //WXLUA_USE_WXSTR_CONVCURRENT
  }
  
***************
*** 48,51 ****
--- 56,64 ----
  inline const WXDLLIMPEXP_WXLUA wxCharBuffer wx2lua(const wxString& wxstr)
  {
+ #if WXLUA_USE_WXSTR_CONVCURRENT
+     wxCharBuffer buffer(wxstr.mb_str(*wxConvCurrent));
+     return buffer;
+ 
+ #else //!WXLUA_USE_WXSTR_CONVCURRENT
      wxCharBuffer buffer(wxConvUTF8.cWC2MB(wxstr.wc_str(*wxConvCurrent))); // skieu
  
***************
*** 54,59 ****
--- 67,74 ----
  
      return buffer;
+ #endif //WXLUA_USE_WXSTR_CONVCURRENT
  }
  
+ 
  // Convert a wxString to 8-bit ANSI C Lua Buffer and store it
  class WXDLLIMPEXP_WXLUA wxLuaCharBuffer

[Wxlua-commit] wxLua/modules/wxbind/src wxcore_controls.cpp, 1.14, 1.15

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28499/wxLua/modules/wxbind/src

Modified Files:
	wxcore_controls.cpp 
Log Message:
Fix ungcobject() in Lua, compilation fix.
Switch to using wxConvCurrent for lua2wx and wx2lua
   ifdefed using WXLUA_USE_WXSTR_CONVCURRENT
Allow Continue to work in the wxLuaDebugTarget (thanks to andre arpin)


Index: wxcore_controls.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_controls.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxcore_controls.cpp	29 Jan 2008 04:22:52 -0000	1.14
--- wxcore_controls.cpp	26 Mar 2008 05:01:31 -0000	1.15
***************
*** 7741,7744 ****
--- 7741,7760 ----
  }
  
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxTextCtrl_ChangeValue[] = { &wxluatype_wxTextCtrl, &wxluatype_TSTRING, NULL };
+ static int LUACALL wxLua_wxTextCtrl_ChangeValue(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxTextCtrl_ChangeValue[1] = {{ wxLua_wxTextCtrl_ChangeValue, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxTextCtrl_ChangeValue }};
+ //     virtual void ChangeValue(const wxString& value)
+ static int LUACALL wxLua_wxTextCtrl_ChangeValue(lua_State *L)
+ {
+     // const wxString value
+     const wxString value = wxlua_getwxStringtype(L, 2);
+     // get this
+     wxTextCtrl * self = (wxTextCtrl *)wxluaT_getuserdatatype(L, 1, wxluatype_wxTextCtrl);
+     // call ChangeValue
+     self->ChangeValue(value);
+ 
+     return 0;
+ }
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_wxTextCtrl_Clear[] = { &wxluatype_wxTextCtrl, NULL };
  static int LUACALL wxLua_wxTextCtrl_Clear(lua_State *L);
***************
*** 8582,8585 ****
--- 8598,8602 ----
      { "CanRedo", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextCtrl_CanRedo, 1, NULL },
      { "CanUndo", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextCtrl_CanUndo, 1, NULL },
+     { "ChangeValue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextCtrl_ChangeValue, 1, NULL },
      { "Clear", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextCtrl_Clear, 1, NULL },
      { "Copy", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxTextCtrl_Copy, 1, NULL },

[Wxlua-commit] wxLua/modules/wxluasocket/src wxldtarg.cpp, 1.45, 1.46

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28499/wxLua/modules/wxluasocket/src

Modified Files:
	wxldtarg.cpp 
Log Message:
Fix ungcobject() in Lua, compilation fix.
Switch to using wxConvCurrent for lua2wx and wx2lua
   ifdefed using WXLUA_USE_WXSTR_CONVCURRENT
Allow Continue to work in the wxLuaDebugTarget (thanks to andre arpin)


Index: wxldtarg.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** wxldtarg.cpp	15 Jan 2008 01:04:04 -0000	1.45
--- wxldtarg.cpp	26 Mar 2008 05:01:34 -0000	1.46
***************
*** 260,263 ****
--- 260,264 ----
          case wxLUASOCKET_DEBUGGER_CMD_DEBUG_CONTINUE:
          {
+             m_forceBreak = false;
              ret = Continue();
              break;

[Wxlua-commit] wxLua/modules/wxlua/src wxlua_bind.cpp,1.29,1.30

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28499/wxLua/modules/wxlua/src

Modified Files:
	wxlua_bind.cpp 
Log Message:
Fix ungcobject() in Lua, compilation fix.
Switch to using wxConvCurrent for lua2wx and wx2lua
   ifdefed using WXLUA_USE_WXSTR_CONVCURRENT
Allow Continue to work in the wxLuaDebugTarget (thanks to andre arpin)


Index: wxlua_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** wxlua_bind.cpp	17 Mar 2008 03:05:04 -0000	1.29
--- wxlua_bind.cpp	26 Mar 2008 05:01:33 -0000	1.30
***************
*** 1044,1050 ****
  {
      bool ret = false;
!     if (wxluaO_isgcobject(L, 1))
      {
!         ret = wxluaO_undeletegcobject(L, 1);
      }
  
--- 1044,1058 ----
  {
      bool ret = false;
! 
!     int l_type = lua_type(L, 1);
! 
!     if (!wxlua_iswxluatype(l_type, WXLUA_TUSERDATA))
!         wxlua_argerror(L, 1, wxT("a 'userdata'"));
!     
!     void* o = wxlua_touserdata(L, 1, false);
!     
!     if (wxluaO_isgcobject(L, o))
      {
!         ret = wxluaO_undeletegcobject(L, o);
      }
  

[Wxlua-commit] wxLua/modules/wxbind/src wxadv_bind.cpp,1.13,1.14

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28571/wxLua/modules/wxbind/src

Modified Files:
	wxadv_bind.cpp 
Log Message:
Add unused (as of yet) WXLUAMETHOD_ENCAPSULATE bit for wxLuaMethod struct
Add binding function wxlua.ungcobject(void*) (for testing really)
Add hack for wxGridCellWorker::GetRef() to see what the ref count is.
   uses ugly #define to get to it's private m_nRef member.


Index: wxadv_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxadv_bind.cpp	26 Feb 2008 14:51:34 -0000	1.13
--- wxadv_bind.cpp	17 Mar 2008 03:05:02 -0000	1.14
***************
*** 6926,6929 ****
--- 6926,6945 ----
  }
  
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxGridCellWorker_GetRef[] = { &wxluatype_wxGridCellWorker, NULL };
+ static int LUACALL wxLua_wxGridCellWorker_GetRef(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxGridCellWorker_GetRef[1] = {{ wxLua_wxGridCellWorker_GetRef, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGridCellWorker_GetRef }};
+ //     int GetRef() const // wxLua added function to help track if it needs to be refed
+ static int LUACALL wxLua_wxGridCellWorker_GetRef(lua_State *L)
+ {
+     // get this
+     wxGridCellWorker * self = (wxGridCellWorker *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGridCellWorker);
+     // call GetRef
+     int returns = (self->GetRef());
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_wxGridCellWorker_IncRef[] = { &wxluatype_wxGridCellWorker, NULL };
  static int LUACALL wxLua_wxGridCellWorker_IncRef(lua_State *L);
***************
*** 6965,6968 ****
--- 6981,6985 ----
  wxLuaBindMethod wxGridCellWorker_methods[] = {
      { "DecRef", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGridCellWorker_DecRef, 1, NULL },
+     { "GetRef", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGridCellWorker_GetRef, 1, NULL },
      { "IncRef", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGridCellWorker_IncRef, 1, NULL },
      { "SetParameters", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGridCellWorker_SetParameters, 1, NULL },
***************
*** 15275,15295 ****
  wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellAttr, wxGridCellAttr)
  wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellAttrProvider, wxGridCellAttrProvider)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellAutoWrapStringEditor, wxGridCellAutoWrapStringEditor)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellAutoWrapStringRenderer, wxGridCellAutoWrapStringRenderer)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellBoolEditor, wxGridCellBoolEditor)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellBoolRenderer, wxGridCellBoolRenderer)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellChoiceEditor, wxGridCellChoiceEditor)
  wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellCoords, wxGridCellCoords)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellDateTimeRenderer, wxGridCellDateTimeRenderer)
  wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellEditor, wxGridCellEditor)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellEnumEditor, wxGridCellEnumEditor)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellEnumRenderer, wxGridCellEnumRenderer)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellFloatEditor, wxGridCellFloatEditor)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellFloatRenderer, wxGridCellFloatRenderer)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellNumberEditor, wxGridCellNumberEditor)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellNumberRenderer, wxGridCellNumberRenderer)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellRenderer, wxGridCellRenderer)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellStringRenderer, wxGridCellStringRenderer)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellTextEditor, wxGridCellTextEditor)
  wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellWorker, wxGridCellWorker)
  wxLUA_IMPLEMENT_ENCAPSULATION(wxGridTableMessage, wxGridTableMessage)
--- 15292,15312 ----
  wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellAttr, wxGridCellAttr)
  wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellAttrProvider, wxGridCellAttrProvider)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellAutoWrapStringEditor, wxGridCellAutoWrapStringEditor)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellAutoWrapStringRenderer, wxGridCellAutoWrapStringRenderer)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellBoolEditor, wxGridCellBoolEditor)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellBoolRenderer, wxGridCellBoolRenderer)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellChoiceEditor, wxGridCellChoiceEditor)
  wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellCoords, wxGridCellCoords)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellDateTimeRenderer, wxGridCellDateTimeRenderer)
  wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellEditor, wxGridCellEditor)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellEnumEditor, wxGridCellEnumEditor)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellEnumRenderer, wxGridCellEnumRenderer)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellFloatEditor, wxGridCellFloatEditor)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellFloatRenderer, wxGridCellFloatRenderer)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellNumberEditor, wxGridCellNumberEditor)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellNumberRenderer, wxGridCellNumberRenderer)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellRenderer, wxGridCellRenderer)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellStringRenderer, wxGridCellStringRenderer)
! wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellTextEditor, wxGridCellTextEditor)
  wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(wxGridCellWorker, wxGridCellWorker)
  wxLUA_IMPLEMENT_ENCAPSULATION(wxGridTableMessage, wxGridTableMessage)

[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h, 1.84, 1.85 wxlcallb.h, 1.28, 1.29

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28571/wxLua/modules/wxlua/include

Modified Files:
	wxlbind.h wxlcallb.h 
Log Message:
Add unused (as of yet) WXLUAMETHOD_ENCAPSULATE bit for wxLuaMethod struct
Add binding function wxlua.ungcobject(void*) (for testing really)
Add hack for wxGridCellWorker::GetRef() to see what the ref count is.
   uses ugly #define to get to it's private m_nRef member.


Index: wxlcallb.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** wxlcallb.h	4 Jan 2008 00:21:08 -0000	1.28
--- wxlcallb.h	17 Mar 2008 03:05:04 -0000	1.29
***************
*** 22,30 ****
  // callback user data for event.
  //
! // Do NOT delete wxLuaEventCallbacks since the wxEvtHandler deletes the 
  // callback user data itself.
  //
  // The function wxLuaEventCallback::OnAllEvents() generically handles all wxEvents
! // by retrieving the wxLuaEventCallback instance from the wxEvent userdata 
  // to call wxLuaEventCallback::OnEvent() on the correct instance.
  // ----------------------------------------------------------------------------
--- 22,30 ----
  // callback user data for event.
  //
! // Do NOT delete wxLuaEventCallbacks since the wxEvtHandler deletes the
  // callback user data itself.
  //
  // The function wxLuaEventCallback::OnAllEvents() generically handles all wxEvents
! // by retrieving the wxLuaEventCallback instance from the wxEvent userdata
  // to call wxLuaEventCallback::OnEvent() on the correct instance.
  // ----------------------------------------------------------------------------
***************
*** 69,74 ****
  
      // Central event handler that calls OnEvent() for the actual
!     //   wxLuaEventCallback callback userdata. 
!     // This function is treated like a static function that all handlers of 
      //   this class will call.
      void OnAllEvents(wxEvent& event);
--- 69,74 ----
  
      // Central event handler that calls OnEvent() for the actual
!     //   wxLuaEventCallback callback userdata.
!     // This function is treated like a static function that all handlers of
      //   this class will call.
      void OnAllEvents(wxEvent& event);
***************
*** 120,125 ****
  
      // Central event handler that calls OnDestroy() for the actual
!     //   wxLuaWinDestroyCallback callback user data. 
!     // This function is treated like a static function that all handlers of 
      //   this class will call.
      void OnAllDestroyEvents(wxWindowDestroyEvent& event);
--- 120,125 ----
  
      // Central event handler that calls OnDestroy() for the actual
!     //   wxLuaWinDestroyCallback callback user data.
!     // This function is treated like a static function that all handlers of
      //   this class will call.
      void OnAllDestroyEvents(wxWindowDestroyEvent& event);

Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** wxlbind.h	31 Jan 2008 04:34:07 -0000	1.84
--- wxlbind.h	17 Mar 2008 03:05:03 -0000	1.85
***************
*** 125,128 ****
--- 125,130 ----
                                        // original class.
  
+     WXLUAMETHOD_ENCAPSULATE = 0x4000, // This class is not derived from a wxObject
+ 
      WXLUAMETHOD_CHECKED_OVERLOAD = 0x10000, // Class method has been checked to see if it is
                                              // overloaded function from the base class by
***************
*** 364,367 ****
--- 366,379 ----
  }
  
+ #define wxGridCellWorkerDummyFriend wxGridCellWorkerDummyFriend; \
+     public: \
+     size_t GetRef() const { return m_nRef; }
+ 
+ #define wxGridCellAttrDummyFriend wxGridCellAttrDummyFriend; \
+     public: \
+     size_t GetRef() const { return m_nRef; }
+ 
+ #include "wx/grid.h"
+ 
  // The wxGridWorker classes have protected destructors, use DecRef().
  #define wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(className, objName) \

[Wxlua-commit] wxLua/bindings/wxwidgets wxadv_grid.i,1.2,1.3

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28571/wxLua/bindings/wxwidgets

Modified Files:
	wxadv_grid.i 
Log Message:
Add unused (as of yet) WXLUAMETHOD_ENCAPSULATE bit for wxLuaMethod struct
Add binding function wxlua.ungcobject(void*) (for testing really)
Add hack for wxGridCellWorker::GetRef() to see what the ref count is.
   uses ugly #define to get to it's private m_nRef member.


Index: wxadv_grid.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_grid.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxadv_grid.i	31 Jan 2008 04:34:02 -0000	1.2
--- wxadv_grid.i	17 Mar 2008 03:05:01 -0000	1.3
***************
*** 43,46 ****
--- 43,49 ----
      void IncRef()
      void DecRef()
+ 
+     int GetRef() const // wxLua added function to help track if it needs to be refed
+ 
      virtual void SetParameters(const wxString& params)
  %endclass

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.167,1.168

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28571/wxLua/bindings

Modified Files:
	genwxbind.lua 
Log Message:
Add unused (as of yet) WXLUAMETHOD_ENCAPSULATE bit for wxLuaMethod struct
Add binding function wxlua.ungcobject(void*) (for testing really)
Add hack for wxGridCellWorker::GetRef() to see what the ref count is.
   uses ugly #define to get to it's private m_nRef member.


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** genwxbind.lua	5 Mar 2008 05:04:58 -0000	1.167
--- genwxbind.lua	17 Mar 2008 03:05:00 -0000	1.168
***************
*** 674,677 ****
--- 674,694 ----
  
  -- ---------------------------------------------------------------------------
+ -- Add a value to or with a string of values
+ -- ---------------------------------------------------------------------------
+ function AddOredValue(value, new_value)
+     local v = value
+ 
+     if not string.find(value, new_value, 1, 1) then
+         if string.len(v) > 1 then
+             v = value.."|"..new_value
+         else
+             v = new_value
+         end
+     end
+ 
+     return v
+ end
+ 
+ -- ---------------------------------------------------------------------------
  -- Init all the bindingKeywordTable used for parsing
  -- ---------------------------------------------------------------------------
***************
*** 2761,2765 ****
              end
  
!             encapsulationBindingTable[encapcondition][parseObject.Name] = encapsulationBinding
          end
  
--- 2778,2784 ----
              end
  
!             if parseObject["%encapsulate"] then
!                 encapsulationBindingTable[encapcondition][parseObject.Name] = encapsulationBinding
!             end
          end
  
***************
*** 2789,2792 ****
--- 2808,2815 ----
                  end
  
+                 if parseObject["%encapsulate"] then
+                     --funcType = AddOredValue(funcType, "WXLUAMETHOD_ENCAPSULATE") FIXME
+                 end
+ 
                  local memberPtr = member.DataTypePointer[1]
                  local indirectionCount = #member.DataTypePointer
***************
*** 3505,3508 ****
--- 3528,3535 ----
                  if not funcNameBase then funcNameBase = funcName end
  
+                 if parseObject["%encapsulate"] then
+                     --funcType = AddOredValue(funcType, "WXLUAMETHOD_ENCAPSULATE") FIXME
+                 end
+ 
                  -- if they declared this, the conditions must be exclusive
                  -- since the functions will have the same names
***************
*** 3923,3926 ****
--- 3950,3959 ----
                  RemovewxLuaStateIfNotUsed(codeList)
  
+                 local funcType = "WXLUAMETHOD_METHOD"
+ 
+                 if parseObject["%encapsulate"] then
+                     --funcType = AddOredValue(funcType, "WXLUAMETHOD_ENCAPSULATE") FIXME
+                 end
+ 
                  local delMethodBinding =
                  {
***************
*** 3928,3932 ****
                      CFunctionName   = funcName_,
                      Method          = codeList,
!                     FuncType        = "WXLUAMETHOD_METHOD",
                      FuncMap         = "{ "..funcName_..", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, "..overload_argListName.." }",
                      FuncMapName     = funcMapName,
--- 3961,3965 ----
                      CFunctionName   = funcName_,
                      Method          = codeList,
!                     FuncType        = funcType,
                      FuncMap         = "{ "..funcName_..", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, "..overload_argListName.." }",
                      FuncMapName     = funcMapName,

[Wxlua-commit] wxLua/bindings/wxlua override.hpp, 1.20, 1.21 wxlua.i, 1.18, 1.19

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings/wxlua
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28571/wxLua/bindings/wxlua

Modified Files:
	override.hpp wxlua.i 
Log Message:
Add unused (as of yet) WXLUAMETHOD_ENCAPSULATE bit for wxLuaMethod struct
Add binding function wxlua.ungcobject(void*) (for testing really)
Add hack for wxGridCellWorker::GetRef() to see what the ref count is.
   uses ugly #define to get to it's private m_nRef member.


Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxlua.i	31 Jan 2008 05:09:19 -0000	1.18
--- wxlua.i	17 Mar 2008 03:05:01 -0000	1.19
***************
*** 63,66 ****
--- 63,81 ----
  
  // ---------------------------------------------------------------------------
+ // Force the Lua garbage collector to act or ignore object *DANGEROUS*
+ //
+ // These are *only* meant for very special cases and should NOT be used unless
+ // you have an initmate knowledge about the object and how it will be treated
+ // by wxWidgets, wxLua, and Lua.
+ 
+ // Add the userdata object to the list of objects that will be deleted when
+ // it does out of scope and the Lua garbage collector runs.
+ // %function bool gcobject(void* object)
+ 
+ // Remove the userdata object from the list of objects that will be deleted when
+ // it does out of scope and the Lua garbage collector runs.
+ %function bool ungcobject(void* object)
+ 
+ // ---------------------------------------------------------------------------
  // Type information about the bindings or current userdata
  

Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** override.hpp	31 Jan 2008 05:09:19 -0000	1.20
--- override.hpp	17 Mar 2008 03:05:01 -0000	1.21
***************
*** 149,152 ****
--- 149,184 ----
  
  
+ %override wxLua_function_gcobject
+ // %function bool gcobject(void* object)
+ static int LUACALL wxLua_function_gcobject(lua_State *L)
+ {
+     bool ret = false;
+     if (!wxluaO_isgcobject(L, 1))
+     {
+         FIXME we need to implement a generic way to use the wxObject encapsulation classes
+         ret = true;
+     }
+ 
+     lua_pushboolean(L, ret);
+     return 1;
+ }
+ %end
+ 
+ %override wxLua_function_ungcobject
+ // %function bool ungcobject(void* object)
+ static int LUACALL wxLua_function_ungcobject(lua_State *L)
+ {
+     bool ret = false;
+     if (wxluaO_isgcobject(L, 1))
+     {
+         ret = wxluaO_undeletegcobject(L, 1);
+     }
+ 
+     lua_pushboolean(L, ret);
+     return 1;
+ }
+ %end
+ 
+ 
  %override wxLua_function_type
  // %function int type(int wxluaarg_tag)

[Wxlua-commit] wxLua/modules/wxlua/src wxlstate.cpp, 1.173, 1.174 wxlua_bind.cpp, 1.28, 1.29

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28571/wxLua/modules/wxlua/src

Modified Files:
	wxlstate.cpp wxlua_bind.cpp 
Log Message:
Add unused (as of yet) WXLUAMETHOD_ENCAPSULATE bit for wxLuaMethod struct
Add binding function wxlua.ungcobject(void*) (for testing really)
Add hack for wxGridCellWorker::GetRef() to see what the ref count is.
   uses ugly #define to get to it's private m_nRef member.


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -d -r1.173 -r1.174
*** wxlstate.cpp	2 Feb 2008 16:41:45 -0000	1.173
--- wxlstate.cpp	17 Mar 2008 03:05:04 -0000	1.174
***************
*** 525,529 ****
              delete wxobj;
  
!             lua_pop(L, 1); // pop lightuserdata
  
              lua_pushlightuserdata(L, obj_ptr); // push key
--- 525,529 ----
              delete wxobj;
  
!             lua_pop(L, 1); // pop lightuserdata value
  
              lua_pushlightuserdata(L, obj_ptr); // push key

Index: wxlua_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlua_bind.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** wxlua_bind.cpp	31 Jan 2008 05:09:19 -0000	1.28
--- wxlua_bind.cpp	17 Mar 2008 03:05:04 -0000	1.29
***************
*** 1038,1041 ****
--- 1038,1058 ----
  static wxLuaBindCFunc s_wxluafunc_wxLua_function_typename[1] = {{ wxLua_function_typename, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_typename }};
  
+ static wxLuaArgType s_wxluatypeArray_wxLua_function_ungcobject[] = { &wxluatype_TLIGHTUSERDATA, NULL };
+ // %override wxLua_function_ungcobject
+ // %function bool ungcobject(void* object)
+ static int LUACALL wxLua_function_ungcobject(lua_State *L)
+ {
+     bool ret = false;
+     if (wxluaO_isgcobject(L, 1))
+     {
+         ret = wxluaO_undeletegcobject(L, 1);
+     }
+ 
+     lua_pushboolean(L, ret);
+     return 1;
+ }
+ 
+ static wxLuaBindCFunc s_wxluafunc_wxLua_function_ungcobject[1] = {{ wxLua_function_ungcobject, WXLUAMETHOD_CFUNCTION, 1, 1, s_wxluatypeArray_wxLua_function_ungcobject }};
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_function_wxLUA_CHECK_VERSION[] = { &wxluatype_TNUMBER, &wxluatype_TNUMBER, &wxluatype_TNUMBER, NULL };
  // %function bool wxLUA_CHECK_VERSION(int major, int minor, int release) // actually a define
***************
*** 1099,1102 ****
--- 1116,1120 ----
          { "type", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_type, 1, NULL },
          { "typename", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_typename, 1, NULL },
+         { "ungcobject", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_ungcobject, 1, NULL },
          { "wxLUA_CHECK_VERSION", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_wxLUA_CHECK_VERSION, 1, NULL },
          { "wxLUA_CHECK_VERSION_FULL", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_wxLUA_CHECK_VERSION_FULL, 1, NULL },

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.166,1.167

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29131/bindings

Modified Files:
	genwxbind.lua 
Log Message:
Make sure we use wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION for all wxGridCellWorker derived classes.


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.166
retrieving revision 1.167
diff -C2 -d -r1.166 -r1.167
*** genwxbind.lua	31 Jan 2008 04:34:02 -0000	1.166
--- genwxbind.lua	5 Mar 2008 05:04:58 -0000	1.167
***************
*** 439,442 ****
--- 439,465 ----
  
  -- ---------------------------------------------------------------------------
+ -- Returns true if the classname is derived from base_classname
+ -- ---------------------------------------------------------------------------
+ 
+ function IsDerivedClass(classname, base_classname)
+ 
+     if dataTypeTable[classname] == nil then
+         print("ERROR: dataTypeTable for classname is nil in IsDerivedClass()", classname, base_classname)
+         return false
+     end
+ 
+     if classname == base_classname then
+         return true
+     end
+ 
+     if dataTypeTable[classname].BaseClass then
+         local c = dataTypeTable[dataTypeTable[classname].BaseClass].Name
+         return IsDerivedClass(c, base_classname)
+     end
+ 
+     return false
+ end
+ 
+ -- ---------------------------------------------------------------------------
  -- Get any conditions for this data type
  -- ---------------------------------------------------------------------------
***************
*** 2729,2734 ****
              }
  
!             if (parseObject.Name == "wxGridCellWorker") or (parseObject.Name == "wxGridCellEditor") or
!                (parseObject.Name == "wxGridCellAttr") then
                  encapsulationBinding.Implementation = "wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION("..parseObject.Name..", "..MakeVar(parseObject.Name)..")\n"
              end
--- 2752,2757 ----
              }
  
!             if IsDerivedClass(parseObject.Name, "wxGridCellWorker") or
!                IsDerivedClass(parseObject.Name, "wxGridCellAttr") then
                  encapsulationBinding.Implementation = "wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION("..parseObject.Name..", "..MakeVar(parseObject.Name)..")\n"
              end

[Wxlua-commit] website screenshots.php,1.18,1.19

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/website
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15123/website

Modified Files:
	screenshots.php 
Log Message:
Add a screenshot of the stack dialog


Index: screenshots.php
===================================================================
RCS file: /cvsroot/wxlua/website/screenshots.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** screenshots.php	27 Feb 2007 21:00:51 -0000	1.18
--- screenshots.php	1 Mar 2008 15:20:18 -0000	1.19
***************
*** 6,10 ****
    include_once("header.inc.php");
  
!   function write_screenshot($url, $title) 
    {
      echo "<a href='screenshots/$url'>";
--- 6,10 ----
    include_once("header.inc.php");
  
!   function write_screenshot($url, $title)
    {
      echo "<a href='screenshots/$url'>";
***************
*** 29,33 ****
  <h1 id="gtk2">wxLua on GTK+ 2</h1>
  <p>The <a href="http://www.wxwidgets.org">wxWidgets</a> port under Linux platforms is called <strong>wxGTK</strong>
! as it uses the <a href="http://www.gtk.org">GTK+ 2</a> libraries for drawing and thus creates applications with 
  the same <em>look &amp; feel</em> of native GTK applications:</p>
  <div style="text-align: center">
--- 29,33 ----
  <h1 id="gtk2">wxLua on GTK+ 2</h1>
  <p>The <a href="http://www.wxwidgets.org">wxWidgets</a> port under Linux platforms is called <strong>wxGTK</strong>
! as it uses the <a href="http://www.gtk.org">GTK+ 2</a> libraries for drawing and thus creates applications with
  the same <em>look &amp; feel</em> of native GTK applications:</p>
  <div style="text-align: center">
***************
*** 41,44 ****
--- 41,46 ----
          write_screenshot("wxlua_sudoku_gtk2.png",
                           "wxLuaSudoku (in wxGTK2)");
+         write_screenshot("wxlua_stackdialog_gtk2.png",
+                          "wxLua StackDialog showing Lua variables (in wxGTK2)");
      ?>
  </div>

[Wxlua-commit] website/screenshots wxlua_stackdialog_gtk2.png, NONE, 1.1

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/website/screenshots
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15123/website/screenshots

Added Files:
	wxlua_stackdialog_gtk2.png 
Log Message:
Add a screenshot of the stack dialog


--- NEW FILE: wxlua_stackdialog_gtk2.png ---
(This appears to be a binary file; contents omitted.)

[Wxlua-commit] website/thumbnails wxlua_stackdialog_gtk2.png, NONE, 1.1

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/website/thumbnails
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15123/website/thumbnails

Added Files:
	wxlua_stackdialog_gtk2.png 
Log Message:
Add a screenshot of the stack dialog


--- NEW FILE: wxlua_stackdialog_gtk2.png ---
(This appears to be a binary file; contents omitted.)

[Wxlua-commit] wxLua/modules/wxbind/src wxadv_bind.cpp,1.12,1.13

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31432/wxLua/modules/wxbind/src

Modified Files:
	wxadv_bind.cpp 
Log Message:
Fix wxLua_wxGrid_GetCellSize to not call GetCellAlignment.


Index: wxadv_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wxadv_bind.cpp	31 Jan 2008 04:34:07 -0000	1.12
--- wxadv_bind.cpp	26 Feb 2008 14:51:34 -0000	1.13
***************
*** 8251,8255 ****
      // get this
      wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGridCellAttr);
!     // call GetAlignment
      self->GetSize(&num_rows, &num_cols);
  
--- 8251,8255 ----
      // get this
      wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGridCellAttr);
!     // call GetSize
      self->GetSize(&num_rows, &num_cols);
  
***************
*** 11102,11107 ****
      // get this
      wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGrid);
!     // call GetCellAlignment
!     self->GetCellAlignment(row, col, &num_rows, &num_cols);
      // push results
      lua_pushnumber(L, num_rows);
--- 11102,11107 ----
      // get this
      wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGrid);
!     // call GetCellSize
!     self->GetCellSize(row, col, &num_rows, &num_cols);
      // push results
      lua_pushnumber(L, num_rows);

[Wxlua-commit] wxLua/bindings/wxwidgets wxadv_override.hpp, 1.6, 1.7

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31432/wxLua/bindings/wxwidgets

Modified Files:
	wxadv_override.hpp 
Log Message:
Fix wxLua_wxGrid_GetCellSize to not call GetCellAlignment.


Index: wxadv_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_override.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxadv_override.hpp	31 Jan 2008 04:34:02 -0000	1.6
--- wxadv_override.hpp	26 Feb 2008 14:51:34 -0000	1.7
***************
*** 64,68 ****
      // get this
      wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGridCellAttr);
!     // call GetAlignment
      self->GetSize(&num_rows, &num_cols);
  
--- 64,68 ----
      // get this
      wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGridCellAttr);
!     // call GetSize
      self->GetSize(&num_rows, &num_cols);
  
***************
*** 162,167 ****
      // get this
      wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGrid);
!     // call GetCellAlignment
!     self->GetCellAlignment(row, col, &num_rows, &num_cols);
      // push results
      lua_pushnumber(L, num_rows);
--- 162,167 ----
      // get this
      wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, wxluatype_wxGrid);
!     // call GetCellSize
!     self->GetCellSize(row, col, &num_rows, &num_cols);
      // push results
      lua_pushnumber(L, num_rows);

[Wxlua-commit] wxLua/samples printing.wx.lua,1.18,1.19

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/samples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23758/samples

Modified Files:
	printing.wx.lua 
Log Message:
Use overloaded function


Index: printing.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/printing.wx.lua,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** printing.wx.lua	22 Jan 2008 04:45:39 -0000	1.18
--- printing.wx.lua	22 Feb 2008 19:04:32 -0000	1.19
***************
*** 141,145 ****
  
  function Print()
!     local printDialogData = wx.wxPrintDialogDataFromPrintData(printData)
      local printer  = wx.wxPrinter(printDialogData)
      local printout = wx.wxLuaPrintout("wxLua Test Print")
--- 141,145 ----
  
  function Print()
!     local printDialogData = wx.wxPrintDialogData(printData)
      local printer  = wx.wxPrinter(printDialogData)
      local printout = wx.wxLuaPrintout("wxLua Test Print")

[Wxlua-commit] website download.php,1.29,1.30

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/website
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv903/website

Modified Files:
	download.php 
Log Message:
Update Mac download link


Index: download.php
===================================================================
RCS file: /cvsroot/wxlua/website/download.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** download.php	3 Feb 2008 22:38:52 -0000	1.29
--- download.php	20 Feb 2008 05:18:58 -0000	1.30
***************
*** 14,23 ****
    $winsize="9";       // size of the wxlua-xxx.bin.zip file (in MB)
    $apsize="11";        // size of the wxlua-xxx.package file (in MB)
!   $bundlesize="16.9";   // size of the wxlua-xxx.dmg file (in MB)
  
    $winlink="http://downloads.sourceforge.net/wxlua/wxLua-$latestversion-MSW-bin.zip";
    $dlllink="http://downloads.sourceforge.net/wxlua/wxLua-$latestversion-MSW-dll.zip";
    $linuxlink="http://downloads.sourceforge.net/wxlua/wxlua-$latestversion-1.x86.package";
!   $maclink="http://downloads.sourceforge.net/wxlua/wxlua-2.8.4.1-tiger.dmg";
    $gzlink="http://downloads.sourceforge.net/wxlua/wxLua-$latestversion-src.tar.gz";
  ?>
--- 14,23 ----
    $winsize="9";       // size of the wxlua-xxx.bin.zip file (in MB)
    $apsize="11";        // size of the wxlua-xxx.package file (in MB)
!   $bundlesize="20";   // size of the wxlua-xxx.dmg file (in MB)
  
    $winlink="http://downloads.sourceforge.net/wxlua/wxLua-$latestversion-MSW-bin.zip";
    $dlllink="http://downloads.sourceforge.net/wxlua/wxLua-$latestversion-MSW-dll.zip";
    $linuxlink="http://downloads.sourceforge.net/wxlua/wxlua-$latestversion-1.x86.package";
!   $maclink="http://downloads.sourceforge.net/wxlua/wxlua-2.8.7.0-tiger.dmg";
    $gzlink="http://downloads.sourceforge.net/wxlua/wxLua-$latestversion-src.tar.gz";
  ?>

[Wxlua-commit] wxLua/build/autoconf configure.ac,1.67,1.68

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/build/autoconf
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22476/wxLua/build/autoconf

Modified Files:
	configure.ac 
Log Message:
Add RPATH_FLAGS=-Wl,-header-pad_max_install_names
for OSX's gcc so we can run $install_name_tool to change it's linker paths


Index: configure.ac
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** configure.ac	19 Jan 2008 21:37:09 -0000	1.67
--- configure.ac	18 Feb 2008 23:36:55 -0000	1.68
***************
*** 204,207 ****
--- 204,215 ----
      RPATH_FLAGS="-Wl,-rpath,../lib"
  fi
+ 
+ # NOTE: Need longer library rpath names for Mac's linker, -header-pad_max_install_names
+ #   "install_name_tool: changing install names can't be redone for: wxLua.app/Contents/MacOS/wxLua
+ #    (for architecture i386) because larger updated load commands do not fit (the program must be relinked)"
+ if test "SHARED" = "1" -a "PLATFORM_MACOSX" = "1"; then
+     RPATH_FLAGS="-Wl,-header-pad_max_install_names"
+ fi
+ 
  AC_SUBST(RPATH_FLAGS)
  

[Wxlua-commit] wxLua configure,1.78,1.79

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22476/wxLua

Modified Files:
	configure 
Log Message:
Add RPATH_FLAGS=-Wl,-header-pad_max_install_names
for OSX's gcc so we can run $install_name_tool to change it's linker paths


Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** configure	19 Jan 2008 21:37:07 -0000	1.78
--- configure	18 Feb 2008 23:36:54 -0000	1.79
***************
*** 4832,4835 ****
--- 4832,4843 ----
  fi
  
+ # NOTE: Need longer library rpath names for Mac's linker, -header-pad_max_install_names
+ #   "install_name_tool: changing install names can't be redone for: wxLua.app/Contents/MacOS/wxLua
+ #    (for architecture i386) because larger updated load commands do not fit (the program must be relinked)"
+ if test "SHARED" = "1" -a "PLATFORM_MACOSX" = "1"; then
+     RPATH_FLAGS="-Wl,-header-pad_max_install_names"
+ fi
+ 
+ 
  
  # check for Lua

[Wxlua-commit] wxLua/distrib/autopackage makeautopackage,1.4,1.5

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/wxLua/distrib/autopackage
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7786/distrib/autopackage

Modified Files:
	makeautopackage 
Log Message:
small fixes for AP build

Index: makeautopackage
===================================================================
RCS file: /cvsroot/wxlua/wxLua/distrib/autopackage/makeautopackage,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makeautopackage	3 Feb 2008 21:55:31 -0000	1.4
--- makeautopackage	3 Feb 2008 22:45:17 -0000	1.5
***************
*** 8,15 ****
  
  
! if [[ ! -f distrib/autopackage/default.apspec ]]; then
      echo
!     echo "Please first run the configure script in the ../.. folder in"
!     echo "order to create the default.apspec file from default.apspec.in"
      echo
      exit 1
--- 8,15 ----
  
  
! if [[ ! -f default.apspec ]]; then
      echo
!     echo "Please first run the configure script (in the ../.. folder)"
!     echo "in order to create the default.apspec file from default.apspec.in"
      echo
      exit 1
***************
*** 27,38 ****
      mv *.xml *.meta *.package distrib/autopackage/toupload
  
      echo
      echo
      echo "= REMINDER ==================================================="
      echo "Now that the autopackage has been built successfully, remember"
!     echo "to upload the .meta, .package and .xml files to the"
!     echo "    $currloc"
!     echo "folder:"
      echo "  scp toupload/*.xml toupload/*.meta toupload/*.package $sshurl"
      echo "=============================================================="
  fi
--- 27,39 ----
      mv *.xml *.meta *.package distrib/autopackage/toupload
  
+     packagename=`ls distrib/autopackage/toupload/*package`
+ 
      echo
      echo
      echo "= REMINDER ==================================================="
      echo "Now that the autopackage has been built successfully, remember"
!     echo "to upload the .meta, .package and .xml files:"
      echo "  scp toupload/*.xml toupload/*.meta toupload/*.package $sshurl"
+     echo "  curl -T toupload/*.package ftp://upload.sourceforge.net/incoming/$packagename"
      echo "=============================================================="
  fi