[Wxlua-commit] wxLua/bindings/wxwidgets dialogs.i,1.16,1.17 wx_datatypes.lua,1.25,1.26

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4198/wxLua/bindings/wxwidgets

Modified Files:
	dialogs.i wx_datatypes.lua 
Log Message:
add back wxWizard in dialogs.i


Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** wx_datatypes.lua	13 May 2006 17:20:51 -0000	1.25
--- wx_datatypes.lua	15 May 2006 22:57:29 -0000	1.26
***************
*** 2858,2861 ****
--- 2858,2889 ----
      Name = "wxWindowVariant",
    },
+   wxWizard = {
+     BaseClass = "wxDialog",
+     Condition = "wxLUA_USE_wxWizard",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxWizard",
+   },
+   wxWizardEvent = {
+     BaseClass = "wxNotifyEvent",
+     Condition = "wxLUA_USE_wxWizard",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxWizardEvent",
+   },
+   wxWizardPage = {
+     BaseClass = "wxPanel",
+     Condition = "wxLUA_USE_wxWizard",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxWizardPage",
+   },
+   wxWizardPageSimple = {
+     BaseClass = "wxWizardPage",
+     Condition = "wxLUA_USE_wxWizard",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxWizardPageSimple",
+   },
    wxWord = {
      DefType = "wxtypedef",

Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** dialogs.i	14 May 2006 13:11:49 -0000	1.16
--- dialogs.i	15 May 2006 22:57:29 -0000	1.17
***************
*** 431,482 ****
  // wxWizard
  
- // TODO - wxWizard is not fully implemented or tested
- 
  %if wxLUA_USE_wxWizard
  
! //%include "wx/wizard.h"
  
! //%define wxWIZARD_EX_HELPBUTTON
  
! //%class wxWizard, wxDialog
! //	static wxWizard* Create(wxWindow* parent, int id = -1, const wxString& title = "", const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition)
! //	bool RunWizard(wxWizardPage* firstPage)
! //	wxWizardPage* GetCurrentPage() const
! //	wxSize GetPageSize() const
! //	void SetPageSize(const wxSize& sizePage)
! //%endclass
  
  ///////////////////////////////////////////////////////////////////////////////
  // wxWizardPage - this has virtual functions so it can't be used?
  
! //%class wxWizardPage, wxPanel
! //	wxWizardPage(wxWizard* parent, const wxBitmap& bitmap = wxNullBitmap)
! //	wxWizardPage* GetPrev() const
! //	wxWizardPage* GetNext() const
! //	wxBitmap GetBitmap() const
! //%endclass
  
  ///////////////////////////////////////////////////////////////////////////////
! // wxWizardPageSimple
! //%class wxWizardPageSimple, wxWizardPage
! //	wxWizardPageSimple(wxWizard* parent = NULL, wxWizardPage* prev = NULL, wxWizardPage* next = NULL)
! //	void SetPrev(wxWizardPage* prev)
! //	void SetNext(wxWizardPage* next)
! //	static void Chain(wxWizardPageSimple* first, wxWizardPageSimple* second)
! //%endclass
  
  ///////////////////////////////////////////////////////////////////////////////
  // wxWizardEvent
  
! //%class %delete wxWizardEvent, wxNotifyEvent
! //    %define %event wxEVT_WIZARD_CANCEL
! //    %define %event wxEVT_WIZARD_PAGE_CHANGED
! //    %define %event wxEVT_WIZARD_PAGE_CHANGING
! //    %define %event wxEVT_WIZARD_HELP
! //
! //    wxWizardEvent(wxEventType type = wxEVT_NULL, int id = -1, bool direction = true)
! //    bool GetDirection() const
! //    %property=Direction, read
! //%endclass
  
  %endif wxLUA_USE_wxWizard
--- 431,497 ----
  // wxWizard
  
  %if wxLUA_USE_wxWizard
  
! %include "wx/wizard.h"
  
! %define wxWIZARD_EX_HELPBUTTON
  
! %class wxWizard, wxDialog
!     %constructor wxWizardDefault()
!     wxWizard(wxWindow* parent, int id = -1, const wxString& title = "", const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_DIALOG_STYLE)
! 
!     bool Create(wxWindow* parent, int id = -1, const wxString& title = "", const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_DIALOG_STYLE)
!     wxWizardPage* GetCurrentPage() const
!     virtual wxSizer* GetPageAreaSizer() const
!     wxSize GetPageSize() const
!     virtual bool HasNextPage(wxWizardPage *page)
!     virtual bool HasPrevPage(wxWizardPage *page)
!     bool RunWizard(wxWizardPage* firstPage)
!     void SetPageSize(const wxSize& sizePage)
!     void SetBorder(int border)
! %endclass
  
  ///////////////////////////////////////////////////////////////////////////////
  // wxWizardPage - this has virtual functions so it can't be used?
  
! %class wxWizardPage, wxPanel
!     //wxWizardPage(wxWizard* parent, const wxBitmap& bitmap = wxNullBitmap, const wxChar *resource = NULL)
! 
!     //virtual wxWizardPage* GetPrev() const // FIXME not virtual for wxLua
!     //virtual wxWizardPage* GetNext() const
!     wxBitmap GetBitmap() const
! %endclass
  
  ///////////////////////////////////////////////////////////////////////////////
! // wxWizardPageSimple - use this
! 
! %class wxWizardPageSimple, wxWizardPage
!     wxWizardPageSimple(wxWizard* parent = NULL, wxWizardPage* prev = NULL, wxWizardPage* next = NULL, const wxBitmap& bitmap = wxNullBitmap)
! 
!     virtual wxWizardPage* GetPrev() const
!     virtual wxWizardPage* GetNext() const
! 
!     void SetPrev(wxWizardPage* prev)
!     void SetNext(wxWizardPage* next)
!     static void Chain(wxWizardPageSimple* first, wxWizardPageSimple* second)
! %endclass
  
  ///////////////////////////////////////////////////////////////////////////////
  // wxWizardEvent
  
! %class %delete wxWizardEvent, wxNotifyEvent
!     %define %event wxEVT_WIZARD_CANCEL
!     %define %event wxEVT_WIZARD_PAGE_CHANGED
!     %define %event wxEVT_WIZARD_PAGE_CHANGING
!     %define %event wxEVT_WIZARD_HELP
!     %define %event wxEVT_WIZARD_FINISHED
! 
!     wxWizardEvent(wxEventType type = wxEVT_NULL, int id = -1, bool direction = true)
! 
!     bool GetDirection() const
!     wxWizardPage* GetPage() const
! 
!     %property=Direction, read
! %endclass
  
  %endif wxLUA_USE_wxWizard