[Wxlua-commit] wxLua/modules/wxbind/src wx_bind.cpp,1.46,1.47

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	wx_bind.cpp 
Log Message:
make using C++ namespaces ns::MyClass work for binding generator

Index: wx_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** wx_bind.cpp	8 Jun 2006 03:22:10 -0000	1.46
--- wx_bind.cpp	9 Jun 2006 03:24:49 -0000	1.47
***************
*** 6307,6312 ****

      wxLua_wxSTANDARD_CURSOR  = (wxCursor*)wxSTANDARD_CURSOR;
! 	wxLua_wxHOURGLASS_CURSOR = (wxCursor*)wxHOURGLASS_CURSOR;
! 	wxLua_wxCROSS_CURSOR     = (wxCursor*)wxCROSS_CURSOR;
  }
  void wxLuaBinding_wx::PostRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable)
--- 6307,6312 ----

      wxLua_wxSTANDARD_CURSOR  = (wxCursor*)wxSTANDARD_CURSOR;
!     wxLua_wxHOURGLASS_CURSOR = (wxCursor*)wxHOURGLASS_CURSOR;
!     wxLua_wxCROSS_CURSOR     = (wxCursor*)wxCROSS_CURSOR;
  }
  void wxLuaBinding_wx::PostRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable)
***************
*** 6361,6517 ****
  }

! wxLUA_IMPLEMENT_ENCAPSULATION(wxString)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxWindowDisabler)

  #if wxCHECK_VERSION(2,7,0)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxMouseState)
  #endif

  #if wxLUA_USE_Geometry
! wxLUA_IMPLEMENT_ENCAPSULATION(wxPoint2DDouble)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxPoint2DInt)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxRect2DDouble)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxRect2DInt)
  #endif

  #if wxLUA_USE_wxAcceleratorTable
! wxLUA_IMPLEMENT_ENCAPSULATION(wxAcceleratorEntry)
  #endif

  #if wxLUA_USE_wxArrayInt
! wxLUA_IMPLEMENT_ENCAPSULATION(wxArrayInt)
  #endif

  #if wxLUA_USE_wxArrayString
! wxLUA_IMPLEMENT_ENCAPSULATION(wxArrayString)
  #endif

  #if wxLUA_USE_wxBusyCursor
! wxLUA_IMPLEMENT_ENCAPSULATION(wxBusyCursor)
  #endif

  #if wxLUA_USE_wxCalendarCtrl
! wxLUA_IMPLEMENT_ENCAPSULATION(wxCalendarDateAttr)
  #endif

  #if wxLUA_USE_wxColourPenBrush
! wxLUA_IMPLEMENT_ENCAPSULATION(wxColourDatabase)
  #endif

  #if wxLUA_USE_wxCriticalSection
! wxLUA_IMPLEMENT_ENCAPSULATION(wxCriticalSection)
  #endif

  #if wxLUA_USE_wxCriticalSectionLocker
! wxLUA_IMPLEMENT_ENCAPSULATION(wxCriticalSectionLocker)
  #endif

  #if wxLUA_USE_wxDataObject
! wxLUA_IMPLEMENT_ENCAPSULATION(wxBitmapDataObject)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDataFormat)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDataObjectComposite)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDataObjectSimple)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxFileDataObject)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxTextDataObject)
  #endif

  #if wxLUA_USE_wxDateSpan
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDateSpan)
  #endif

  #if wxLUA_USE_wxDateTime
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTime)
  #endif

  #if wxLUA_USE_wxDir
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDir)
  #endif

  #if wxLUA_USE_wxDragDrop
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDropSource)
  #endif

  #if wxLUA_USE_wxFile
! wxLUA_IMPLEMENT_ENCAPSULATION(wxFile)
  #endif

  #if wxLUA_USE_wxFileName
! wxLUA_IMPLEMENT_ENCAPSULATION(wxFileName)
  #endif

  #if wxLUA_USE_wxFontEnumerator
! wxLUA_IMPLEMENT_ENCAPSULATION(wxFontEnumerator)
  #endif

  #if wxLUA_USE_wxGrid
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellCoords)
  #endif

  #if wxLUA_USE_wxListCtrl
! wxLUA_IMPLEMENT_ENCAPSULATION(wxListItemAttr)
  #endif

  #if wxLUA_USE_wxPointSizeRect
! wxLUA_IMPLEMENT_ENCAPSULATION(wxPoint)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxRect)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxSize)
  #endif

  #if wxLUA_USE_wxProcess
! wxLUA_IMPLEMENT_ENCAPSULATION(wxProcess)
  #endif

  #if wxLUA_USE_wxRegEx
! wxLUA_IMPLEMENT_ENCAPSULATION(wxRegEx)
  #endif

  #if wxLUA_USE_wxSizer
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGBPosition)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGBSpan)
  #endif

  #if wxLUA_USE_wxTextCtrl
! wxLUA_IMPLEMENT_ENCAPSULATION(wxTextAttr)
  #endif

  #if wxLUA_USE_wxTimeSpan
! wxLUA_IMPLEMENT_ENCAPSULATION(wxTimeSpan)
  #endif

  #if wxLUA_USE_wxTreeCtrl
! wxLUA_IMPLEMENT_ENCAPSULATION(wxArrayTreeItemIds)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxTreeItemId)
  #endif

  #if wxLUA_USE_wxXMLResource
