[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h, 1.84, 1.85 wxlcallb.h, 1.28, 1.29

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

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28571/wxLua/modules/wxlua/include

Modified Files:
	wxlbind.h wxlcallb.h 
Log Message:
Add unused (as of yet) WXLUAMETHOD_ENCAPSULATE bit for wxLuaMethod struct
Add binding function wxlua.ungcobject(void*) (for testing really)
Add hack for wxGridCellWorker::GetRef() to see what the ref count is.
   uses ugly #define to get to it's private m_nRef member.


Index: wxlcallb.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** wxlcallb.h	4 Jan 2008 00:21:08 -0000	1.28
--- wxlcallb.h	17 Mar 2008 03:05:04 -0000	1.29
***************
*** 22,30 ****
  // callback user data for event.
  //
! // Do NOT delete wxLuaEventCallbacks since the wxEvtHandler deletes the 
  // callback user data itself.
  //
  // The function wxLuaEventCallback::OnAllEvents() generically handles all wxEvents
! // by retrieving the wxLuaEventCallback instance from the wxEvent userdata 
  // to call wxLuaEventCallback::OnEvent() on the correct instance.
  // ----------------------------------------------------------------------------
--- 22,30 ----
  // callback user data for event.
  //
! // Do NOT delete wxLuaEventCallbacks since the wxEvtHandler deletes the
  // callback user data itself.
  //
  // The function wxLuaEventCallback::OnAllEvents() generically handles all wxEvents
! // by retrieving the wxLuaEventCallback instance from the wxEvent userdata
  // to call wxLuaEventCallback::OnEvent() on the correct instance.
  // ----------------------------------------------------------------------------
***************
*** 69,74 ****
  
      // Central event handler that calls OnEvent() for the actual
!     //   wxLuaEventCallback callback userdata. 
!     // This function is treated like a static function that all handlers of 
      //   this class will call.
      void OnAllEvents(wxEvent& event);
--- 69,74 ----
  
      // Central event handler that calls OnEvent() for the actual
!     //   wxLuaEventCallback callback userdata.
!     // This function is treated like a static function that all handlers of
      //   this class will call.
      void OnAllEvents(wxEvent& event);
***************
*** 120,125 ****
  
      // Central event handler that calls OnDestroy() for the actual
!     //   wxLuaWinDestroyCallback callback user data. 
!     // This function is treated like a static function that all handlers of 
      //   this class will call.
      void OnAllDestroyEvents(wxWindowDestroyEvent& event);
--- 120,125 ----
  
      // Central event handler that calls OnDestroy() for the actual
!     //   wxLuaWinDestroyCallback callback user data.
!     // This function is treated like a static function that all handlers of
      //   this class will call.
      void OnAllDestroyEvents(wxWindowDestroyEvent& event);

Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** wxlbind.h	31 Jan 2008 04:34:07 -0000	1.84
--- wxlbind.h	17 Mar 2008 03:05:03 -0000	1.85
***************
*** 125,128 ****
--- 125,130 ----
                                        // original class.
  
+     WXLUAMETHOD_ENCAPSULATE = 0x4000, // This class is not derived from a wxObject
+ 
      WXLUAMETHOD_CHECKED_OVERLOAD = 0x10000, // Class method has been checked to see if it is
                                              // overloaded function from the base class by
***************
*** 364,367 ****
--- 366,379 ----
  }
  
+ #define wxGridCellWorkerDummyFriend wxGridCellWorkerDummyFriend; \
+     public: \
+     size_t GetRef() const { return m_nRef; }
+ 
+ #define wxGridCellAttrDummyFriend wxGridCellAttrDummyFriend; \
+     public: \
+     size_t GetRef() const { return m_nRef; }
+ 
+ #include "wx/grid.h"
+ 
  // The wxGridWorker classes have protected destructors, use DecRef().
  #define wxLUA_IMPLEMENT_wxGridCellWorker_ENCAPSULATION(className, objName) \