|
From: John L. <jr...@us...> - 2011-06-15 02:45:57
|
Update of /cvsroot/wxlua/wxLua/samples
In directory vz-cvs-4.sog:/tmp/cvs-serv3662/samples
Modified Files:
catch.lua choices.wx.lua controls.wx.lua htmlwin.wx.lua
mdi.wx.lua picker.wx.lua
Log Message:
Some cleanup
Index: picker.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/picker.wx.lua,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** picker.wx.lua 22 Jan 2008 04:45:39 -0000 1.3
--- picker.wx.lua 15 Jun 2011 02:45:54 -0000 1.4
***************
*** 164,168 ****
datePicker = wx.wxDatePickerCtrl(scrollWin, ID_DATEPICKER2, wx.wxDefaultDateTime,
wx.wxDefaultPosition, wx.wxDefaultSize,
! wx. wxDP_SPIN)
else
datePicker = wx.wxStaticText(scrollWin, wx.wxID_ANY, "Supported in MSW only")
--- 164,168 ----
datePicker = wx.wxDatePickerCtrl(scrollWin, ID_DATEPICKER2, wx.wxDefaultDateTime,
wx.wxDefaultPosition, wx.wxDefaultSize,
! wx.wxDP_SPIN)
else
datePicker = wx.wxStaticText(scrollWin, wx.wxID_ANY, "Supported in MSW only")
Index: controls.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** controls.wx.lua 21 Dec 2009 04:06:14 -0000 1.21
--- controls.wx.lua 15 Jun 2011 02:45:54 -0000 1.22
***************
*** 87,97 ****
ID_STATICBOX = 1036
ID_STATICLINE = 1037
! ID_TEXTCTRL = 1038
! ID_TOGGLEBUTTON = 1039
! ID_TOOLBAR = 1040
! ID_TOOLBOOK = 1041
! ID_TREEBOOK = 1042
! ID_TREECTRL = 1043
! ID_WINDOW = 1044
-- ---------------------------------------------------------------------------
--- 87,98 ----
ID_STATICBOX = 1036
ID_STATICLINE = 1037
! ID_STATICTEXT = 1038
! ID_TEXTCTRL = 1039
! ID_TOGGLEBUTTON = 1040
! ID_TOOLBAR = 1041
! ID_TOOLBOOK = 1042
! ID_TREEBOOK = 1043
! ID_TREECTRL = 1044
! ID_WINDOW = 1045
-- ---------------------------------------------------------------------------
***************
*** 828,833 ****
-- -----------------------------------------------------------------------
do
! local p = wx.wxStaticText(scrollWin, wx.wxID_ANY, "See taskbar for icon")
taskbarIcon = wx.wxTaskBarIcon()
local icon = wx.wxIcon()
--- 829,839 ----
-- -----------------------------------------------------------------------
+ control = wx.wxStaticText(scrollWin, ID_STATICTEXT, "Text for the wxStaticText control")
+ AddControl("wxStaticText", control)
+
+ -- -----------------------------------------------------------------------
+
do
! local p = wx.wxStaticText(scrollWin, wx.wxID_ANY, "See OS taskbar for lightbulb icon")
taskbarIcon = wx.wxTaskBarIcon()
local icon = wx.wxIcon()
Index: mdi.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/mdi.wx.lua,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mdi.wx.lua 22 Jan 2008 04:45:39 -0000 1.15
--- mdi.wx.lua 15 Jun 2011 02:45:54 -0000 1.16
***************
*** 32,36 ****
dc:DrawRoundedRectangle(20, 20, 280, 280, 20);
dc:DrawEllipse(30, 30, 260, 260);
! dc:DrawText("A test string for window Id "..tostring(win:GetId()), 50, 150);
dc:delete() -- ALWAYS delete() any wxDCs created when done
end
--- 32,36 ----
dc:DrawRoundedRectangle(20, 20, 280, 280, 20);
dc:DrawEllipse(30, 30, 260, 260);
! dc:DrawText("Test string for window Id "..tostring(win:GetId()), 40, 150);
dc:delete() -- ALWAYS delete() any wxDCs created when done
end
Index: catch.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/catch.lua,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** catch.lua 14 Jun 2011 03:33:29 -0000 1.2
--- catch.lua 15 Jun 2011 02:45:54 -0000 1.3
***************
*** 32,38 ****
local wallThickness = 5
! local joyStick1 = wx.wxJoystick(wx.wxJOYSTICK1)
! local joyStick2 = wx.wxJoystick(wx.wxJOYSTICK2)
!
local redrawRequired = true
--- 32,37 ----
local wallThickness = 5
! local joyStick1 = wx.wxJoystick(wx.wxJOYSTICK1)
! local joyStick2 = wx.wxJoystick(wx.wxJOYSTICK2)
local redrawRequired = true
***************
*** 319,323 ****
end
-- ensure the event is skipped to allow the frame to close
! event:Skip()
end )
--- 318,322 ----
end
-- ensure the event is skipped to allow the frame to close
! event:Skip()
end )
***************
*** 330,334 ****
end )
-
-- -----------------------------------------------------------------------
-- Game type menu
--- 329,332 ----
***************
*** 373,381 ****
frame:Center()
! frame:Show(true)
!
if (not joyStick1:IsOk() and joyStick2:IsOk()) then
! wx.wxMessageBox('Only one joystick and joystick id is set to 2\n change id to one or program will not work','Catch')
end
end
--- 371,378 ----
frame:Center()
! frame:Show(true)
if (not joyStick1:IsOk() and joyStick2:IsOk()) then
! wx.wxMessageBox('Only one joystick and joystick id is set to 2\n change id to one or program will not work','Catch')
end
end
Index: choices.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/choices.wx.lua,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** choices.wx.lua 22 Jan 2008 04:45:39 -0000 1.13
--- choices.wx.lua 15 Jun 2011 02:45:54 -0000 1.14
***************
*** 26,35 ****
-- create the hierarchy: frame -> notebook
frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLua Choices",
! wx.wxDefaultPosition, wx.wxSize(550, 350))
frame:CreateStatusBar(1)
frame:SetStatusText("wxEvents from controls will be displayed here", 0)
local notebook = wx.wxNotebook(frame, wx.wxID_ANY,
! wx.wxDefaultPosition, wx.wxSize(410, 300))
--wx.wxNB_BOTTOM)
--- 26,35 ----
-- create the hierarchy: frame -> notebook
frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLua Choices",
! wx.wxDefaultPosition, wx.wxSize(635, 350))
frame:CreateStatusBar(1)
frame:SetStatusText("wxEvents from controls will be displayed here", 0)
local notebook = wx.wxNotebook(frame, wx.wxID_ANY,
! wx.wxDefaultPosition, wx.wxDefaultSize)
--wx.wxNB_BOTTOM)
Index: htmlwin.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/htmlwin.wx.lua,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** htmlwin.wx.lua 22 Jan 2008 04:45:39 -0000 1.15
--- htmlwin.wx.lua 15 Jun 2011 02:45:54 -0000 1.16
***************
*** 29,34 ****
</center>
<hr>
! <lua text="small widget"
! x=60 y=50>
<hr>
<lua text="widget with floating width"
--- 29,34 ----
</center>
<hr>
! <lua text="widget with lots of text in it"
! x=100 y=50>
<hr>
<lua text="widget with floating width"
|