! wxLUA_IMPLEMENT_ENCAPSULATION(wxXmlNode)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxXmlProperty)
  #endif

--- 6361,6517 ----
  }

! wxLUA_IMPLEMENT_ENCAPSULATION(wxString, wxString)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxWindowDisabler, wxWindowDisabler)

  #if wxCHECK_VERSION(2,7,0)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxMouseState, wxMouseState)
  #endif

  #if wxLUA_USE_Geometry
! wxLUA_IMPLEMENT_ENCAPSULATION(wxPoint2DDouble, wxPoint2DDouble)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxPoint2DInt, wxPoint2DInt)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxRect2DDouble, wxRect2DDouble)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxRect2DInt, wxRect2DInt)
  #endif

  #if wxLUA_USE_wxAcceleratorTable
! wxLUA_IMPLEMENT_ENCAPSULATION(wxAcceleratorEntry, wxAcceleratorEntry)
  #endif

  #if wxLUA_USE_wxArrayInt
! wxLUA_IMPLEMENT_ENCAPSULATION(wxArrayInt, wxArrayInt)
  #endif

  #if wxLUA_USE_wxArrayString
! wxLUA_IMPLEMENT_ENCAPSULATION(wxArrayString, wxArrayString)
  #endif

  #if wxLUA_USE_wxBusyCursor
! wxLUA_IMPLEMENT_ENCAPSULATION(wxBusyCursor, wxBusyCursor)
  #endif

  #if wxLUA_USE_wxCalendarCtrl
! wxLUA_IMPLEMENT_ENCAPSULATION(wxCalendarDateAttr, wxCalendarDateAttr)
  #endif

  #if wxLUA_USE_wxColourPenBrush
! wxLUA_IMPLEMENT_ENCAPSULATION(wxColourDatabase, wxColourDatabase)
  #endif

  #if wxLUA_USE_wxCriticalSection
! wxLUA_IMPLEMENT_ENCAPSULATION(wxCriticalSection, wxCriticalSection)
  #endif

  #if wxLUA_USE_wxCriticalSectionLocker
! wxLUA_IMPLEMENT_ENCAPSULATION(wxCriticalSectionLocker, wxCriticalSectionLocker)
  #endif

  #if wxLUA_USE_wxDataObject
! wxLUA_IMPLEMENT_ENCAPSULATION(wxBitmapDataObject, wxBitmapDataObject)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDataFormat, wxDataFormat)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDataObjectComposite, wxDataObjectComposite)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDataObjectSimple, wxDataObjectSimple)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxFileDataObject, wxFileDataObject)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxTextDataObject, wxTextDataObject)
  #endif

  #if wxLUA_USE_wxDateSpan
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDateSpan, wxDateSpan)
  #endif

  #if wxLUA_USE_wxDateTime
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTime, wxDateTime)
  #endif

  #if wxLUA_USE_wxDir
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDir, wxDir)
  #endif

  #if wxLUA_USE_wxDragDrop
! wxLUA_IMPLEMENT_ENCAPSULATION(wxDropSource, wxDropSource)
  #endif

  #if wxLUA_USE_wxFile
! wxLUA_IMPLEMENT_ENCAPSULATION(wxFile, wxFile)
  #endif

  #if wxLUA_USE_wxFileName
! wxLUA_IMPLEMENT_ENCAPSULATION(wxFileName, wxFileName)
  #endif

  #if wxLUA_USE_wxFontEnumerator
! wxLUA_IMPLEMENT_ENCAPSULATION(wxFontEnumerator, wxFontEnumerator)
  #endif

  #if wxLUA_USE_wxGrid
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGridCellCoords, wxGridCellCoords)
  #endif

  #if wxLUA_USE_wxListCtrl
! wxLUA_IMPLEMENT_ENCAPSULATION(wxListItemAttr, wxListItemAttr)
  #endif

  #if wxLUA_USE_wxPointSizeRect
! wxLUA_IMPLEMENT_ENCAPSULATION(wxPoint, wxPoint)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxRect, wxRect)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxSize, wxSize)
  #endif

  #if wxLUA_USE_wxProcess
! wxLUA_IMPLEMENT_ENCAPSULATION(wxProcess, wxProcess)
  #endif

  #if wxLUA_USE_wxRegEx
! wxLUA_IMPLEMENT_ENCAPSULATION(wxRegEx, wxRegEx)
  #endif

  #if wxLUA_USE_wxSizer
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGBPosition, wxGBPosition)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxGBSpan, wxGBSpan)
  #endif

  #if wxLUA_USE_wxTextCtrl
! wxLUA_IMPLEMENT_ENCAPSULATION(wxTextAttr, wxTextAttr)
  #endif

  #if wxLUA_USE_wxTimeSpan
! wxLUA_IMPLEMENT_ENCAPSULATION(wxTimeSpan, wxTimeSpan)
  #endif

  #if wxLUA_USE_wxTreeCtrl
! wxLUA_IMPLEMENT_ENCAPSULATION(wxArrayTreeItemIds, wxArrayTreeItemIds)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxTreeItemId, wxTreeItemId)
  #endif

  #if wxLUA_USE_wxXMLResource
! wxLUA_IMPLEMENT_ENCAPSULATION(wxXmlNode, wxXmlNode)
! wxLUA_IMPLEMENT_ENCAPSULATION(wxXmlProperty, wxXmlProperty)
  #endif