wxlua-commit

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10993/wxLua/bindings/wxwidgets

Modified Files:
	wxadv_override.hpp wxbase_override.hpp wxcore_override.hpp 
	wxstc_stc.i wxxml_override.hpp 
Log Message:
Fixed double -> unsigned integer using all 32 bits conversion
for wxSTC_MASK_FOLDERS problem, thanks to Andre Arpin.    


Index: wxbase_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxbase_override.hpp	29 Jan 2008 00:49:11 -0000	1.17
--- wxbase_override.hpp	24 Mar 2009 04:15:07 -0000	1.18
***************
*** 618,622 ****
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 2) : wxPATH_NATIVE);
      wxString ext;
      wxString name;
--- 618,622 ----
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getenumtype(L, 2) : wxPATH_NATIVE);
      wxString ext;
      wxString name;
***************
*** 642,646 ****
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 2) : wxPATH_NATIVE);
      wxString ext;
      wxString name;
--- 642,646 ----
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getenumtype(L, 2) : wxPATH_NATIVE);
      wxString ext;
      wxString name;
***************
*** 668,672 ****
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 2) : wxPATH_NATIVE);
      // const wxString fullpath
      const wxString fullpath = wxlua_getwxStringtype(L, 1);
--- 668,672 ----
      int argCount = lua_gettop(L);
      // wxPathFormat format = wxPATH_NATIVE
!     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getenumtype(L, 2) : wxPATH_NATIVE);
      // const wxString fullpath
      const wxString fullpath = wxlua_getwxStringtype(L, 1);

Index: wxadv_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_override.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxadv_override.hpp	26 Feb 2008 14:51:34 -0000	1.7
--- wxadv_override.hpp	24 Mar 2009 04:15:07 -0000	1.8
***************
*** 202,206 ****
      int argCount = lua_gettop(L);
      // wxGrid::wxGridSelectionModes selmode = wxGrid::wxGridSelectCells
!     wxGrid::wxGridSelectionModes selmode = (argCount >= 4 ? (wxGrid::wxGridSelectionModes)wxlua_getintegertype(L, 4) : wxGrid::wxGridSelectCells);
      // bool takeOwnership = false
      bool takeOwnership = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : false);
--- 202,206 ----
      int argCount = lua_gettop(L);
      // wxGrid::wxGridSelectionModes selmode = wxGrid::wxGridSelectCells
!     wxGrid::wxGridSelectionModes selmode = (argCount >= 4 ? (wxGrid::wxGridSelectionModes)wxlua_getenumtype(L, 4) : wxGrid::wxGridSelectCells);
      // bool takeOwnership = false
      bool takeOwnership = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : false);

Index: wxcore_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxcore_override.hpp	23 Jan 2008 06:43:34 -0000	1.19
--- wxcore_override.hpp	24 Mar 2009 04:15:07 -0000	1.20
***************
*** 166,170 ****
      int argCount = lua_gettop(L);
      // wxDataObject::Direction dir = wxDataObject::Get
!     wxDataObject::Direction dir = (argCount >= 2 ? (wxDataObject::Direction)(int)wxlua_getintegertype(L, 2) : wxDataObject::Get);
      // get this
      wxDataObject *self = (wxDataObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDataObject);
--- 166,170 ----
      int argCount = lua_gettop(L);
      // wxDataObject::Direction dir = wxDataObject::Get
!     wxDataObject::Direction dir = (argCount >= 2 ? (wxDataObject::Direction)(int)wxlua_getenumtype(L, 2) : wxDataObject::Get);
      // get this
      wxDataObject *self = (wxDataObject *)wxluaT_getuserdatatype(L, 1, wxluatype_wxDataObject);
***************
*** 771,775 ****
      //wxKillError * rc = (argCount >= 3 ? (wxKillError *)wxlua_touserdata(L, 3) : NULL);
      // wxSignal sig = wxSIGTERM
!     wxSignal sig = (argCount >= 2 ? (wxSignal)wxlua_getintegertype(L, 2) : wxSIGTERM);
      // long pid
      long pid = (long)wxlua_getnumbertype(L, 1);
--- 771,775 ----
      //wxKillError * rc = (argCount >= 3 ? (wxKillError *)wxlua_touserdata(L, 3) : NULL);
      // wxSignal sig = wxSIGTERM
!     wxSignal sig = (argCount >= 2 ? (wxSignal)wxlua_getenumtype(L, 2) : wxSIGTERM);
      // long pid
      long pid = (long)wxlua_getnumbertype(L, 1);
***************
*** 1359,1363 ****
      wxFontEncoding altEncoding;
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getintegertype(L, 2);
      // get this
      wxFontMapper *self = (wxFontMapper *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFontMapper);
