wxlua-commit

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

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

Modified Files:
	datetime.cpp wx_bind.cpp 
Log Message:
added wxDatePickerCtrl to bindings


Index: wx_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** wx_bind.cpp	28 Sep 2006 22:26:04 -0000	1.57
--- wx_bind.cpp	1 Nov 2006 23:44:47 -0000	1.58
***************
*** 223,226 ****
--- 223,227 ----
          { &wxEVT_CALENDAR_WEEKDAY_CLICKED, "wxEVT_CALENDAR_WEEKDAY_CLICKED", &s_wxluatag_wxCalendarEvent },
          { &wxEVT_CALENDAR_YEAR_CHANGED, "wxEVT_CALENDAR_YEAR_CHANGED", &s_wxluatag_wxCalendarEvent },
+         { &wxEVT_DATE_CHANGED, "wxEVT_DATE_CHANGED", &s_wxluatag_wxDateEvent },
  #endif // wxLUA_USE_wxCalendarCtrl
  
***************
*** 1819,1822 ****
--- 1820,1831 ----
  #endif // wxLUA_USE_wxDataObject
  
+ #if wxLUA_USE_wxDatePickerCtrl
+         { "wxDP_ALLOWNONE", wxDP_ALLOWNONE },
+         { "wxDP_DEFAULT", wxDP_DEFAULT },
+         { "wxDP_DROPDOWN", wxDP_DROPDOWN },
+         { "wxDP_SHOWCENTURY", wxDP_SHOWCENTURY },
+         { "wxDP_SPIN", wxDP_SPIN },
+ #endif // wxLUA_USE_wxDatePickerCtrl
+ 
  #if wxLUA_USE_wxDateTime
          { "wxDateTime_ADT", wxDateTime::ADT },
***************
*** 5536,5539 ****
--- 5545,5553 ----
  
  
+ #if wxLUA_USE_wxDatePickerCtrl
+         { "wxDatePickerCtrl", wxDatePickerCtrl_methods, wxDatePickerCtrl_methodCount, -1, CLASSINFO(wxDatePickerCtrl), &s_wxluatag_wxDatePickerCtrl, "wxControl"  }, 
+ #endif // wxLUA_USE_wxDatePickerCtrl
+ 
+ 
  #if wxLUA_USE_wxDateSpan
          { "wxDateSpan", wxDateSpan_methods, wxDateSpan_methodCount, -1, NULL, &s_wxluatag_wxDateSpan, NULL  }, 

Index: datetime.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** datetime.cpp	9 Jun 2006 22:51:31 -0000	1.17
--- datetime.cpp	1 Nov 2006 23:44:47 -0000	1.18
***************
*** 3911,3912 ****
--- 3911,4098 ----
  #endif  // wxLUA_USE_wxCalendarCtrl
  
