[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.21, 1.22 windows.cpp, 1.25, 1.26

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

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

Modified Files:
	appframe.cpp windows.cpp 
Log Message:
update for wxWidgets 2.7, Get/SetDefaultItem is now in toplevel not in window
update wxluaedit for wxstedit 1.2.3


Index: windows.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** windows.cpp	12 Jun 2006 02:48:09 -0000	1.25
--- windows.cpp	23 Aug 2006 04:57:52 -0000	1.26
***************
*** 278,281 ****
--- 278,296 ----
  }
  
+ //     !%wxchkver27 wxWindow* GetDefaultItem() const
+ static int LUACALL wxLua_wxWindow_GetDefaultItem(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxWindow *returns;
+     // get this
+     wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow);
+     // call GetDefaultItem
+     returns = self->GetDefaultItem();
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
+ 
+     return 1;
+ }
+ 
  //     !%wxchkver27 virtual wxString GetTitle()
  static int LUACALL wxLua_wxWindow_GetTitle(lua_State *L)
***************
*** 293,296 ****
--- 308,328 ----
  }
  
+ //     !%wxchkver27 wxWindow* SetDefaultItem(wxWindow *win)
+ static int LUACALL wxLua_wxWindow_SetDefaultItem(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxWindow *returns;
+     // wxWindow win
+     wxWindow * win = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow);
+     // get this
+     wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow);
+     // call SetDefaultItem
+     returns = self->SetDefaultItem(win);
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
+ 
+     return 1;
+ }
+ 
  //     !%wxchkver27 virtual void SetTitle(const wxString& title)
  static int LUACALL wxLua_wxWindow_SetTitle(lua_State *L)
***************
*** 3416,3421 ****
--- 3448,3457 ----
      { LuaMethod, "CenterOnScreen", wxLua_wxWindow_CenterOnScreen, 1, 0, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "CentreOnScreen", wxLua_wxWindow_CentreOnScreen, 1, 0, { &s_wxluaarg_Number, 0 } },
+     { LuaMethod, "GetDefaultItem", wxLua_wxWindow_GetDefaultItem, 0, 0, { 0 } },
      { LuaMethod, "GetTitle", wxLua_wxWindow_GetTitle, 0, 0, { 0 } },
+     { LuaMethod, "SetDefaultItem", wxLua_wxWindow_SetDefaultItem, 1, 1, { &s_wxluatag_wxWindow, 0 } },
      { LuaMethod, "SetTitle", wxLua_wxWindow_SetTitle, 1, 1, { &s_wxluaarg_String, 0 } },
+     { LuaGetProp, "DefaultItem", wxLua_wxWindow_GetDefaultItem, 0, 0, {0} },
+     { LuaSetProp, "DefaultItem", wxLua_wxWindow_SetDefaultItem, 1, 1, {0} },
      { LuaGetProp, "Title", wxLua_wxWindow_GetTitle, 0, 0, {0} },
      { LuaSetProp, "Title", wxLua_wxWindow_SetTitle, 1, 1, {0} },
***************
*** 3820,3838 ****
  }
  
- //     wxWindow* GetDefaultItem() const
- static int LUACALL wxLua_wxPanel_GetDefaultItem(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     wxWindow *returns;
-     // get this
-     wxPanel * self = (wxPanel *)wxlState.GetUserDataType(1, s_wxluatag_wxPanel);
-     // call GetDefaultItem
-     returns = self->GetDefaultItem();
-     // push the result datatype
-     wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
- 
-     return 1;
- }
- 
  //     void InitDialog()
  static int LUACALL wxLua_wxPanel_InitDialog(lua_State *L)
--- 3856,3859 ----
***************
*** 3865,3886 ****
  
  
- #if wxLUA_USE_wxButton
- //     void SetDefaultItem(wxButton *btn)
- static int LUACALL wxLua_wxPanel_SetDefaultItem(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     // wxButton btn
-     wxButton * btn = (wxButton *)wxlState.GetUserDataType(2, s_wxluatag_wxButton);
-     // get this
-     wxPanel * self = (wxPanel *)wxlState.GetUserDataType(1, s_wxluatag_wxPanel);
-     // call SetDefaultItem
-     self->SetDefaultItem(btn);
- 
-     return 0;
- }
- 
- #endif // wxLUA_USE_wxButton
- 
- 
  #if wxLUA_USE_wxPointSizeRect
  //     wxPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "wxPanel")
