[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.20, 1.21 dialogs.i, 1.19, 1.20 override.hpp, 1.55, 1.56 wx_datatypes.lua, 1.38, 1.39 wxlua.i, 1.17, 1.18

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

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

Modified Files:
	appframe.i dialogs.i override.hpp wx_datatypes.lua wxlua.i 
Log Message:
code cleanup
add %wxchkver_x_y_z as replacement for %wxchkverxyz


Index: appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** appframe.i	23 Aug 2006 04:57:52 -0000	1.20
--- appframe.i	6 Nov 2006 06:11:43 -0000	1.21
***************
*** 15,22 ****
  %include "wx/app.h"
  
! %if %wxchkver22&!%wxchkver25|%wxcompat24
  %class %noclassinfo wxLog // FIXME
  %endclass
! %endif
  
  %function wxApp* wxGetBaseApp() // THIS IS DEPRECATED! use wxGetApp
--- 15,26 ----
  %include "wx/app.h"
  
! %if wxUSE_LOG
! %if %wxchkver_2_2&!%wxchkver_2_5|%wxcompat24
! 
  %class %noclassinfo wxLog // FIXME
  %endclass
! 
! %endif %wxchkver22&!%wxchkver25|%wxcompat24
! %endif wxUSE_LOG
  
  %function wxApp* wxGetBaseApp() // THIS IS DEPRECATED! use wxGetApp

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** wx_datatypes.lua	2 Nov 2006 23:38:08 -0000	1.38
--- wx_datatypes.lua	6 Nov 2006 06:11:43 -0000	1.39
***************
*** 13,17 ****
    WXHANDLE = "void *",
    WXWidget = "unsigned long",
-   luaObject = "lua_State *",
    ["wxDateTime::wxDateTime_t"] = "unsigned short",
    wxDouble = "double",
--- 13,16 ----
***************
*** 1798,1802 ****
    },
    wxLog = {
!     Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp)",
      DefType = "class",
      Intrinsic = false,
--- 1797,1801 ----
    },
    wxLog = {
!     Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp)",
      DefType = "class",
      Intrinsic = false,
***************
*** 1823,1826 ****
--- 1822,1830 ----
      Name = "wxLuaObject",
    },
+   wxLuaObject_Type = {
+     DefType = "enum",
+     Intrinsic = true,
+     Name = "wxLuaObject_Type",
+   },
    wxLuaPrintout = {
      BaseClass = "wxPrintout",
***************
*** 3287,3290 ****
--- 3291,3296 ----
    ["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)",
    ["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)",
+   ["%wxchkver_2_2"] = "wxCHECK_VERSION(2,2,0)",
+   ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)",
    ["%wxcompat20"] = "WXWIN_COMPATIBILITY_2",
    ["%wxcompat22"] = "WXWIN_COMPATIBILITY_2_2",
***************
*** 3332,3338 ****
--- 3338,3346 ----
    wxLUA_USE_wxDateSpan = "wxLUA_USE_wxDateSpan",
    wxLUA_USE_wxDateTime = "wxLUA_USE_wxDateTime",
+   wxLUA_USE_wxDateTimeHolidayAuthority = "wxLUA_USE_wxDateTimeHolidayAuthority",
    wxLUA_USE_wxDialog = "wxLUA_USE_wxDialog",
    wxLUA_USE_wxDir = "wxLUA_USE_wxDir",
    wxLUA_USE_wxDirDialog = "wxLUA_USE_wxDirDialog",
+   wxLUA_USE_wxDisplay = "wxLUA_USE_wxDisplay",
    wxLUA_USE_wxDragDrop = "wxLUA_USE_wxDragDrop",
    wxLUA_USE_wxFile = "wxLUA_USE_wxFile",
***************
*** 3587,3590 ****
--- 3595,3599 ----
    wxUSE_UXTHEME_AUTO = "wxUSE_UXTHEME_AUTO",
    wxUSE_VALIDATORS = "wxUSE_VALIDATORS",
+   wxUSE_WAVE = "wxUSE_WAVE",
    wxUSE_WCHAR_T = "wxUSE_WCHAR_T",
    wxUSE_WCSRTOMBS = "wxUSE_WCSRTOMBS",

Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxlua.i	28 Sep 2006 22:26:03 -0000	1.17
--- wxlua.i	6 Nov 2006 06:11:43 -0000	1.18
***************
*** 24,35 ****
  // wxLuaObject - Allows Lua data items to be used for client data.
  
! %typedef luaObject lua_State*
  
  %class %delete wxLuaObject, wxObject
!     wxLuaObject()    //(luaObject object) no parameters passed in
!     void SetObject() //(luaObject object) no parameters passed in
!     luaObject GetObject() const
!     int GetAllocationFlags() const
!     void ModifyAllocationFlags(int iValue)
  
      %property=AllocationFlags, read
--- 24,43 ----
  // wxLuaObject - Allows Lua data items to be used for client data.
  
! %enum wxLuaObject_Type
!     wxLUAOBJECT_NONE
!     wxLUAOBJECT_BOOL
!     wxLUAOBJECT_INT
!     wxLUAOBJECT_STRING
!     wxLUAOBJECT_ARRAYINT
! %endenum
  
  %class %delete wxLuaObject, wxObject
!     wxLuaObject()                  // the wxLuaState is the calling lua_State
!     void SetObject(int iParam = 1) // the stack index to make the object for
!     void GetObject() const         // get the object, note C++ returns bool, this "returns" the object on the stack
! 
!     int  GetAllocationFlags() const
!     bool HasAllocationFlag(wxLuaObject_Type flag)
!     int  SetAllocationFlag(wxLuaObject_Type flag, bool set)
  
      %property=AllocationFlags, read

Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** override.hpp	1 Nov 2006 23:44:46 -0000	1.55
--- override.hpp	6 Nov 2006 06:11:43 -0000	1.56
***************
*** 4433,4437 ****
      // get this
      wxLuaObject *self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject);
!     // call GetObject
      if (self->GetObject())
          return 1;
--- 4433,4437 ----
      // get this
      wxLuaObject *self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject);
!     // call GetObject that if successful will push an item onto the stack
      if (self->GetObject())
          return 1;

Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** dialogs.i	25 May 2006 22:50:04 -0000	1.19
--- dialogs.i	6 Nov 2006 06:11:43 -0000	1.20
***************
*** 26,30 ****
      wxFILE_MUST_EXIST
      wxMULTIPLE
! %wxchkver23    wxCHANGE_DIR
  %endenum
  
--- 26,30 ----
      wxFILE_MUST_EXIST
      wxMULTIPLE
!     %wxchkver23 wxCHANGE_DIR
  %endenum