[Wxlua-commit] wxLua/samples coroutine.wx.lua, 1.3, 1.4 debug.wx.lua, 1.8, 1.9 grid.wx.lua, 1.7, 1.8 htmlwin.wx.lua, 1.10, 1.11 printing.wx.lua, 1.11, 1.12 tree.wx.lua, 1.7, 1.8 wxluasudoku.wx.lua, 1.59, 1.60

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

Update of /cvsroot/wxlua/wxLua/samples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9752/wxLua/samples

Modified Files:
	coroutine.wx.lua debug.wx.lua grid.wx.lua htmlwin.wx.lua 
	printing.wx.lua tree.wx.lua wxluasudoku.wx.lua 
Log Message:
fix samples for stricter parameter checking


Index: debug.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/debug.wx.lua,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** debug.wx.lua	2 Nov 2006 23:38:09 -0000	1.8
--- debug.wx.lua	21 Dec 2006 20:14:20 -0000	1.9
***************
*** 460,464 ****
  end
  
! main()
  
! --fred()
--- 460,466 ----
  end
  
! --main()
  
! wx.wxMessageBox("This sample is under construction and does nothing.",
!                 "Welcome to Debug demo",
!                 wx.wxICON_INFORMATION + wx.wxOK)

Index: wxluasudoku.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** wxluasudoku.wx.lua	22 Nov 2006 21:13:56 -0000	1.59
--- wxluasudoku.wx.lua	21 Dec 2006 20:14:21 -0000	1.60
***************
*** 1554,1558 ****
  <meta name="generator" content=
  "HTML Tidy for Linux/x86 (vers 1st December 2004), see www.w3.org">
-   <meta content="text/html; charset=us-ascii" http-equiv="content-type">
  
    <title>wxLuaSudoku</title>
--- 1554,1557 ----
***************
*** 4872,4876 ****
        userPossMenu:Append( sudokuGUI.ID_USER_POSSIBLE_SETALL, "Set all...",    "Set all pencil marks")
        userPossMenu:Append( sudokuGUI.ID_USER_POSSIBLE_INIT,   "Calculate...", "Initialize pencil marks to calculated possible")
!     possibleMenu:AppendMenu(ID_USER_POSSIBLE_MENU, "Pencil marks", userPossMenu, "Setup user possible values")
  
      possibleMenu:AppendSeparator()
--- 4871,4875 ----
        userPossMenu:Append( sudokuGUI.ID_USER_POSSIBLE_SETALL, "Set all...",    "Set all pencil marks")
        userPossMenu:Append( sudokuGUI.ID_USER_POSSIBLE_INIT,   "Calculate...", "Initialize pencil marks to calculated possible")
!     possibleMenu:AppendMenu(sudokuGUI.ID_USER_POSSIBLE_MENU, "Pencil marks", userPossMenu, "Setup user possible values")
  
      possibleMenu:AppendSeparator()
***************
*** 4885,4889 ****
        possViewMenu:AppendCheckItem( sudokuGUI.ID_SHOW_NAKEDQUADS,     "Mark naked quads",     "Mark naked quads in possible values")
        possViewMenu:AppendCheckItem( sudokuGUI.ID_SHOW_HIDDENQUADS,    "Mark hidden quads",    "Mark hidden quads in possible values")
!     possibleMenu:AppendMenu(ID_SHOW_MENU, "Mark &groups", possViewMenu, "Mark naked/hidden groups")
  
      local solveMenu = wx.wxMenu("", 0)
--- 4884,4888 ----
        possViewMenu:AppendCheckItem( sudokuGUI.ID_SHOW_NAKEDQUADS,     "Mark naked quads",     "Mark naked quads in possible values")
        possViewMenu:AppendCheckItem( sudokuGUI.ID_SHOW_HIDDENQUADS,    "Mark hidden quads",    "Mark hidden quads in possible values")
!     possibleMenu:AppendMenu(sudokuGUI.ID_SHOW_MENU, "Mark &groups", possViewMenu, "Mark naked/hidden groups")
  
      local solveMenu = wx.wxMenu("", 0)
***************
*** 4902,4906 ****
        elimSolveMenu:AppendCheckItem(sudokuGUI.ID_ELIMINATE_NAKEDQUADS, "Eliminate naked quads", "Eliminate naked quads from possible values")
        elimSolveMenu:AppendCheckItem(sudokuGUI.ID_ELIMINATE_HIDDENQUADS, "Eliminate hidden quads", "Eliminate hidden quads from possible values")
