[Wxlua-commit] wxLua/samples dialog.wx.lua, 1.8, 1.9 scribble.wx.lua, 1.11, 1.12

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

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

Modified Files:
	dialog.wx.lua scribble.wx.lua 
Log Message:
better dialog resizing, cleanup


Index: dialog.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/dialog.wx.lua,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dialog.wx.lua	26 Sep 2006 22:22:00 -0000	1.8
--- dialog.wx.lua	21 Nov 2006 23:20:37 -0000	1.9
***************
*** 30,33 ****
--- 30,34 ----
  local staticBoxSizer = wx.wxStaticBoxSizer(staticBox, wx.wxVERTICAL)
  local flexGridSizer  = wx.wxFlexGridSizer( 2, 3, 0, 0 )
+ flexGridSizer:AddGrowableCol(1, 0)
  
  local celsiusStaticText = wx.wxStaticText( panel, wx.wxID_ANY, "Celcius")
***************
*** 35,39 ****
  local celsiusButton     = wx.wxButton( panel, ID_CELSIUS_BUTTON, "C -> F")
  flexGridSizer:AddWindow( celsiusStaticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 )
! flexGridSizer:AddWindow( celsiusTextCtrl,   0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
  flexGridSizer:AddWindow( celsiusButton,     0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
  
--- 36,40 ----
  local celsiusButton     = wx.wxButton( panel, ID_CELSIUS_BUTTON, "C -> F")
  flexGridSizer:AddWindow( celsiusStaticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 )
! flexGridSizer:AddWindow( celsiusTextCtrl,   0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 )
  flexGridSizer:AddWindow( celsiusButton,     0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
  
***************
*** 42,50 ****
  local fahrenheitButton     = wx.wxButton( panel, ID_FAHRENHEIT_BUTTON, "F -> C")
  flexGridSizer:AddWindow( fahrenheitStaticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 )
! flexGridSizer:AddWindow( fahrenheitTextCtrl,   0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
  flexGridSizer:AddWindow( fahrenheitButton,     0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
  
! staticBoxSizer:AddSizer( flexGridSizer,  0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
! mainSizer:AddSizer(      staticBoxSizer, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
  
  local buttonSizer = wx.wxBoxSizer( wx.wxHORIZONTAL )
--- 43,51 ----
  local fahrenheitButton     = wx.wxButton( panel, ID_FAHRENHEIT_BUTTON, "F -> C")
  flexGridSizer:AddWindow( fahrenheitStaticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 )
! flexGridSizer:AddWindow( fahrenheitTextCtrl,   0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 )
  flexGridSizer:AddWindow( fahrenheitButton,     0, wx.wxALIGN_CENTER+wx.wxALL, 5 )
  
! staticBoxSizer:AddSizer( flexGridSizer,  0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 )
! mainSizer:AddSizer(      staticBoxSizer, 1, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 )
  
  local buttonSizer = wx.wxBoxSizer( wx.wxHORIZONTAL )

Index: scribble.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/scribble.wx.lua,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** scribble.wx.lua	26 Sep 2006 22:22:00 -0000	1.11
--- scribble.wx.lua	21 Nov 2006 23:20:37 -0000	1.12
***************
*** 256,260 ****
  
      local helpMenu = wx.wxMenu()
!     helpMenu:Append(wx.wxID_ABOUT,  "&About...", "About the wxLua Minimal Application")
  
      local menuBar = wx.wxMenuBar()
--- 256,260 ----
  
      local helpMenu = wx.wxMenu()
!     helpMenu:Append(wx.wxID_ABOUT,  "&About...", "About the wxLua Scribble Application")
  
      local menuBar = wx.wxMenuBar()