+ 
+ #if wxLUA_USE_wxDatePickerCtrl
+ // -------------------------------------------------------------------------------------------------
+ // Bind class wxDatePickerCtrl
+ // -------------------------------------------------------------------------------------------------
+ 
+ // Lua MetaTable Tag for Class 'wxDatePickerCtrl'
+ int s_wxluatag_wxDatePickerCtrl = -1;
+ 
+ 
+ #if (((wxLUA_USE_wxDateTime) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxDatePickerCtrl)) && (wxLUA_USE_wxPointSizeRect)
+ //     wxDatePickerCtrl(wxWindow *parent, wxWindowID id, const wxDateTime& dt = wxDefaultDateTime, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDatePickerCtrl")
+ static int LUACALL wxLua_wxDatePickerCtrl_constructor(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxDatePickerCtrl *returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // const wxString name = "wxDatePickerCtrl"
+     const wxString name = (argCount >= 8 ? lua2wx(wxlState.GetStringType(8)) : wxString(wxT("wxDatePickerCtrl")));
+     // const wxValidator validator = wxDefaultValidator
+     const wxValidator * validator = (argCount >= 7 ? (const wxValidator *)wxlState.GetUserDataType(7, s_wxluatag_wxValidator) : &wxDefaultValidator);
+     // long style = wxDP_DEFAULT | wxDP_SHOWCENTURY
+     long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : wxDP_DEFAULT | wxDP_SHOWCENTURY);
+     // const wxSize size = wxDefaultSize
+     const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize);
+     // const wxPoint pos = wxDefaultPosition
+     const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition);
+     // const wxDateTime dt = wxDefaultDateTime
+     const wxDateTime * dt = (argCount >= 3 ? (const wxDateTime *)wxlState.GetUserDataType(3, s_wxluatag_wxDateTime) : &wxDefaultDateTime);
+     // wxWindowID id
+     wxWindowID id = (wxWindowID)wxlState.GetNumberType(2);
+     // wxWindow parent
+     wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow);
+     // call constructor
+     returns = new wxDatePickerCtrl(parent, id, *dt, *pos, *size, style, *validator, name);
+     // add to tracked window list
+     if (returns && returns->IsKindOf(CLASSINFO(wxWindow)))
+         wxlState.AddToTrackedWindowList((wxWindow*)returns);
+     // push the constructed class pointer
+     wxlState.PushUserDataType(s_wxluatag_wxDatePickerCtrl, returns);
+ 
+     return 1;
+ }
+ 
+ //     bool Create(wxWindow *parent, wxWindowID id, const wxDateTime& dt = wxDefaultDateTime, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDatePickerCtrl")
+ static int LUACALL wxLua_wxDatePickerCtrl_Create(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // const wxString name = "wxDatePickerCtrl"
+     const wxString name = (argCount >= 9 ? lua2wx(wxlState.GetStringType(9)) : wxString(wxT("wxDatePickerCtrl")));
+     // const wxValidator validator = wxDefaultValidator
+     const wxValidator * validator = (argCount >= 8 ? (const wxValidator *)wxlState.GetUserDataType(8, s_wxluatag_wxValidator) : &wxDefaultValidator);
+     // long style = wxDP_DEFAULT | wxDP_SHOWCENTURY
+     long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : wxDP_DEFAULT | wxDP_SHOWCENTURY);
+     // const wxSize size = wxDefaultSize
+     const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize);
+     // const wxPoint pos = wxDefaultPosition
+     const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition);
+     // const wxDateTime dt = wxDefaultDateTime
+     const wxDateTime * dt = (argCount >= 4 ? (const wxDateTime *)wxlState.GetUserDataType(4, s_wxluatag_wxDateTime) : &wxDefaultDateTime);
+     // wxWindowID id
+     wxWindowID id = (wxWindowID)wxlState.GetNumberType(3);
+     // wxWindow parent
+     wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow);
+     // get this
+     wxDatePickerCtrl * self = (wxDatePickerCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxDatePickerCtrl);
+     // call Create
+     returns = self->Create(parent, id, *dt, *pos, *size, style, *validator, name);
+     // push the result flag
+     lua_pushboolean(L, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (((wxLUA_USE_wxDateTime) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxDatePickerCtrl)) && (wxLUA_USE_wxPointSizeRect)
+ 
+ 
+ #if (wxLUA_USE_wxDatePickerCtrl) && (wxLUA_USE_wxDateTime)
+ // %override wxLua_wxDatePickerCtrl_GetRange
+ //        bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const
+ static int LUACALL wxLua_wxDatePickerCtrl_GetRange(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+ 
+     wxDateTime *dt1 = new wxDateTime();
+     wxDateTime *dt2 = new wxDateTime();
+     // get this
+     wxDatePickerCtrl * self = (wxDatePickerCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxDatePickerCtrl);
+     // call GetRange
+     returns = self->GetRange(dt1, dt2);
+     // push the result flag
+     lua_pushboolean(L, returns);
+     wxlState.PushUserDataType(s_wxluatag_wxDateTime, dt1);
+     wxlState.PushUserDataType(s_wxluatag_wxDateTime, dt2);
+ 
+     return 3;
+ }
+ 
+ //     wxDateTime GetValue() const
+ static int LUACALL wxLua_wxDatePickerCtrl_GetValue(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxDateTime *returns;
+     // get this
+     wxDatePickerCtrl * self = (wxDatePickerCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxDatePickerCtrl);
+     // call GetValue
+     // allocate a new object using the copy constructor
+     returns = new wxDateTime(self->GetValue());
+     // add the new object to the tracked memory list
+     wxLua_AddToTrackedMemoryList(wxlState, (wxDateTime *)returns);
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxDateTime, returns);
+ 
+     return 1;
+ }
+ 
+ //     void SetRange(const wxDateTime& dt1, const wxDateTime& dt2)
+ static int LUACALL wxLua_wxDatePickerCtrl_SetRange(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxDateTime dt2
+     const wxDateTime * dt2 = (const wxDateTime *)wxlState.GetUserDataType(3, s_wxluatag_wxDateTime);
+     // const wxDateTime dt1
+     const wxDateTime * dt1 = (const wxDateTime *)wxlState.GetUserDataType(2, s_wxluatag_wxDateTime);
+     // get this
+     wxDatePickerCtrl * self = (wxDatePickerCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxDatePickerCtrl);
+     // call SetRange
+     self->SetRange(*dt1, *dt2);
+ 
+     return 0;
+ }
+ 
+ //     void SetValue(const wxDateTime& dt)
+ static int LUACALL wxLua_wxDatePickerCtrl_SetValue(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxDateTime dt
+     const wxDateTime * dt = (const wxDateTime *)wxlState.GetUserDataType(2, s_wxluatag_wxDateTime);
+     // get this
+     wxDatePickerCtrl * self = (wxDatePickerCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxDatePickerCtrl);
+     // call SetValue
+     self->SetValue(*dt);
+ 
+     return 0;
+ }
+ 
+ #endif // (wxLUA_USE_wxDatePickerCtrl) && (wxLUA_USE_wxDateTime)
+ 
+ static int LUACALL wxLua_wxDatePickerCtrl_destructor(lua_State *)
+ {
+     return 0;
+ }
+ 
+ 
+ 
+ 
+ 
+ // Map Lua Class Methods to C Binding Functions
+ static WXLUAMETHOD s_wxDatePickerCtrl_methods[] = {
+ 
+ #if (((wxLUA_USE_wxDateTime) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxDatePickerCtrl)) && (wxLUA_USE_wxPointSizeRect)
+     { LuaConstructor, "wxDatePickerCtrl", wxLua_wxDatePickerCtrl_constructor, 8, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxDateTime, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } },
+     { LuaMethod, "Create", wxLua_wxDatePickerCtrl_Create, 8, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxDateTime, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } },
+ #endif  // (((wxLUA_USE_wxDateTime) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxDatePickerCtrl)) && (wxLUA_USE_wxPointSizeRect)
+ 
+ 
+ #if (wxLUA_USE_wxDatePickerCtrl) && (wxLUA_USE_wxDateTime)
+     { LuaMethod, "GetRange", wxLua_wxDatePickerCtrl_GetRange, 2, 2, { &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, 0 } },
+     { LuaMethod, "GetValue", wxLua_wxDatePickerCtrl_GetValue, 0, 0, { 0 } },
+     { LuaMethod, "SetRange", wxLua_wxDatePickerCtrl_SetRange, 2, 2, { &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, 0 } },
+     { LuaMethod, "SetValue", wxLua_wxDatePickerCtrl_SetValue, 1, 1, { &s_wxluatag_wxDateTime, 0 } },
+ #endif  // (wxLUA_USE_wxDatePickerCtrl) && (wxLUA_USE_wxDateTime)
+ 
+     { LuaDelete, "wxDatePickerCtrl", wxLua_wxDatePickerCtrl_destructor, 0, 0, {0} },
+ };
+ 
+ // Extern accessor to class method map
+ WXLUAMETHOD* wxDatePickerCtrl_methods = s_wxDatePickerCtrl_methods;
+ int wxDatePickerCtrl_methodCount = sizeof(s_wxDatePickerCtrl_methods)/sizeof(s_wxDatePickerCtrl_methods[0]);
+ #endif  // wxLUA_USE_wxDatePickerCtrl
+