!     solveMenu:AppendMenu(ID_ELIMINATE_MENU, "&Eliminate groups", elimSolveMenu, "Remove possible values using naked and hidden groups")
      solveMenu:AppendSeparator()
      solveMenu:Append(sudokuGUI.ID_SOLVE_SCANSINGLES, "Solve (scan singles)\tCtrl-1", "Solve all cells with only one possibility")
--- 4901,4905 ----
        elimSolveMenu:AppendCheckItem(sudokuGUI.ID_ELIMINATE_NAKEDQUADS, "Eliminate naked quads", "Eliminate naked quads from possible values")
        elimSolveMenu:AppendCheckItem(sudokuGUI.ID_ELIMINATE_HIDDENQUADS, "Eliminate hidden quads", "Eliminate hidden quads from possible values")
!     solveMenu:AppendMenu(sudokuGUI.ID_ELIMINATE_MENU, "&Eliminate groups", elimSolveMenu, "Remove possible values using naked and hidden groups")
      solveMenu:AppendSeparator()
      solveMenu:Append(sudokuGUI.ID_SOLVE_SCANSINGLES, "Solve (scan singles)\tCtrl-1", "Solve all cells with only one possibility")

Index: tree.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/tree.wx.lua,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tree.wx.lua	20 Sep 2006 04:07:38 -0000	1.7
--- tree.wx.lua	21 Dec 2006 20:14:21 -0000	1.8
***************
*** 68,71 ****
--- 68,72 ----
      rootSizer:AddWindow( textCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL, 0 )
      frame:SetSizer( rootSizer )
+     frame:Layout() -- help sizing the windows before being shown
  
      -- create a table to store any extra information for each node like this

Index: htmlwin.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/htmlwin.wx.lua,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** htmlwin.wx.lua	20 Sep 2006 04:07:38 -0000	1.10
--- htmlwin.wx.lua	21 Dec 2006 20:14:20 -0000	1.11
***************
*** 34,39 ****
  
  function CreateBoundWindow(event)
!     local ax, ay
!     local rc, fl = 0
  
      -- parse the X parameter in the custom lua tag
--- 34,39 ----
  
  function CreateBoundWindow(event)
!     local ax, ay, rc
!     local fl = 0
  
      -- parse the X parameter in the custom lua tag
***************
*** 62,65 ****
--- 62,66 ----
          wnd:Show(true)
  
+         print(wnd, type(fl))
          -- create the container widget cell
          local widget = wx.wxHtmlWidgetCell(wnd, fl)

Index: grid.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/grid.wx.lua,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** grid.wx.lua	20 Sep 2006 04:07:38 -0000	1.7
--- grid.wx.lua	21 Dec 2006 20:14:20 -0000	1.8
***************
*** 12,19 ****
                           wx.wxPoint(25, 25), wx.wxSize(350, 250))
  
! local fileMenu = wx.wxMenu("", wxMENU_TEAROFF)
  fileMenu:Append(wx.wxID_EXIT, "E&xit\tCtrl-X", "Quit the program")
  
! local helpMenu = wx.wxMenu("", wxMENU_TEAROFF)
  helpMenu:Append(wx.wxID_ABOUT, "&About\tCtrl-A", "About the Grid wxLua Application")
  
--- 12,19 ----
                           wx.wxPoint(25, 25), wx.wxSize(350, 250))
  
! local fileMenu = wx.wxMenu("", wx.wxMENU_TEAROFF)
  fileMenu:Append(wx.wxID_EXIT, "E&xit\tCtrl-X", "Quit the program")
  
! local helpMenu = wx.wxMenu("", wx.wxMENU_TEAROFF)
  helpMenu:Append(wx.wxID_ABOUT, "&About\tCtrl-A", "About the Grid wxLua Application")
  

Index: coroutine.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/coroutine.wx.lua,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** coroutine.wx.lua	20 Sep 2006 04:07:38 -0000	1.3
--- coroutine.wx.lua	21 Dec 2006 20:14:20 -0000	1.4
***************
*** 45,49 ****
                             wx.wxDEFAULT_DIALOG_STYLE)
  
