[Wxlua-commit] wxLua/bindings genwxbind.lua,1.138,1.139

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

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

Modified Files:
	genwxbind.lua 
Log Message:
Fix for MingW added in wxWidgets bindings for wxDefaultPoint and wxEVT_FILEPICKER/DIRPICKER...
Rename the functions to get the type names from wxLua to match closer to the lua type() function, wxlua.i
Change op_add_assign to just op_iadd (others as well) = op_assign is now op_set


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** genwxbind.lua	27 Jun 2007 19:56:27 -0000	1.138
--- genwxbind.lua	30 Jun 2007 00:12:20 -0000	1.139
***************
*** 1062,1066 ****
  
      -- operators for %operator
!     bindingOperatorTable["="]  = "op_assign"
      bindingOperatorTable["=="] = "op_eq"
      bindingOperatorTable["!="] = "op_ne"
--- 1062,1066 ----
  
      -- operators for %operator
!     bindingOperatorTable["="]  = "op_set"
      bindingOperatorTable["=="] = "op_eq"
      bindingOperatorTable["!="] = "op_ne"
***************
*** 1085,1096 ****
      bindingOperatorTable["/"]  = "op_div"
  
!     bindingOperatorTable["+="] = "op_add_assign"
!     bindingOperatorTable["-="] = "op_sub_assign"
!     bindingOperatorTable["*="] = "op_mul_assign"
!     bindingOperatorTable["/="] = "op_div_assign"
!     bindingOperatorTable["%="] = "op_mod_assign"
!     bindingOperatorTable["&="] = "op_and_assign"
!     bindingOperatorTable["|="] = "op_or_assign"
!     bindingOperatorTable["^="] = "op_xor_assign"
  
      -- bindingKeywordTable
--- 1085,1096 ----
      bindingOperatorTable["/"]  = "op_div"
  
!     bindingOperatorTable["+="] = "op_iadd"
!     bindingOperatorTable["-="] = "op_isub"
!     bindingOperatorTable["*="] = "op_imul"
!     bindingOperatorTable["/="] = "op_idiv"
!     bindingOperatorTable["%="] = "op_imod"
!     bindingOperatorTable["&="] = "op_iand"
!     bindingOperatorTable["|="] = "op_ior"
!     bindingOperatorTable["^="] = "op_ixor"
  
      -- bindingKeywordTable
***************
*** 1106,1109 ****
--- 1106,1110 ----
          bindingKeywordTable["%constructor"] = true
          bindingKeywordTable["%member"]      = true
+         bindingKeywordTable["%member_func"] = true
          bindingKeywordTable["%operator"]    = true
          bindingKeywordTable["%property"]    = true
***************
*** 1864,1867 ****
--- 1865,1877 ----
                          end
  
+                     elseif tag == "%member_func" then
+                         lineState.DefType = "member_func"
+                         lineState.Action = "member"
+                         lineState.ActionMandatory = true
+ 
+                         if (parseState.ObjectStack[1].DefType ~= "class") and (parseState.ObjectStack[1].DefType ~= "struct") then
+                             print("Error: %member_func is not used for a %class or %struct. "..LineTableErrString(lineTable))
+                         end
+ 
                      elseif tag == "%constructor" then
                          lineState.IsConstructor = true
***************
*** 2509,2513 ****
              table.insert(parseState.ConditionStack, lineState.Condition)
  
!         elseif lineState.DefType == "member" then
              table.insert(parseState.ObjectStack[1].Members, AllocMember(lineState, BuildCondition(parseState.ConditionStack)))
  
--- 2519,2523 ----
              table.insert(parseState.ConditionStack, lineState.Condition)
  
!         elseif (lineState.DefType == "member") or (lineState.DefType == "member_func") then
              table.insert(parseState.ObjectStack[1].Members, AllocMember(lineState, BuildCondition(parseState.ConditionStack)))
  
***************
*** 2686,2690 ****
              -- member binding
              -- ---------------------------------------------------------------
!             if member.DefType == "member" then
                  local memberType = GetTypeDef(member.DataType)
                  local memberGetFunc = "Get_"..member.Name
--- 2696,2700 ----
              -- member binding
              -- ---------------------------------------------------------------
!             if (member.DefType == "member") or (member.DefType == "member_func") then
                  local memberType = GetTypeDef(member.DataType)
                  local memberGetFunc = "Get_"..member.Name
***************
*** 2795,2798 ****
--- 2805,2813 ----
                  end
  
+                 -- rem out the Get function, but we need the code for the property
+                 if member.DefType == "member" then
+                     methodBinding.Map = "    // %member"..methodBinding.Map
+                 end
+ 
                  table.insert(interface.objectData[o].BindTable, methodBinding)
                  table.insert(interface.objectData[o].BindTable, propertyBinding)
***************
*** 2886,2889 ****
--- 2901,2909 ----
                  end
  
+                 -- rem out the Set function, but we need the code for the property
+                 if member.DefType == "member" then
+                     methodBinding.Map = "    // %member"..methodBinding.Map
+                 end
+ 
                  table.insert(interface.objectData[o].BindTable, methodBinding)
                  table.insert(interface.objectData[o].BindTable, propertyBinding)