wxlua-commit

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/include
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3461/wxLua/modules/wxbind/include

Modified Files:
	wxadv_bind.h wxaui_bind.h wxbase_bind.h wxcore_bind.h 
	wxgl_bind.h wxhtml_bind.h wxmedia_bind.h wxnet_bind.h 
	wxrichtext_bind.h wxstc_bind.h wxxml_bind.h wxxrc_bind.h 
Log Message:
Fix multiple inheritance by adding the offset to the vtable for
base classes that are second or higher.


Index: wxadv_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxadv_bind.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxadv_bind.h	19 May 2009 03:20:53 -0000	1.19
--- wxadv_bind.h	25 Sep 2009 18:47:57 -0000	1.20
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 27
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 27
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 28
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 28
  // ---------------------------------------------------------------------------
  

Index: wxcore_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxcore_bind.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wxcore_bind.h	19 May 2009 03:20:53 -0000	1.20
--- wxcore_bind.h	25 Sep 2009 18:47:57 -0000	1.21
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 27
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 27
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 28
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 28
  // ---------------------------------------------------------------------------
  
***************
*** 136,139 ****
--- 136,140 ----
  
  #include "wx/control.h"
+ #include "wx/ctrlsub.h"
  #include "wx/defs.h"
  #include "wx/effects.h"
***************
*** 540,544 ****
  
  #if (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS
!     extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxControlWithItems;
  #endif // (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS
  
--- 541,546 ----
  
  #if (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS
!     extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxItemContainer;
!     extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxItemContainerImmutable;
  #endif // (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox ) && wxUSE_CONTROLS
  
***************
*** 701,704 ****
--- 703,707 ----
  extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxContextMenuEvent;
  extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxControl;
+ extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxControlWithItems;
  extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxDisplayChangedEvent;
  extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxEffects;

Index: wxrichtext_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxrichtext_bind.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxrichtext_bind.h	19 May 2009 03:20:53 -0000	1.17
--- wxrichtext_bind.h	25 Sep 2009 18:47:57 -0000	1.18
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 27
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 27
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 28
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 28
  // ---------------------------------------------------------------------------
  

Index: wxxrc_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxrc_bind.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxxrc_bind.h	19 May 2009 03:20:53 -0000	1.17
--- wxxrc_bind.h	25 Sep 2009 18:47:57 -0000	1.18
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 27
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 27
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 28
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 28
  // ---------------------------------------------------------------------------
  

Index: wxnet_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxnet_bind.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxnet_bind.h	19 May 2009 03:20:53 -0000	1.17
--- wxnet_bind.h	25 Sep 2009 18:47:57 -0000	1.18
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 27
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 27
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 28
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 28
  // ---------------------------------------------------------------------------
  

Index: wxbase_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbase_bind.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxbase_bind.h	19 May 2009 03:20:53 -0000	1.18
--- wxbase_bind.h	25 Sep 2009 18:47:57 -0000	1.19
***************
*** 19,25 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 27
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 27
  // ---------------------------------------------------------------------------
  
--- 19,25 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 28
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 28
  // ---------------------------------------------------------------------------
  

Index: wxmedia_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxmedia_bind.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxmedia_bind.h	19 May 2009 03:20:53 -0000	1.17
--- wxmedia_bind.h	25 Sep 2009 18:47:57 -0000	1.18
***************
*** 21,27 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 27
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 27
  // ---------------------------------------------------------------------------
  
--- 21,27 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 28
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 28
  // ---------------------------------------------------------------------------
  

Index: wxgl_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxgl_bind.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxgl_bind.h	19 May 2009 03:20:53 -0000	1.17
--- wxgl_bind.h	25 Sep 2009 18:47:57 -0000	1.18
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 27
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 27
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 28
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 28
  // ---------------------------------------------------------------------------
  

Index: wxstc_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxstc_bind.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxstc_bind.h	19 May 2009 03:20:53 -0000	1.17
--- wxstc_bind.h	25 Sep 2009 18:47:57 -0000	1.18
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 27
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 27
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 28
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 28
  // ---------------------------------------------------------------------------
  

Index: wxaui_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxaui_bind.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxaui_bind.h	19 May 2009 03:20:53 -0000	1.18
--- wxaui_bind.h	25 Sep 2009 18:47:57 -0000	1.19
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 27
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 27
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 28
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 28
  // ---------------------------------------------------------------------------
  

Index: wxhtml_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxhtml_bind.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxhtml_bind.h	19 May 2009 03:20:53 -0000	1.18
--- wxhtml_bind.h	25 Sep 2009 18:47:57 -0000	1.19
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 27
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 27
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 28
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 28
  // ---------------------------------------------------------------------------
  

Index: wxxml_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxxml_bind.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxxml_bind.h	19 May 2009 03:20:53 -0000	1.17
--- wxxml_bind.h	25 Sep 2009 18:47:57 -0000	1.18
***************
*** 20,26 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 27
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 27
  // ---------------------------------------------------------------------------
  
--- 20,26 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 28
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 28
  // ---------------------------------------------------------------------------