--- 3886,3889 ----
***************
*** 3952,3967 ****
  static WXLUAMETHOD s_wxPanel_methods[] = {
      { LuaConstructor, "wxPanelDefault", wxLua_wxPanelDefault_constructor, 0, 0, { 0 } },
-     { LuaMethod, "GetDefaultItem", wxLua_wxPanel_GetDefaultItem, 0, 0, { 0 } },
      { LuaMethod, "InitDialog", wxLua_wxPanel_InitDialog, 0, 0, { 0 } },
      { LuaMethod, "SetFocusIgnoringChildren", wxLua_wxPanel_SetFocusIgnoringChildren, 0, 0, { 0 } },
-     { LuaGetProp, "DefaultItem", wxLua_wxPanel_GetDefaultItem, 0, 0, {0} },
-     { LuaSetProp, "DefaultItem", wxLua_wxPanel_SetDefaultItem, 1, 1, {0} },
      { LuaDelete, "wxPanel", wxLua_wxPanel_destructor, 0, 0, {0} },
  
- #if wxLUA_USE_wxButton
-     { LuaMethod, "SetDefaultItem", wxLua_wxPanel_SetDefaultItem, 1, 1, { &s_wxluatag_wxButton, 0 } },
- #endif  // wxLUA_USE_wxButton
- 
- 
  #if wxLUA_USE_wxPointSizeRect
      { LuaConstructor, "wxPanel", wxLua_wxPanel_constructor, 6, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } },
--- 3955,3962 ----

Index: appframe.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** appframe.cpp	9 Jun 2006 22:51:31 -0000	1.21
--- appframe.cpp	23 Aug 2006 04:57:52 -0000	1.22
***************
*** 417,420 ****
--- 417,488 ----
  
  
+ #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
+ //     %wxchkver27 wxWindow* GetDefaultItem() const
+ static int LUACALL wxLua_wxTopLevelWindow_GetDefaultItem(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxWindow *returns;
+     // get this
+     wxTopLevelWindow * self = (wxTopLevelWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxTopLevelWindow);
+     // call GetDefaultItem
+     returns = self->GetDefaultItem();
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
+ 
+     return 1;
+ }
+ 
+ //     %wxchkver27 wxWindow* GetTmpDefaultItem() const
+ static int LUACALL wxLua_wxTopLevelWindow_GetTmpDefaultItem(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxWindow *returns;
+     // get this
+     wxTopLevelWindow * self = (wxTopLevelWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxTopLevelWindow);
+     // call GetTmpDefaultItem
+     returns = self->GetTmpDefaultItem();
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
+ 
+     return 1;
+ }
+ 
+ //     %wxchkver27 wxWindow* SetDefaultItem(wxWindow *win)
+ static int LUACALL wxLua_wxTopLevelWindow_SetDefaultItem(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxWindow *returns;
+     // wxWindow win
+     wxWindow * win = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow);
+     // get this
+     wxTopLevelWindow * self = (wxTopLevelWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxTopLevelWindow);
+     // call SetDefaultItem
+     returns = self->SetDefaultItem(win);
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
+ 
+     return 1;
+ }
+ 
+ //     %wxchkver27 wxWindow* SetTmpDefaultItem(wxWindow *win)
+ static int LUACALL wxLua_wxTopLevelWindow_SetTmpDefaultItem(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxWindow *returns;
+     // wxWindow win
+     wxWindow * win = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow);
+     // get this
+     wxTopLevelWindow * self = (wxTopLevelWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxTopLevelWindow);
+     // call SetTmpDefaultItem
+     returns = self->SetTmpDefaultItem(win);
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxWindow, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
+ 
+ 
  #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
  //     wxIcon GetIcon() const
***************
*** 623,626 ****
--- 691,706 ----
  
  
+ #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
+     { LuaMethod, "GetDefaultItem", wxLua_wxTopLevelWindow_GetDefaultItem, 0, 0, { 0 } },
+     { LuaMethod, "GetTmpDefaultItem", wxLua_wxTopLevelWindow_GetTmpDefaultItem, 0, 0, { 0 } },
+     { LuaMethod, "SetDefaultItem", wxLua_wxTopLevelWindow_SetDefaultItem, 1, 1, { &s_wxluatag_wxWindow, 0 } },
+     { LuaMethod, "SetTmpDefaultItem", wxLua_wxTopLevelWindow_SetTmpDefaultItem, 1, 1, { &s_wxluatag_wxWindow, 0 } },
+     { LuaGetProp, "DefaultItem", wxLua_wxTopLevelWindow_GetDefaultItem, 0, 0, {0} },
+     { LuaSetProp, "DefaultItem", wxLua_wxTopLevelWindow_SetDefaultItem, 1, 1, {0} },
+     { LuaGetProp, "TmpDefaultItem", wxLua_wxTopLevelWindow_GetTmpDefaultItem, 0, 0, {0} },
+     { LuaSetProp, "TmpDefaultItem", wxLua_wxTopLevelWindow_SetTmpDefaultItem, 1, 1, {0} },
+ #endif  // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
+ 
+ 
  #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxFrame || wxLUA_USE_wxDialog)
      { LuaMethod, "GetIcon", wxLua_wxTopLevelWindow_GetIcon, 0, 0, { 0 } },