!     o.label = wx.wxTextCtrl (o.dialog, wx.wxID_ANY, intialLabel,
                               wx.wxDefaultPosition, wx.wxDefaultSize,
                               wx.wxTE_MULTILINE + wx.wxTE_READONLY)
--- 45,49 ----
                             wx.wxDEFAULT_DIALOG_STYLE)
  
!     o.label = wx.wxTextCtrl (o.dialog, wx.wxID_ANY, "",
                               wx.wxDefaultPosition, wx.wxDefaultSize,
                               wx.wxTE_MULTILINE + wx.wxTE_READONLY)

Index: printing.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/printing.wx.lua,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** printing.wx.lua	20 Sep 2006 04:07:38 -0000	1.11
--- printing.wx.lua	21 Dec 2006 20:14:21 -0000	1.12
***************
*** 16,27 ****
  local ID_PAGESETUP    = wx.wxID_HIGHEST + 4
  
! frame         = nil
! printData     = wx.wxPrintData()
! pageSetupData = wx.wxPageSetupDialogData()
  
  -- Setup the printer data with some useful defaults
  printData:SetPaperId(wx.wxPAPER_LETTER)
! pageSetupData:SetMarginTopLeft(wx.wxPoint(20, 20))
! pageSetupData:SetMarginBottomRight(wx.wxPoint(20, 20))
  
  function DisplayFigure(dc, pageNumber)
--- 16,27 ----
  local ID_PAGESETUP    = wx.wxID_HIGHEST + 4
  
! frame               = nil
! printData           = wx.wxPrintData()
! pageSetupDialogData = wx.wxPageSetupDialogData()
  
  -- Setup the printer data with some useful defaults
  printData:SetPaperId(wx.wxPAPER_LETTER)
! pageSetupDialogData:SetMarginTopLeft(wx.wxPoint(20, 20))
! pageSetupDialogData:SetMarginBottomRight(wx.wxPoint(20, 20))
  
  function DisplayFigure(dc, pageNumber)
***************
*** 113,118 ****
  
          -- get margins informations and convert to printer pixels
!         local topLeft     = pageSetupData:GetMarginTopLeft()
!         local bottomRight = pageSetupData:GetMarginBottomRight()
  
          local top    = topLeft:GetY()     * ppmm_y
--- 113,118 ----
  
          -- get margins informations and convert to printer pixels
!         local topLeft     = pageSetupDialogData:GetMarginTopLeft()
!         local bottomRight = pageSetupDialogData:GetMarginBottomRight()
  
          local top    = topLeft:GetY()     * ppmm_y
***************
*** 192,196 ****
      local printDialogData = wx.wxPrintDialogDataFromPrintData(printData)
      local printerDialog   = wx.wxPrintDialog(frame, printDialogData)
!     printerDialog:GetPrintDialogData():SetSetupDialog(true)
      printerDialog:ShowModal()
      printData = printerDialog:GetPrintDialogData():GetPrintData():Copy()
--- 192,196 ----
      local printDialogData = wx.wxPrintDialogDataFromPrintData(printData)
      local printerDialog   = wx.wxPrintDialog(frame, printDialogData)
!     --printerDialog:GetPrintDialogData():SetSetupDialog(true)
      printerDialog:ShowModal()
      printData = printerDialog:GetPrintDialogData():GetPrintData():Copy()
***************
*** 198,207 ****
  
  function PageSetup()
!     printData = pageSetupData:GetPrintData():Copy()
!     local pageSetupDialog = wx.wxPageSetupDialog(frame, pageSetupData)
      pageSetupDialog:ShowModal()
!     printData     = pageSetupDialog:GetPageSetupData():GetPrintData():Copy()
!     pageSetupData = pageSetupDialog:GetPageSetupData():Copy()
!     pageSetupDialog:Destroy()
  end
  
--- 198,207 ----
  
  function PageSetup()
!     printData = pageSetupDialogData:GetPrintData():Copy()
!     local pageSetupDialog = wx.wxPageSetupDialog(frame, pageSetupDialogData)
      pageSetupDialog:ShowModal()
!     printData           = pageSetupDialog:GetPageSetupDialogData():GetPrintData():Copy()
!     pageSetupDialogData = pageSetupDialog:GetPageSetupDialogData():Copy()
!     pageSetupDialog:Delete()
  end