--- 1359,1363 ----
      wxFontEncoding altEncoding;
      // wxFontEncoding encoding
!     wxFontEncoding encoding = (wxFontEncoding)wxlua_getenumtype(L, 2);
      // get this
      wxFontMapper *self = (wxFontMapper *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFontMapper);
***************
*** 2195,2199 ****
                      lua_gettable(L, -2);
                      if (lua_isnumber(L, -1))
!                         kind = (wxItemKind)wxlua_getintegertype(L, -1);
                      lua_pop(L, 1);
  
--- 2195,2199 ----
                      lua_gettable(L, -2);
                      if (lua_isnumber(L, -1))
!                         kind = (wxItemKind)wxlua_getenumtype(L, -1);
                      lua_pop(L, 1);
  
***************
*** 2269,2273 ****
      // bool isCheckable = false
      // This used to be a bool instead of a wxItemKind
!     wxItemKind itemkind = (wxItemKind)(argCount >= 5 ? wxlua_getintegertype(L, 5) : wxITEM_NORMAL);
      // const wxString& help = wxEmptyString
      wxString help = (argCount >= 4 ? wxlua_getwxStringtype(L, 4) : wxString(wxEmptyString));
--- 2269,2273 ----
      // bool isCheckable = false
      // This used to be a bool instead of a wxItemKind
!     wxItemKind itemkind = (wxItemKind)(argCount >= 5 ? wxlua_getenumtype(L, 5) : wxITEM_NORMAL);
      // const wxString& help = wxEmptyString
      wxString help = (argCount >= 4 ? wxlua_getwxStringtype(L, 4) : wxString(wxEmptyString));

Index: wxstc_stc.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxstc_stc.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxstc_stc.i	18 Dec 2007 01:03:32 -0000	1.2
--- wxstc_stc.i	24 Mar 2009 04:15:07 -0000	1.3
***************
*** 1819,1823 ****
      // Set the current styling position to pos and the styling mask to mask.
      // The styling mask can be used to protect some bits in each styling byte from modification.
!     void StartStyling(int pos, int mask);
  
      // Change style from current styling position for length characters to a style
--- 1819,1823 ----
      // Set the current styling position to pos and the styling mask to mask.
      // The styling mask can be used to protect some bits in each styling byte from modification.
!     void StartStyling(int pos, unsigned int mask);
  
      // Change style from current styling position for length characters to a style
***************
*** 1861,1871 ****
  
      // Get a bit mask of all the markers set on a line.
!     int MarkerGet(int line);
  
      // Find the next line after lineStart that includes a marker in mask.
!     int MarkerNext(int lineStart, int markerMask);
  
      // Find the previous line before lineStart that includes a marker in mask.
!     int MarkerPrevious(int lineStart, int markerMask);
  
      // Define a marker from a bitmap
--- 1861,1871 ----
  
      // Get a bit mask of all the markers set on a line.
!     unsigned int MarkerGet(int line);
  
      // Find the next line after lineStart that includes a marker in mask.
!     int MarkerNext(int lineStart, unsigned int markerMask);
  
      // Find the previous line before lineStart that includes a marker in mask.
!     int MarkerPrevious(int lineStart, unsigned int markerMask);
  
      // Define a marker from a bitmap
***************
*** 1888,1895 ****
  
      // Set a mask that determines which markers are displayed in a margin.
!     void SetMarginMask(int margin, int mask);
  
      // Retrieve the marker mask of a margin.
!     int GetMarginMask(int margin);
  
      // Make a margin sensitive or insensitive to mouse clicks.
--- 1888,1895 ----
  
      // Set a mask that determines which markers are displayed in a margin.
!     void SetMarginMask(int margin, unsigned int mask); // NOTE: wxSTC has "int mask", but we need all the bits so we force uint
  
      // Retrieve the marker mask of a margin.
!     unsigned int GetMarginMask(int margin);
  
      // Make a margin sensitive or insensitive to mouse clicks.

Index: wxxml_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxml_override.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wxxml_override.hpp	23 Jan 2008 06:43:34 -0000	1.9
--- wxxml_override.hpp	24 Mar 2009 04:15:07 -0000	1.10
***************
*** 23,27 ****
      const wxString name = wxlua_getwxStringtype(L, 3);
      // wxXmlNodeType type
!     wxXmlNodeType type = (wxXmlNodeType)wxlua_getintegertype(L, 2);
      // wxXmlNode parent
      wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlNode);
--- 23,27 ----
      const wxString name = wxlua_getwxStringtype(L, 3);
      // wxXmlNodeType type
!     wxXmlNodeType type = (wxXmlNodeType)wxlua_getenumtype(L, 2);
      // wxXmlNode parent
      wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, wxluatype_wxXmlNode);