Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2007-06-22 03:20:32
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23505/wxLua/samples Modified Files: controls.wx.lua Log Message: Fix wxEVT_CONTEXT_MENU in bindings finish off the controls.wx.lua sample Index: controls.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** controls.wx.lua 21 Jun 2007 22:02:58 -0000 1.4 --- controls.wx.lua 22 Jun 2007 03:20:26 -0000 1.5 *************** *** 13,17 **** --- 13,20 ---- textCtrl = nil + -- wxBitmap to use for controls that need one bmp = wx.wxArtProvider.GetBitmap(wx.wxART_INFORMATION, wx.wxART_TOOLBAR, wx.wxSize(16, 16)) + + -- wxImageList for any controls that need them imageList = wx.wxImageList(16, 16) imageList:Add(wx.wxArtProvider.GetBitmap(wx.wxART_NORMAL_FILE, wx.wxART_TOOLBAR, wx.wxSize(16, 16))) *************** *** 21,26 **** --- 24,35 ---- colorList = { wx.wxColour(255, 100, 100), wx.wxColour(100, 100, 255), wx.wxColour(100, 255, 100), wx.wxWHITE } + -- wxImageList for the wxListCtrl that shows the events + listImageList = wx.wxImageList(16, 16) + listImageList:Add(wx.wxArtProvider.GetBitmap(wx.wxART_CROSS_MARK, wx.wxART_TOOLBAR, wx.wxSize(16, 16))) + listImageList:Add(wx.wxArtProvider.GetBitmap(wx.wxART_TICK_MARK, wx.wxART_TOOLBAR, wx.wxSize(16, 16))) + -- IDs for the windows that we show ID_PARENT_SCROLLEDWINDOW = 1000 + ID_ANIMATIONCTRL = 1001 ID_BITMAPBUTTON = 1002 *************** *** 49,54 **** ID_RADIOBOX = 1025 ID_RADIOBUTTON = 1026 ! ID_SCROLLBAR = 1027 ! ID_SCROLLEDWINDOW = 1028 ID_SLIDER = 1029 ID_SPINBUTTON = 1030 --- 58,65 ---- ID_RADIOBOX = 1025 ID_RADIOBUTTON = 1026 ! ID_SASHLAYOUTWINDOW = 1026 ! ID_SASHWINDOW = 1027 ! ID_SCROLLBAR = 1028 ! ID_SCROLLEDWINDOW = 1029 ID_SLIDER = 1029 ID_SPINBUTTON = 1030 *************** *** 76,82 **** for i = 1, #wxEVT_Array do wxEVT_TableByType[wxEVT_Array[i].eventType] = wxEVT_Array[i] ! table.insert(wxEVT_List, string.format("%s %s", wxlua.wxlua_typename(wxEVT_Array[i].class_tag), wxEVT_Array[i].name)) end ! table.sort(wxEVT_List) -- Turn the array from the binding into a lookup table by class name --- 87,93 ---- for i = 1, #wxEVT_Array do wxEVT_TableByType[wxEVT_Array[i].eventType] = wxEVT_Array[i] ! table.insert(wxEVT_List, {wxlua.wxlua_typename(wxEVT_Array[i].class_tag), wxEVT_Array[i].name}) end ! table.sort(wxEVT_List, function(t1, t2) return t1[1] > t2[1] end) -- Turn the array from the binding into a lookup table by class name *************** *** 88,139 **** -- --------------------------------------------------------------------------- ! -- Format the values you can get from different event types -- --------------------------------------------------------------------------- ! function FuncsToString(event, funcTable) ! local t = {} ! ! for n = 1, #funcTable do ! local v = event[funcTable[n]](event) -- each item is a function name ! ! local s = funcTable[n].."=" ! local typ = wxlua.wxlua_type(v) ! local typ_name = wxlua.wxlua_typename(typ) ! if typ == wxlua.WXLUAARG_String then ! s = s.."'"..tostring(v).."'" ! elseif typ == wxlua.WXLUAARG_Table then ! s = s.."("..table.concat(v, ",")..")" ! elseif typ <= 0 then -- the rest of generic lua types ! s = s..tostring(v) ! elseif typ_name == "wxPoint" then ! s = s..string.format("(%d, %d) ", v:GetX(), v:GetY()) ! elseif typ_name == "wxSize" then ! s = s..string.format("(%d, %d) ", v:GetWidth(), v:GetHeight()) ! elseif typ_name == "wxRect" then ! s = s..string.format("(%d, %d, %d, %d)", v:GetX(), v:GetY(), v:GetWidth(), v:GetHeight()) ! elseif typ_name == "wxColour" then ! s = s..v:GetAsString() ! v:delete() ! elseif typ_name == "wxFont" then ! s = s..v:GetNativeFontInfoDesc() ! v:delete() ! elseif typ_name == "wxDateTime" then ! s = s..v:Format() ! elseif typ_name == "wxTreeItemId" then ! s = s..tostring(v) ! elseif typ_name == "wxWindow" then ! s = s..typ_name.."(GetName="..v:GetName()..")" ! else ! s = s..tostring(v) ! v:delete() ! print("Unhandled wxLua data type in FuncsToString from ", wxlua.wxlua_typename(wxlua.wxlua_type(event)), typ_name) ! end ! table.insert(t, s) end ! return table.concat(t, ", ") end --- 99,142 ---- -- --------------------------------------------------------------------------- ! -- wxEventTypes that we don't want to initially handle -- --------------------------------------------------------------------------- ! ignoreEVTs = { ! ["wxEVT_CREATE"] = true, ! ["wxEVT_ENTER_WINDOW"] = true, ! ["wxEVT_ERASE_BACKGROUND"] = true, ! ["wxEVT_IDLE"] = true, ! ["wxEVT_LEAVE_WINDOW"] = true, ! ["wxEVT_MOTION"] = true, ! ["wxEVT_PAINT"] = true, ! ["wxEVT_SET_CURSOR"] = true, ! ["wxEVT_SHOW"] = true, ! ["wxEVT_SIZE"] = true, ! ["wxEVT_TIMER"] = true, ! ["wxEVT_UPDATE_UI"] = true, ! } ! -- --------------------------------------------------------------------------- ! -- All wxEvent derived classes and their GetXXX functions (none modify event) ! -- --------------------------------------------------------------------------- ! function OnSplitterEvent(event) ! -- asserts if these are called inappropriately ! -- {"GetSashPosition", "GetX", "GetY", "GetWindowBeingRemoved"} ! local typ = event:GetEventType() ! local s = "" ! if (typ == wx.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING) or (typ == wx.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED) then ! s = s.."GetSashPosition="..tostring(event:GetSashPosition()) ! end ! if (typ == wx.wxEVT_COMMAND_SPLITTER_DOUBLECLICKED) then ! s = s.." GetX="..tostring(event:GetX()) ! s = s.." GetY="..tostring(event:GetY()) ! end ! if (typ == wx.wxEVT_COMMAND_SPLITTER_UNSPLIT) then ! s = s.." GetWindowBeingRemoved="..tostring(event:GetWindowBeingRemoved()) end ! return s end *************** *** 196,200 **** ["wxSocketEvent"] = nil, ["wxSpinEvent"] = {"GetPosition"}, ! ["wxSplitterEvent"] = {}, --FIXME "GetSashPosition"}, -- , "GetX", "GetY", "GetWindowBeingRemoved" asserts if these are called inappropriately ["wxSysColourChangedEvent"] = {}, ["wxTaskBarIconEvent"] = {}, --- 199,203 ---- ["wxSocketEvent"] = nil, ["wxSpinEvent"] = {"GetPosition"}, ! ["wxSplitterEvent"] = OnSplitterEvent, -- {"GetSashPosition", "GetX", "GetY", "GetWindowBeingRemoved"} asserts if these are called inappropriately ["wxSysColourChangedEvent"] = {}, ["wxTaskBarIconEvent"] = {}, *************** *** 210,228 **** -- --------------------------------------------------------------------------- ! -- Handle all wxEvents -- --------------------------------------------------------------------------- ! ignoreEVTs = { ! ["wxEVT_IDLE"] = true, ! ["wxEVT_UPDATE_UI"] = true, ! ["wxEVT_ERASE_BACKGROUND"] = true, ! ["wxEVT_PAINT"] = true, ! ["wxEVT_MOTION"] = true, ! ["wxEVT_SET_CURSOR"] = true, ! ["wxEVT_CREATE"] = true, ! ["wxEVT_SIZE"] = true, ! ["wxEVT_TIMER"] = true, ! ["wxEVT_SHOW"] = true, ! } function OnEvent(event) --- 213,275 ---- -- --------------------------------------------------------------------------- ! -- Format the values you can get from different event types -- --------------------------------------------------------------------------- ! function FuncsToString(event, funcTable) ! local t = {} ! ! for n = 1, #funcTable do ! local v = event[funcTable[n]](event) -- each item is a function name ! ! local s = funcTable[n].."=" ! ! local typ = wxlua.wxlua_type(v) ! local typ_name = wxlua.wxlua_typename(typ) ! ! if typ == wxlua.WXLUAARG_String then ! s = s.."'"..tostring(v).."'" ! elseif typ == wxlua.WXLUAARG_Table then ! s = s.."("..table.concat(v, ",")..")" ! elseif typ <= 0 then -- the rest of generic lua types ! s = s..tostring(v) ! elseif typ_name == "wxPoint" then ! s = s..string.format("(%d, %d) ", v:GetX(), v:GetY()) ! elseif typ_name == "wxSize" then ! s = s..string.format("(%d, %d) ", v:GetWidth(), v:GetHeight()) ! elseif typ_name == "wxRect" then ! s = s..string.format("(%d, %d, %d, %d)", v:GetX(), v:GetY(), v:GetWidth(), v:GetHeight()) ! elseif typ_name == "wxColour" then ! s = s..v:GetAsString() ! v:delete() ! elseif typ_name == "wxFont" then ! s = s..v:GetNativeFontInfoDesc() ! v:delete() ! elseif typ_name == "wxDateTime" then ! s = s..v:Format() ! elseif typ_name == "wxTreeItemId" then ! local tree = event:GetEventObject():DynamicCast("wxTreeCtrl") ! if v:IsOk() then ! s = s..typ_name.."(tree:GetItemText='"..tree:GetItemText(v).."')" ! else ! s = s..typ_name.."!IsOk" ! end ! elseif typ_name == "wxWindow" then ! s = s..typ_name.."(GetName="..v:GetName()..")" ! else ! s = s..tostring(v) ! --v:delete() ! -- If we haven't handled it yet, we probably should ! print("Unhandled wxLua data type in FuncsToString from ", wxlua.wxlua_typename(wxlua.wxlua_type(event)), typ_name) ! end ! ! table.insert(t, s) ! end ! ! return table.concat(t, ", ") ! end ! ! -- --------------------------------------------------------------------------- ! -- Handle all wxEvents ! -- --------------------------------------------------------------------------- function OnEvent(event) *************** *** 230,234 **** local evtTypeStr = wxEVT_TableByType[event:GetEventType()].name ! -- during showdown, we nil textCtrl since events are sent and we don't want them anymore if (not textCtrl) or ignoreEVTs[evtTypeStr] then event:Skip() --- 277,288 ---- local evtTypeStr = wxEVT_TableByType[event:GetEventType()].name ! if event:GetEventType() == wx.wxEVT_PAINT then ! -- You absolutely must create a wxPaintDC for a wxEVT_PAINT in MSW ! -- to clear the region to be updated, otherwise you'll keep getting them ! local dc = wx.wxPaintDC(event:GetEventObject():DynamicCast("wxWindow")) ! dc:delete() ! end ! ! -- during shutdown, we nil textCtrl since events are sent and we don't want them anymore if (not textCtrl) or ignoreEVTs[evtTypeStr] then event:Skip() *************** *** 236,240 **** end ! print(evtClassName, wxEVT_TableByType[event:GetEventType()].name) -- try to figure out where this came from using the GetEventObject() --- 290,294 ---- end ! --print(evtClassName, wxEVT_TableByType[event:GetEventType()].name) -- try to figure out where this came from using the GetEventObject() *************** *** 249,257 **** end ! local s = string.format("%s %s(%s) GetEventObject = %s", wx.wxNow(), evtClassName, evtTypeStr, obj_str) -- Gather up all the info from the functions for the event and it's base classes while wxEvent_GetFuncs[evtClassName] do ! s = s.."\n\t"..evtClassName.." - "..FuncsToString(event, wxEvent_GetFuncs[evtClassName]) evtClassName = wxCLASS_TableByName[evtClassName].baseclassName end --- 303,315 ---- end ! local s = string.format("%s %s(%s) GetEventObject=%s", wx.wxNow(), evtClassName, evtTypeStr, obj_str) -- Gather up all the info from the functions for the event and it's base classes while wxEvent_GetFuncs[evtClassName] do ! if type(wxEvent_GetFuncs[evtClassName]) == "table" then ! s = s.."\n\t"..evtClassName.." - "..FuncsToString(event, wxEvent_GetFuncs[evtClassName]) ! else ! s = s.."\n\t"..evtClassName.." - "..wxEvent_GetFuncs[evtClassName](event) ! end evtClassName = wxCLASS_TableByName[evtClassName].baseclassName end *************** *** 293,301 **** end - local mainSizer = wx.wxBoxSizer(wx.wxVERTICAL) local flexSizer = wx.wxFlexGridSizer(20, 2, 5, 5) flexSizer:AddGrowableCol(1) ! local statText = nil -- not used outside of this function -- ----------------------------------------------------------------------- --- 351,358 ---- end local flexSizer = wx.wxFlexGridSizer(20, 2, 5, 5) flexSizer:AddGrowableCol(1) ! local control = nil -- not used outside of this function -- ----------------------------------------------------------------------- *************** *** 307,311 **** for i = 1, #wxEVT_Array do ! if not ignoreEVTs[wxEVT_Array[i].name] then control:Connect(wx.wxID_ANY, wxEVT_Array[i].eventType, OnEvent) end --- 364,368 ---- for i = 1, #wxEVT_Array do ! if true then --not ignoreEVTs[wxEVT_Array[i].name] then control:Connect(wx.wxID_ANY, wxEVT_Array[i].eventType, OnEvent) end *************** *** 329,333 **** -- ----------------------------------------------------------------------- ! function CreatePage(parent, num) local p = wx.wxPanel(parent, wx.wxID_ANY) local s = wx.wxBoxSizer(wx.wxVERTICAL) --- 386,390 ---- -- ----------------------------------------------------------------------- ! function CreateBookPage(parent, num) local p = wx.wxPanel(parent, wx.wxID_ANY) local s = wx.wxBoxSizer(wx.wxVERTICAL) *************** *** 348,369 **** control:SetImageList(imageList) ! control:AddPage(CreatePage(control, 1), "Page 1", true, 0) ! control:AddPage(CreatePage(control, 2), "Page 2", false, 1) ! control:AddPage(CreatePage(control, 3), "Page 3", false, 2) end -- ----------------------------------------------------------------------- ! local control = nil ! ! -- ----------------------------------------------------------------------- ! ! local e1 = wx.wxFileExists("throbber.gif") ! local e2 = wx.wxFileExists("../art/throbber.gif") ! if wx.wxAnimation and (e1 or e2) then ! local ani = wx.wxAnimation() ! if e1 then ani:LoadFile("throbber.gif") end ! if e2 then ani:LoadFile("../art/throbber.gif") end control = wx.wxAnimationCtrl(scrollWin, ID_ANIMATIONCTRL, ani, --- 405,424 ---- control:SetImageList(imageList) ! control:AddPage(CreateBookPage(control, 1), "Page 1", true, 0) ! control:AddPage(CreateBookPage(control, 2), "Page 2", false, 1) ! control:AddPage(CreateBookPage(control, 3), "Page 3", false, 2) end -- ----------------------------------------------------------------------- ! local path = nil ! local paths = {"throbber.gif", "../art/throbber.gif", "../../art/throbber.gif", "../../../art/throbber.gif"} ! for n = 1, #paths do ! if wx.wxFileExists(paths[n]) then path = paths[n]; break; end ! end ! if wx.wxAnimation and path then ! local ani = wx.wxAnimation() -- note cannot load from constuctor in GTK ! ani:LoadFile(path) control = wx.wxAnimationCtrl(scrollWin, ID_ANIMATIONCTRL, ani, *************** *** 384,390 **** -- ----------------------------------------------------------------------- ! control = wx.wxBitmapComboBox(scrollWin, ID_BITMAPCOMBOBOX, "wxBitmapComboBox!", wx.wxDefaultPosition, wx.wxDefaultSize, ! {"Item 1", "Item 2", "Item 3 text is long for default size"}, wx.wxTE_PROCESS_ENTER) -- generates event when enter is pressed control:Append("Appended w/ bitmap", bmp) --- 439,445 ---- -- ----------------------------------------------------------------------- ! control = wx.wxBitmapComboBox(scrollWin, ID_BITMAPCOMBOBOX, "wxBitmapComboBox", wx.wxDefaultPosition, wx.wxDefaultSize, ! {"Item 1", "Item 2", "Item 3 text is long to check default size"}, wx.wxTE_PROCESS_ENTER) -- generates event when enter is pressed control:Append("Appended w/ bitmap", bmp) *************** *** 452,458 **** -- ----------------------------------------------------------------------- ! control = wx.wxComboBox(scrollWin, ID_COMBOBOX, "wxComboBox!", wx.wxDefaultPosition, wx.wxDefaultSize, ! {"Item 1", "Item 2", "Item 3 text is long for default size"}, wx.wxTE_PROCESS_ENTER) -- generates event when enter is pressed control:Append("Appended item") --- 507,513 ---- -- ----------------------------------------------------------------------- ! control = wx.wxComboBox(scrollWin, ID_COMBOBOX, "wxComboBox", wx.wxDefaultPosition, wx.wxDefaultSize, ! {"Item 1", "Item 2", "Item 3 text is long to check default size"}, wx.wxTE_PROCESS_ENTER) -- generates event when enter is pressed control:Append("Appended item") *************** *** 515,519 **** -- ----------------------------------------------------------------------- ! control = wx.wxHyperlinkCtrl(scrollWin, ID_HYPERLINKCTRL, "Goto wxlua.sourceforge.net", "http://wxlua.sourceforge.net", wx.wxDefaultPosition, wx.wxDefaultSize) AddControl("wxHyperlinkCtrl", control) --- 570,575 ---- -- ----------------------------------------------------------------------- ! control = wx.wxHyperlinkCtrl(scrollWin, ID_HYPERLINKCTRL, ! "Goto wxlua.sourceforge.net", "http://wxlua.sourceforge.net", wx.wxDefaultPosition, wx.wxDefaultSize) AddControl("wxHyperlinkCtrl", control) *************** *** 541,545 **** -- ----------------------------------------------------------------------- ! -- wxListView is a wxListCtrl w/ a couple of methods added -- ----------------------------------------------------------------------- --- 597,602 ---- -- ----------------------------------------------------------------------- ! control = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxListView is a wxListCtrl with a couple of methods added") ! AddControl("wxListView", control) -- ----------------------------------------------------------------------- *************** *** 596,601 **** -- ----------------------------------------------------------------------- ! -- wxSashLayoutWindow ! -- wxSashWindow -- ----------------------------------------------------------------------- --- 653,663 ---- -- ----------------------------------------------------------------------- ! control = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxSashLayoutWindow must have a top level window as parent") ! AddControl("wxSashLayoutWindow", control) ! ! -- ----------------------------------------------------------------------- ! ! control = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxSashWindow must have a top level window as parent") ! AddControl("wxSashWindow", control) -- ----------------------------------------------------------------------- *************** *** 604,608 **** wx.wxDefaultPosition, wx.wxSize(200, -1)) control:SetScrollbar(10, 10, 100, 20) ! AddControl("wxScrollBar - range=100, thumb=10, pageSize=20", control) -- ----------------------------------------------------------------------- --- 666,670 ---- wx.wxDefaultPosition, wx.wxSize(200, -1)) control:SetScrollbar(10, 10, 100, 20) ! AddControl("wxScrollBar\n range=100\n thumb=10\n pageSize=20", control) -- ----------------------------------------------------------------------- *************** *** 613,617 **** control:SetBackgroundColour(wx.wxRED) wx.wxButton(control, wx.wxID_ANY, "Child button of wxScrolledWindow", wx.wxPoint(50, 50)) ! AddControl("wxScrolledWindow - pixelsPerUnit=10, noUnits=100", control) flexSizer:SetItemMinSize(control, 200, 200) --- 675,679 ---- control:SetBackgroundColour(wx.wxRED) wx.wxButton(control, wx.wxID_ANY, "Child button of wxScrolledWindow", wx.wxPoint(50, 50)) ! AddControl("wxScrolledWindow\n pixelsPerUnit=10\n noUnits=100", control) flexSizer:SetItemMinSize(control, 200, 200) *************** *** 644,653 **** control = wx.wxSplitterWindow(p, ID_SPLITTERWINDOW, wx.wxDefaultPosition, wx.wxSize(300, 200)) ! control:SplitVertically(wx.wxWindow(control, wx.wxID_ANY, wx.wxDefaultPosition), ! wx.wxWindow(control, wx.wxID_ANY, wx.wxDefaultPosition), 100) - control:GetWindow1():SetBackgroundColour(wx.wxRED) - control:GetWindow2():SetBackgroundColour(wx.wxBLUE) - s:SetMinSize(300, 200) p:SetSizer(s) --- 706,712 ---- control = wx.wxSplitterWindow(p, ID_SPLITTERWINDOW, wx.wxDefaultPosition, wx.wxSize(300, 200)) ! control:SplitVertically(CreateBookPage(control, 1), ! CreateBookPage(control, 2), 100) s:SetMinSize(300, 200) p:SetSizer(s) *************** *** 693,698 **** control = wx.wxToolBar(scrollWin, ID_TOOLBAR, wx.wxDefaultPosition, wx.wxDefaultSize) ! control:AddTool(wx.wxID_ANY, "A tool", bmp, "Help for a tool", wx.wxITEM_NORMAL) ! control:AddCheckTool(wx.wxID_ANY, "A check tool", bmp, wx.wxNullBitmap, "Short help for checktool", "Long help for checktool") AddControl("wxToolBar", control) --- 752,760 ---- control = wx.wxToolBar(scrollWin, ID_TOOLBAR, wx.wxDefaultPosition, wx.wxDefaultSize) ! control:AddTool(wx.wxID_ANY, "A tool 1", bmp, "Help for a tool 1", wx.wxITEM_NORMAL) ! control:AddTool(wx.wxID_ANY, "A tool 2", bmp, "Help for a tool 2", wx.wxITEM_NORMAL) ! control:AddSeparator() ! control:AddCheckTool(wx.wxID_ANY, "A check tool 1", bmp, wx.wxNullBitmap, "Short help for checktool 1", "Long help for checktool ") ! control:AddCheckTool(wx.wxID_ANY, "A check tool 2", bmp, wx.wxNullBitmap, "Short help for checktool 2", "Long help for checktool 2") AddControl("wxToolBar", control) *************** *** 710,714 **** SetupBook(control) -- Now add special pages for the treebook ! control:AddSubPage(CreatePage(control, 4), "Subpage 1", false, 3) AddControl("wxTreebook", control) --- 772,776 ---- SetupBook(control) -- Now add special pages for the treebook ! control:AddSubPage(CreateBookPage(control, 4), "Subpage 1", false, 3) AddControl("wxTreebook", control) *************** *** 739,745 **** -- ----------------------------------------------------------------------- ! mainSizer:Add(flexSizer, 1, wx.wxEXPAND) ! scrollWin:SetSizer(mainSizer) ! mainSizer:Fit(scrollWin) return scrollWin --- 801,806 ---- -- ----------------------------------------------------------------------- ! scrollWin:SetSizer(flexSizer) ! flexSizer:Fit(scrollWin) return scrollWin *************** *** 788,791 **** --- 849,853 ---- function (event) wx.wxMessageBox('This is the "About" dialog of the Controls wxLua sample.\n'.. + 'Check or uncheck events you want shown.\n'.. wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", *************** *** 799,818 **** splitter:SetSashGravity(.8) - splitter2 = wx.wxSplitterWindow(splitter, wx.wxID_ANY) splitter2:SetMinimumPaneSize(50) -- don't let it unsplit splitter2:SetSashGravity(.1) ! eventCheckListBox = wx.wxCheckListBox(splitter2, wx.wxID_ANY, ! wx.wxDefaultPosition, wx.wxDefaultSize, ! wxEVT_List, ! wx.wxLB_EXTENDED) controlsWin = CreateControlsWindow(splitter2) textCtrl = wx.wxTextCtrl(splitter, wx.wxID_ANY, "", wx.wxDefaultPosition, wx.wxDefaultSize, ! wx.wxTE_READONLY+wx.wxTE_MULTILINE+wx.wxTE_DONTWRAP) ! splitter2:SplitVertically(eventCheckListBox, controlsWin, 300) splitter:SplitHorizontally(splitter2, textCtrl, 300) --- 861,953 ---- splitter:SetSashGravity(.8) splitter2 = wx.wxSplitterWindow(splitter, wx.wxID_ANY) splitter2:SetMinimumPaneSize(50) -- don't let it unsplit splitter2:SetSashGravity(.1) ! -- ----------------------------------------------------------------------- ! eventListCtrl = wx.wxListCtrl(splitter2, wx.wxID_ANY, ! wx.wxDefaultPosition, wx.wxDefaultSize, ! wx.wxLC_REPORT) ! eventListCtrl:SetImageList(listImageList, wx.wxIMAGE_LIST_SMALL) ! eventListCtrl:InsertColumn(0, "wxEvent Class") ! eventListCtrl:InsertColumn(1, "wxEventType") ! ! local li = 0 ! local col0_width = 200 ! local col1_width = 300 ! for n = 1, #wxEVT_List do ! if ignoreEVTs[wxEVT_List[n][2]] then ! li = eventListCtrl:InsertItem(li, wxEVT_List[n][1], 0) ! else ! li = eventListCtrl:InsertItem(li, wxEVT_List[n][1], 1) ! end ! eventListCtrl:SetItem(li, 1, wxEVT_List[n][2]) ! ! local w = eventListCtrl:GetTextExtent(wxEVT_List[n][1]) ! if w > col0_width + 16 then w = col0_width + 16 end ! local w = eventListCtrl:GetTextExtent(wxEVT_List[n][2]) ! if w > col1_width + 16 then w = col1_width + 16 end ! end ! eventListCtrl:SetColumnWidth(0, col0_width) ! eventListCtrl:SetColumnWidth(1, col1_width) ! function OnEventListCtrl(event) ! event:Skip(false) ! local ignored_count = 0 ! local sel = {} ! ! for n = 1, eventListCtrl:GetItemCount() do ! local s = eventListCtrl:GetItemState(n-1, wx.wxLIST_STATE_SELECTED) ! if s ~= 0 then ! ! local litem = wx.wxListItem() ! litem:SetId(n-1) ! litem:SetMask(wx.wxLIST_MASK_IMAGE) ! eventListCtrl:GetItem(litem) ! if litem:GetImage() == 0 then ! ignored_count = ignored_count + 1 ! end ! ! litem:SetMask(wx.wxLIST_MASK_TEXT) ! litem:SetColumn(1) ! eventListCtrl:GetItem(litem) ! table.insert(sel, {n-1, litem:GetText()}) ! end ! end ! ! local img = 0 ! if (#sel) < 2*ignored_count then img = 1 end ! ! for n = 1, #sel do ! eventListCtrl:SetItemImage(sel[n][1], img) ! print(sel[n][2]) ! if img == 0 then ! ignoreEVTs[sel[n][2]] = true ! else ! ignoreEVTs[sel[n][2]] = nil ! end ! end ! end ! ! eventListCtrl:Connect(wx.wxEVT_COMMAND_LIST_KEY_DOWN, ! function(event) ! if event:GetKeyCode() == wx.WXK_SPACE then ! OnEventListCtrl(event) ! end ! end) ! eventListCtrl:Connect(wx.wxEVT_COMMAND_LIST_ITEM_ACTIVATED, OnEventListCtrl) ! ! -- ----------------------------------------------------------------------- ! controlsWin = CreateControlsWindow(splitter2) + -- ----------------------------------------------------------------------- + textCtrl = wx.wxTextCtrl(splitter, wx.wxID_ANY, "", wx.wxDefaultPosition, wx.wxDefaultSize, ! wx.wxTE_MULTILINE+wx.wxTE_DONTWRAP) ! -- ----------------------------------------------------------------------- ! ! splitter2:SplitVertically(eventListCtrl, controlsWin, 300) splitter:SplitHorizontally(splitter2, textCtrl, 300) |
|
From: John L. <jr...@us...> - 2007-06-22 03:20:32
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23505/wxLua/modules/wxbind/src Modified Files: controls.cpp wx_bind.cpp Log Message: Fix wxEVT_CONTEXT_MENU in bindings finish off the controls.wx.lua sample Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** wx_bind.cpp 21 Jun 2007 22:02:57 -0000 1.116 --- wx_bind.cpp 22 Jun 2007 03:20:25 -0000 1.117 *************** *** 277,281 **** { "wxEVT_CONTEXT_MENU", &wxEVT_CONTEXT_MENU, &s_wxluatag_wxContextMenuEvent }, - { "wxEVT_CONTEXT_MENU", &wxEVT_CONTEXT_MENU, &s_wxluatag_wxHelpEvent }, { "wxEVT_CREATE", &wxEVT_CREATE, &s_wxluatag_wxWindowCreateEvent }, --- 277,280 ---- Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** controls.cpp 18 Jun 2007 21:40:37 -0000 1.71 --- controls.cpp 22 Jun 2007 03:20:24 -0000 1.72 *************** *** 8297,8301 **** static int LUACALL wxLua_wxSpinButton_Create(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxSpinButton_Create[1] = {{ wxLua_wxSpinButton_Create, WXLUAMETHOD_METHOD, 2, 7, s_wxluatagArray_wxLua_wxSpinButton_Create }}; ! // bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton") static int LUACALL wxLua_wxSpinButton_Create(lua_State *L) { --- 8297,8301 ---- static int LUACALL wxLua_wxSpinButton_Create(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxSpinButton_Create[1] = {{ wxLua_wxSpinButton_Create, WXLUAMETHOD_METHOD, 2, 7, s_wxluatagArray_wxLua_wxSpinButton_Create }}; ! // bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton") static int LUACALL wxLua_wxSpinButton_Create(lua_State *L) { *************** *** 8312,8317 **** // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = -1 ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : -1); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 8312,8317 ---- // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 8423,8427 **** static int LUACALL wxLua_wxSpinButton_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxSpinButton_constructor1[1] = {{ wxLua_wxSpinButton_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 6, s_wxluatagArray_wxLua_wxSpinButton_constructor1 }}; ! // wxSpinButton(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton") static int LUACALL wxLua_wxSpinButton_constructor1(lua_State *L) { --- 8423,8427 ---- static int LUACALL wxLua_wxSpinButton_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxSpinButton_constructor1[1] = {{ wxLua_wxSpinButton_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 6, s_wxluatagArray_wxLua_wxSpinButton_constructor1 }}; ! // wxSpinButton(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton") static int LUACALL wxLua_wxSpinButton_constructor1(lua_State *L) { *************** *** 8439,8444 **** // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = -1 ! wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : -1); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); --- 8439,8444 ---- // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : wxID_ANY); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); |
|
From: John L. <jr...@us...> - 2007-06-21 22:03:02
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30945/wxLua/samples Modified Files: controls.wx.lua Log Message: Add the rest of the controls to the sample Index: controls.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** controls.wx.lua 21 Jun 2007 03:58:24 -0000 1.3 --- controls.wx.lua 21 Jun 2007 22:02:58 -0000 1.4 *************** *** 13,17 **** textCtrl = nil ! bmp = wx.wxArtProvider.GetBitmap(wx.wxART_INFORMATION) ID_PARENT_SCROLLEDWINDOW = 1000 --- 13,24 ---- textCtrl = nil ! bmp = wx.wxArtProvider.GetBitmap(wx.wxART_INFORMATION, wx.wxART_TOOLBAR, wx.wxSize(16, 16)) ! imageList = wx.wxImageList(16, 16) [...1146 lines suppressed...] *** 696,702 **** splitter:SetSashGravity(.8) - textCtrl = wx.wxTextCtrl(splitter, wx.wxID_ANY, "", - wx.wxDefaultPosition, wx.wxDefaultSize, - wx.wxTE_READONLY+wx.wxTE_MULTILINE+wx.wxTE_DONTWRAP) splitter2 = wx.wxSplitterWindow(splitter, wx.wxID_ANY) --- 799,802 ---- *************** *** 710,713 **** --- 810,817 ---- controlsWin = CreateControlsWindow(splitter2) + textCtrl = wx.wxTextCtrl(splitter, wx.wxID_ANY, "", + wx.wxDefaultPosition, wx.wxDefaultSize, + wx.wxTE_READONLY+wx.wxTE_MULTILINE+wx.wxTE_DONTWRAP) + splitter2:SplitVertically(eventCheckListBox, controlsWin, 300) splitter:SplitHorizontally(splitter2, textCtrl, 300) |
|
From: John L. <jr...@us...> - 2007-06-21 22:03:02
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30945/wxLua/modules/wxbind/src Modified Files: wx_bind.cpp Log Message: Add the rest of the controls to the sample Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.115 retrieving revision 1.116 diff -C2 -d -r1.115 -r1.116 *** wx_bind.cpp 20 Jun 2007 22:57:36 -0000 1.115 --- wx_bind.cpp 21 Jun 2007 22:02:57 -0000 1.116 *************** *** 3669,3672 **** --- 3669,3676 ---- #endif // wxLUA_USE_wxArtProvider + #if wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG + { "wxDirDialogDefaultFolderStr", wxDirDialogDefaultFolderStr }, + #endif // wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG + { "wxDirSelectorPromptStr", wxDirSelectorPromptStr }, { "wxFILE_SEP_DSK", wxT(":") }, |
|
From: John L. <jr...@us...> - 2007-06-21 22:03:01
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30945/wxLua/bindings/wxwidgets Modified Files: controls.i Log Message: Add the rest of the controls to the sample Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** controls.i 18 Jun 2007 21:40:29 -0000 1.43 --- controls.i 21 Jun 2007 22:02:55 -0000 1.44 *************** *** 771,777 **** %class wxSpinButton, wxControl wxSpinButton() ! wxSpinButton(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton") ! bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton") int GetMax() const int GetMin() const --- 771,777 ---- %class wxSpinButton, wxControl wxSpinButton() ! wxSpinButton(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton") ! bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton") int GetMax() const int GetMin() const *************** *** 1273,1276 **** --- 1273,1278 ---- %endenum + %define_string wxDirDialogDefaultFolderStr + %class wxGenericDirCtrl, wxControl wxGenericDirCtrl() |
|
From: John L. <jr...@us...> - 2007-06-21 03:58:31
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15614/wxLua/samples Modified Files: controls.wx.lua Log Message: Add the rest of the events, test using the function string names to call the functions Index: controls.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** controls.wx.lua 20 Jun 2007 22:57:37 -0000 1.2 --- controls.wx.lua 21 Jun 2007 03:58:24 -0000 1.3 *************** *** 46,57 **** --- 46,60 ---- wxEVT_Table = {} wxEVT_List = {} + wxEVT_Funcs = {} wxEVT_Array = wx.wxLuaBinding_wx.GetEventArray for i = 1, #wxEVT_Array do wxEVT_Table[wxEVT_Array[i].eventType] = wxEVT_Array[i] table.insert(wxEVT_List, string.format("%s %s", wxlua.wxlua_typename(wxEVT_Array[i].class_tag), wxEVT_Array[i].name)) + wxEVT_Funcs[wxlua.wxlua_typename(wxEVT_Array[i].class_tag)] = 0 -- we'll check later end table.sort(wxEVT_List) + function wxPtStr(pt) return string.format("%d, %d", pt.x, pt.y) *************** *** 62,215 **** -- --------------------------------------------------------------------------- ! function wxEventToString(event) ! return string.format("wxEvent - GetEventType=%d='%s' GetId=%d GetSkipped=%s GetTimestamp=%d IsCommandEvent=%s ShouldPropagate=%s", ! event:GetEventType(), wxEVT_Names[event:GetEventType()], event:GetId(), tostring(event:GetSkipped()), event:GetTimestamp(), tostring(event:IsCommandEvent()), tostring(event:ShouldPropagate())) end ! function wxActivateEventToString(event) local s = string.format("wxActivateEvent - GetActive=%s", tostring(event:GetActive())) ! return s.."\n\t"..wxEventToString(event) end ! function wxBookCtrlBaseEventToString(event) local s = string.format("wxBookCtrlBaseEvent - GetOldSelection=%d GetOldSelection=%d", event:GetOldSelection(), event:GetSelection()) ! return s.."\n\t"..wxNotifyEventToString(event) end ! function wxCalculateLayoutEventToString(event) local s = string.format("wxCalculateLayoutEvent - GetFlags=%d GetRect=(%d, %d, %d, %d)", event:GetFlags(), event.GetRect():GetX(), event.GetRect():GetY(), event.GetRect():GetWidth(), event.GetRect():GetHeight()) ! return s.."\n\t"..wxEventToString(event) end ! function wxCalendarEventToString(event) local s = string.format("wxCalendarEvent - GetWeekDay=%d", event:GetWeekDay()) ! return s.."\n\t"..wxDateEventToString(event) end ! function wxChildFocusEventEventToString(event) local s = string.format("wxChildFocusEvent - GetWindow='%s'", tostring(event:GetWindow())) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxChoiceBookEventToString(event) ! local s = string.format("wxChoiceBookEvent - [nothing]") ! return s.."\n\t"..wxBookCtrlBaseEventToString(event) end ! function wxCloseEventToString(event) local s = string.format("wxCloseEvent - CanVeto=%s GetLoggingOff=%s", tostring(event:CanVeto()), tostring(event:GetLoggingOff())) ! return s.."\n\t"..wxEventToString(event) end ! function wxCollapsiblePaneEventToString(event) local s = string.format("wxCollapsiblePaneEvent - GetCollapsed=%s", tostring(event:GetCollapsed())) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxColourPickerEventEventToString(event) local c = event:GetColour() local s = string.format("wxColourPickerEvent - GetColour=(%s)", c:GetAsString()) c:delete() ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxCommandEventToString(event) local s = string.format("wxCommandEvent - GetExtraLong=%d GetInt=%d GetSelection=%d GetString='%s' IsChecked=%s IsSelection=%s", event:GetExtraLong(), event:GetInt(), event:GetSelection(), event:GetString(), tostring(event:IsChecked()), tostring(event:IsSelection())) ! return s.."\n\t"..wxEventToString(event) end ! function wxContextMenuEventEventEventToString(event) local s = string.format("wxContextMenuEvent - GetPosition=(%d, %d)", event:GetPosition().x, event:GetPosition().y) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxDateEventToString(event) local s = string.format("wxDateEvent - GetDate:Format='%s'", event:GetDate():Format()) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxDisplayChangedEventToString(event) local s = string.format("wxDisplayChangedEvent - [No values]") ! return s.."\n\t"..wxEventToString(event) end ! function wxDropfilesEventToString(event) ! local s = string.format("wxDropfilesEvent - GetNumberOfFiles=%d GetPosition=(%s) GetFiles=(%s)", event:GetNumberOfFiles(), wxPtStr(event:GetPosition()), table.concat(event.GetFiles(), ", ")) ! return s.."\n\t"..wxEventToString(event) end ! function wxEraseEventToString(event) local s = string.format("wxEraseEvent - [No values]") ! return s.."\n\t"..wxEventToString(event) end ! function wxFileDirPickerEventEventToString(event) local s = string.format("wxFileDirPickerEvent - GetPath='%s'", event:GetPath()) ! return s.."\n\t"..wxCommandEventToString(event) end ! -- FIXME missing wxFindDialogEvent ! function wxFocusEventToString(event) local s = string.format("wxFocusEvent - GetWindow='%s'", tostring(event:GetWindow())) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxFontPickerEventToString(event) local f = event:GetFont() local s = string.format("wxFontPickerEvent - GetFont='%s'", f:GetNativeFontInfoDesc()) f:delete() ! return s.."\n\t"..wxCommandEventToString(event) end ! -- FIXME missing wxGridXXX events ! function wxHelpEventToString(event) local s = string.format("wxHelpEvent - GetLink='%s' GetPosition=(%s) GetTarget='%s' GetOrigin=%d", event:GetLink(), wxPtStr(event:GetPosition()), event:GetTarget(), event:GetOrigin()) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxHyperlinkEventToString(event) local s = string.format("wxHyperlinkEvent - GetURL='%s'", event:GetURL()) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxIconizeEventToString(event) local s = string.format("wxIconizeEvent - Iconized=%s", tostring(event:Iconized())) ! return s.."\n\t"..wxEventToString(event) end ! function wxIdleEventToString(event) local s = string.format("wxIdleEvent - GetMode=%d MoreRequested=%s", event:GetMode(), tostring(event:MoreRequested())) ! return s.."\n\t"..wxEventToString(event) end ! function wxKeyEventToString(event) local s = string.format("wxKeyEvent - AltDown='%s' CmdDown='%s' ControlDown='%s' MetaDown='%s' ShiftDown='%s' HasModifiers='%s' GetModifiers=%d GetKeyCode=%d GetPosition=(%s)", tostring(event:AltDown()), tostring(event:CmdDown()), tostring(event:ControlDown()), tostring(event:MetaDown()), tostring(event:ShiftDown()), tostring(event:HasModifiers()), event:GetModifiers(), event:GetKeyCode(), wxPtStr(event:GetPosition())) ! return s.."\n\t"..wxEventToString(event) end ! function wxNotifyEventToString(event) local s = string.format("wxNotifyEvent - IsAllowed=%s", tostring(event:IsAllowed())) ! return s.."\n\t"..wxCommandEventToString(event) end -- --------------------------------------------------------------------------- -- Handle all wxCommandEvents -- --------------------------------------------------------------------------- ! wxEVT_Funcs = { ! ["wxEvent"] = wxEventToString, ! ["wxCommandEvent"] = wxCommandEventToString, ! ["wxNotifyEvent"] = wxNotifyEventToString, ! ["wxDateEvent"] = wxDateEventToString, ! ["wxCalendarEvent"] = wxCalendarEventToString, ! ["wxBookCtrlBaseEvent"] = wxBookCtrlBaseEventToString, ! ["wxChoiceBookEvent"] = wxChoiceBookEventToString, ! ["wxCollapsiblePaneEvent"] = wxCollapsiblePaneEventToString, ! ["wxHyperlinkEvent"] = wxHyperlinkEventToString, ! } ignoreEVTs = { ["wxEVT_IDLE"] = true, --- 65,420 ---- -- --------------------------------------------------------------------------- ! function FuncsToString(event, funcTable) ! local t = {} ! ! for n = 1, #funcTable do ! local v = event[funcTable[n]](event) ! ! local s = funcTable[n].."=" ! ! local typ = wxlua.wxlua_type(v) ! local typ_name = wxlua.wxlua_typename(typ) ! ! if typ <= 0 then ! s = s..tostring(v) ! elseif typ_name == "wxPoint" then ! s = s..string.format("(%d, %d) ", t:GetX(), t:GetY()) ! elseif typ_name == "wxColour" then ! s = s..v:GetAsString() ! v:delete() ! else ! s = s..tostring(v) ! v:delete() ! print("Unhandled wxLua data type in FuncsToString", typ_name) ! end ! ! table.insert(t, s) ! end ! ! return table.concat(t, ", ") end ! function wxEvent_ToString(event) ! return "wxEvent - "..FuncsToString(event, {"GetEventType", "GetId", "GetSkipped", "GetTimestamp", "IsCommandEvent", "ShouldPropagate"}) ! end ! ! function wxActivateEvent_ToString(event) local s = string.format("wxActivateEvent - GetActive=%s", tostring(event:GetActive())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxBookCtrlBaseEvent_ToString(event) local s = string.format("wxBookCtrlBaseEvent - GetOldSelection=%d GetOldSelection=%d", event:GetOldSelection(), event:GetSelection()) ! return s.."\n\t"..wxNotifyEvent_ToString(event) end ! function wxCalculateLayoutEvent_ToString(event) local s = string.format("wxCalculateLayoutEvent - GetFlags=%d GetRect=(%d, %d, %d, %d)", event:GetFlags(), event.GetRect():GetX(), event.GetRect():GetY(), event.GetRect():GetWidth(), event.GetRect():GetHeight()) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxCalendarEvent_ToString(event) local s = string.format("wxCalendarEvent - GetWeekDay=%d", event:GetWeekDay()) ! return s.."\n\t"..wxDateEvent_ToString(event) end ! function wxChildFocusEvent_ToString(event) local s = string.format("wxChildFocusEvent - GetWindow='%s'", tostring(event:GetWindow())) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxChoicebookEvent_ToString(event) ! local s = string.format("wxChoicebookEvent - [nothing]") ! return s.."\n\t"..wxBookCtrlBaseEvent_ToString(event) end ! function wxClipboardTextEvent_ToString(event) ! local s = string.format("wxClipboardTextEvent - [nothing]") ! return s.."\n\t"..wxCommandEvent_ToString(event) ! end ! ! function wxCloseEvent_ToString(event) local s = string.format("wxCloseEvent - CanVeto=%s GetLoggingOff=%s", tostring(event:CanVeto()), tostring(event:GetLoggingOff())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxCollapsiblePaneEvent_ToString(event) local s = string.format("wxCollapsiblePaneEvent - GetCollapsed=%s", tostring(event:GetCollapsed())) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxColourPickerEvent_ToString(event) local c = event:GetColour() local s = string.format("wxColourPickerEvent - GetColour=(%s)", c:GetAsString()) c:delete() ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxCommandEvent_ToString(event) local s = string.format("wxCommandEvent - GetExtraLong=%d GetInt=%d GetSelection=%d GetString='%s' IsChecked=%s IsSelection=%s", event:GetExtraLong(), event:GetInt(), event:GetSelection(), event:GetString(), tostring(event:IsChecked()), tostring(event:IsSelection())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxContextMenuEvent_ToString(event) local s = string.format("wxContextMenuEvent - GetPosition=(%d, %d)", event:GetPosition().x, event:GetPosition().y) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxDateEvent_ToString(event) local s = string.format("wxDateEvent - GetDate:Format='%s'", event:GetDate():Format()) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxDisplayChangedEvent_ToString(event) local s = string.format("wxDisplayChangedEvent - [No values]") ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxDropFilesEvent_ToString(event) ! local s = string.format("wxDropFilesEvent - GetNumberOfFiles=%d GetPosition=(%s) GetFiles=(%s)", event:GetNumberOfFiles(), wxPtStr(event:GetPosition()), table.concat(event.GetFiles(), ", ")) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxEraseEvent_ToString(event) local s = string.format("wxEraseEvent - [No values]") ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxFileDirPickerEvent_ToString(event) local s = string.format("wxFileDirPickerEvent - GetPath='%s'", event:GetPath()) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxFindDialogEvent_ToString(event) ! local s = string.format("wxFindDialogEvent - GetFlags=%d GetFindString='%s' GetReplaceString='%s' GetDialog='%s'", event:GetFlags(), event:GetFindString(), event:GetReplaceString(), tostring(event:GetReplaceString())) ! return s.."\n\t"..wxCommandEvent_ToString(event) ! end ! function wxFocusEvent_ToString(event) local s = string.format("wxFocusEvent - GetWindow='%s'", tostring(event:GetWindow())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxFontPickerEvent_ToString(event) local f = event:GetFont() local s = string.format("wxFontPickerEvent - GetFont='%s'", f:GetNativeFontInfoDesc()) f:delete() ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxGridEditorCreatedEvent_ToString(event) ! local s = string.format("wxGridEditorCreatedEvent - GetRow=%d GetCol=%d GetControl='%s'", event:GetRow(), event:GetCol(), tostring(event:GetControl())) ! return s.."\n\t"..wxCommandEvent_ToString(event) ! end ! function wxGridEvent_ToString(event) ! local s = string.format("wxGridEvent - GetRow=%d GetCol=%d GetPosition=('%s'), Selecting=%s ControlDown=%s MetaDown=%s ShiftDown=%s AltDown=%s", ! event:GetRow(), event:GetCol(), wxPtStr(event:GetPosition()), tostring(event:Selecting()), tostring(event:ControlDown()), tostring(event:MetaDown()), tostring(event:ShiftDown()), tostring(event:AltDown())) ! return s.."\n\t"..wxNotifyEvent_ToString(event) ! end ! function wxGridRangeSelectEvent_ToString(event) ! local s = string.format("wxGridRangeSelectEvent - GetTopRow=%d GetBottomRow=%d GetLeftCol=%d GetRightCol=%d Selecting=%s ControlDown=%s MetaDown=%s ShiftDown=%s AltDown=%s", ! event:GetTopRow(), event:GetBottomRow(), event:GetLeftCol(), event:GetRightCol(), tostring(event:Selecting()), tostring(event:ControlDown()), tostring(event:MetaDown()), tostring(event:ShiftDown()), tostring(event:AltDown())) ! return s.."\n\t"..wxNotifyEvent_ToString(event) ! end ! function wxGridSizeEvent_ToString(event) ! local s = string.format("wxGridSizeEvent - GetRowOrCol=%d GetPosition=('%s'), ControlDown=%s MetaDown=%s ShiftDown=%s AltDown=%s", ! event:GetRowOrCol(), wxPtStr(event:GetPosition()), tostring(event:ControlDown()), tostring(event:MetaDown()), tostring(event:ShiftDown()), tostring(event:AltDown())) ! return s.."\n\t"..wxNotifyEvent_ToString(event) ! end ! function wxHelpEvent_ToString(event) local s = string.format("wxHelpEvent - GetLink='%s' GetPosition=(%s) GetTarget='%s' GetOrigin=%d", event:GetLink(), wxPtStr(event:GetPosition()), event:GetTarget(), event:GetOrigin()) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxHyperlinkEvent_ToString(event) local s = string.format("wxHyperlinkEvent - GetURL='%s'", event:GetURL()) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxIconizeEvent_ToString(event) local s = string.format("wxIconizeEvent - Iconized=%s", tostring(event:Iconized())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxIdleEvent_ToString(event) local s = string.format("wxIdleEvent - GetMode=%d MoreRequested=%s", event:GetMode(), tostring(event:MoreRequested())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxInitDialogEvent_ToString(event) ! local s = string.format("wxInitDialogEvent - [No values]") ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! -- wxJoystickEvent ! ! function wxKeyEvent_ToString(event) local s = string.format("wxKeyEvent - AltDown='%s' CmdDown='%s' ControlDown='%s' MetaDown='%s' ShiftDown='%s' HasModifiers='%s' GetModifiers=%d GetKeyCode=%d GetPosition=(%s)", tostring(event:AltDown()), tostring(event:CmdDown()), tostring(event:ControlDown()), tostring(event:MetaDown()), tostring(event:ShiftDown()), tostring(event:HasModifiers()), event:GetModifiers(), event:GetKeyCode(), wxPtStr(event:GetPosition())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxListbookEvent_ToString(event) ! local s = string.format("wxListbookEvent - [No values]") ! return s.."\n\t"..wxBookCtrlBaseEvent(event) ! end ! ! function wxListEvent_ToString(event) ! local s = string.format("wxListEvent - GetCacheFrom=%d GetCacheTo=%d GetKeyCode=%d GetIndex=%d GetColumn=%d GetPoint=(%s) GetLabel='%s' GetText='%s' GetImage=%d GetData=%d GetMask=%d GetItem=%s IsEditCancelled=%s", ! event:GetCacheFrom(), event:GetCacheTo(), event:GetKeyCode(), event:GetIndex(), event:GetColumn(), wxPtStr(event:GetPoint()), event:GetLabel(), event:GetText(), event:GetImage(), event:GetData(), event:GetMask(), tostring(event:GetItem()), tostring(event:IsEditCancelled())) ! return s.."\n\t"..wxNotifyEvent(event) ! end ! ! -- wxLuaHtmlWinTagEvent ! ! function wxMaximizeEvent_ToString(event) ! local s = string.format("wxMaximizeEvent - [No values]") ! return s.."\n\t"..wxEvent(event) ! end ! ! function wxMenuEvent_ToString(event) ! local s = string.format("wxMenuEvent - GetMenuId=%d IsPopup=%d GetMenu=%s", event:GetMenuId(), tostring(event:IsPopup()), tostring(event:GetMenu())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! function wxMouseCaptureChangedEvent_ToString(event) ! local s = string.format("wxMouseCaptureChangedEvent - GetCapturedWindow=%s", tostring(event:GetCapturedWindow())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! function wxMouseCaptureLostEvent_ToString(event) ! local s = string.format("wxMouseCaptureLostEvent - [No values]") ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! function wxMouseEvent_ToString(event) ! local s = string.format("wxMouseEvent - GetPosition=(%s) AltDown=%s ButtonDClick=%s ButtonDown=%s ButtonUp=%s CmdDown=%s ControlDown=%s Dragging=%s Entering=%s", ! wxPtStr(event:GetPosition()), tostring(event:AltDown()), tostring(event:ButtonDClick()), tostring(event:ButtonDown()), tostring(event:ButtonUp()), tostring(event:CmdDown()), tostring(event:ControlDown()), tostring(event:Dragging()), tostring(event:Entering())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! function wxMoveEvent_ToString(event) ! local s = string.format("wxMoveEvent - GetPosition=(%s)", wxPtStr(event:GetPosition())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! function wxNavigationKeyEvent_ToString(event) ! local s = string.format("wxNavigationKeyEvent - GetDirection=%s IsWindowChange=%s IsFromTab=%s GetCurrentFocus=%s", ! tostring(event:GetDirection()), tostring(event:IsWindowChange()), tostring(event:IsFromTab()), tostring(event:GetCurrentFocus())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! function wxNotebookEvent_ToString(event) ! local s = string.format("wxNotebookEvent [No values]") ! return s.."\n\t"..wxBookCtrlBaseEvent_ToString(event) ! end ! ! function wxNotifyEvent_ToString(event) local s = string.format("wxNotifyEvent - IsAllowed=%s", tostring(event:IsAllowed())) ! return s.."\n\t"..wxCommandEvent_ToString(event) ! end ! ! function wxPaintEvent_ToString(event) ! local s = string.format("wxPaintEvent [No values]") ! return s.."\n\t"..wxEvent_ToString(event) ! end ! function wxPaletteChangedEvent_ToString(event) ! local s = string.format("wxPaletteChangedEvent - GetChangedWindow=%s", tostring(event:GetChangedWindow())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! -- wxProcessEvent ! -- wxQueryLayoutInfoEvent ! -- wxQueryNewPaletteEvent ! -- wxSashEvent ! ! function wxScrollEvent_ToString(event) ! local s = string.format("wxScrollEvent - GetOrientation=%d GetPosition=%d", event:GetOrientation(), event:GetPosition()) ! return s.."\n\t"..wxCommandEvent_ToString(event) ! end ! function wxScrollWinEvent_ToString(event) ! local s = string.format("wxScrollWinEvent - GetOrientation=%d GetPosition=%d", event:GetOrientation(), event:GetPosition()) ! return s.."\n\t"..wxCommandEvent_ToString(event) ! end ! ! function wxSetCursorEvent_ToString(event) ! local s = string.format("wxSetCursorEvent - GetX=%d GetY=%d HasCursor=%s", event:GetX(), event:GetY(), tostring(event:HasCursor())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! function wxShowEvent_ToString(event) ! local s = string.format("wxShowEvent - GetShow=%s", tostring(event:GetShow())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! function wxSizeEvent_ToString(event) ! local s = string.format("wxSizeEvent - GetSize=(%s)", string.format("%d, %d", event:GetSize():GetWidth(), event:GetSize():GetHeight())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! -- wxSocketEvent ! ! function wxSpinEvent_ToString(event) ! local s = string.format("wxSpinEvent - GetPosition=%d", event:GetPosition()) ! return s.."\n\t"..wxNotifyEvent_ToString(event) ! end ! ! function wxSplitterEvent_ToString(event) ! local s = string.format("wxSplitterEvent - GetSashPosition=%d GetX=%d GetY=%d GetWindowBeingRemoved=%s", event:GetSashPosition(), event:GetX(), event:GetY(), tostring(event:GetWindowBeingRemoved())) ! return s.."\n\t"..wxNotifyEvent_ToString(event) ! end ! ! --wxSysColourChangedEvent ! --wxTaskBarIconEvent ! --wxTimerEvent ! ! function wxToolbookEvent_ToString(event) ! local s = string.format("wxToolbookEvent [No values]") ! return s.."\n\t"..wxBookCtrlBaseEvent_ToString(event) ! end ! function wxTreebookEvent_ToString(event) ! local s = string.format("wxTreebookEvent [No values]") ! return s.."\n\t"..wxBookCtrlBaseEvent_ToString(event) ! end ! function wxTreeEvent_ToString(event) ! local s = string.format("wxTreeEvent - GetKeyCode=%d GetItem=%s GetOldItem=%s GetLabel=%s GetPoint=(%s) IsEditCancelled=%s", ! event:GetKeyCode(), tostring(event:GetItem()), tostring(event:GetOldItem()), event:GetLabel(), wxPtStr(event:GetPoint()), tostring(event:IsEditCancelled())) ! return s.."\n\t"..wxBookCtrlBaseEvent_ToString(event) ! end ! ! function wxUpdateUIEvent_ToString(event) ! local s = string.format("wxUpdateUIEvent GetText='%s' GetChecked=%s GetEnabled=%s GetShown=%s GetSetChecked=%s GetSetEnabled=%s GetSetShown=%s GetSetText=%s", ! event:GetText(), tostring(event:GetChecked()), tostring(event:GetEnabled()), tostring(event:GetShown()), tostring(event:GetSetChecked()), tostring(event:GetSetEnabled()), tostring(event:GetSetShown()), tostring(event:GetSetText())) ! return s.."\n\t"..wxBookCtrlBaseEvent_ToString(event) end + --[[ + wxWindowCreateEvent + wxWindowDestroyEvent + wxWizardEvent + ]] + -- --------------------------------------------------------------------------- -- Handle all wxCommandEvents -- --------------------------------------------------------------------------- ! do ! for k, v in pairs(_G) do ! if string.find(k, "Event_ToString", 1, 1) then ! local s = string.sub(k, 1, string.find(k, "_", 1, 1)-1) ! if wxEVT_Funcs[s] == 0 then ! wxEVT_Funcs[s] = v ! else ! --For debugging, these events don't have a wxEVT_XXX, wxEvent, wxNotifyEvent, wxBookCtrlBaseEvent ! --print("Oops! Missing a function!", k, v, s) ! end ! end ! end ! ! -- For debugging, these are missing event handlers ! --for k, v in pairs(wxEVT_Funcs) do if v == 0 then print("No handler for the event ", k) end end ! ! end ! ignoreEVTs = { ["wxEVT_IDLE"] = true, *************** *** 237,246 **** end if wxEVT_Funcs[evtClassName] then str = wxEVT_Funcs[evtClassName](event) end - print(evtClassName, wxEVT_Table[event:GetEventType()].name) - local obj_str = "event:GetEventObject()=NULL" if event:GetEventObject() then --- 442,451 ---- end + print(evtClassName, wxEVT_Table[event:GetEventType()].name) + if wxEVT_Funcs[evtClassName] then str = wxEVT_Funcs[evtClassName](event) end local obj_str = "event:GetEventObject()=NULL" if event:GetEventObject() then *************** *** 253,257 **** end ! local s = string.format("%s From: %s Sent - "..evtClassName.." \n\t%s\n\n", wx.wxNow(), obj_str, str) if textCtrl then textCtrl:AppendText(s) --- 458,462 ---- end ! local s = string.format("%s %s(%s) From: %s\n\t%s\n\n", wx.wxNow(), evtClassName, evtTypeStr, obj_str, str) if textCtrl then textCtrl:AppendText(s) *************** *** 455,458 **** --- 660,665 ---- wx.wxDEFAULT_FRAME_STYLE ) -- use default frame styles + frame:Connect(wx.wxEVT_CLOSE_WINDOW, function(event) event:Skip(); textCtrl = nil end) + local fileMenu = wx.wxMenu() fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program") |
|
From: John L. <jr...@us...> - 2007-06-20 22:58:11
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31187/wxLua/docs Modified Files: wxluaref.html Log Message: Fix wxAnimationCtrl condition add more controls to controls.wx.lua sample and show events for everything Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wxluaref.html 19 Jun 2007 15:20:29 -0000 1.30 --- wxluaref.html 20 Jun 2007 22:57:34 -0000 1.31 *************** *** 15,3265 **** <tr> <td><a href="#wxANIHandler">wxANIHandler</a> ! <td> ! <td align="center">X <td> <tr> <td><a href="#wxAboutDialogInfo">wxAboutDialogInfo</a> ! <td align="center">X ! <td align="center">X <td> [...6620 lines suppressed...] <a href="#wxCollapsiblePaneEvent">wxCollapsiblePaneEvent</a>()<br> --- 18899,18903 ---- <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxCollapsiblePaneEvent">wxCollapsiblePaneEvent</a>, <a href="#wxCommandEvent">wxCommandEvent</a></font></b> <blockquote> ! <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_COLLPANE_CHANGED <font color=#009900>// EVT_COLLAPSIBLEPANE_CHANGED(id, fn)</font></font><br> <br> <a href="#wxCollapsiblePaneEvent">wxCollapsiblePaneEvent</a>()<br> *************** *** 18900,18904 **** </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> ! <i>%endif</i> <font color=#009900>// wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE</font><br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> --- 18908,18912 ---- </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> ! <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i> && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE</font><br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> |
|
From: John L. <jr...@us...> - 2007-06-20 22:58:11
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31187/wxLua/bindings/wxwidgets Modified Files: gdi.i wx_datatypes.lua Log Message: Fix wxAnimationCtrl condition add more controls to controls.wx.lua sample and show events for everything Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** wx_datatypes.lua 19 Jun 2007 22:26:46 -0000 1.75 --- wx_datatypes.lua 20 Jun 2007 22:57:34 -0000 1.76 *************** *** 240,244 **** wxAnimation = { BaseClass = "wxGDIObject", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL", DefType = "class", IsNumber = false, --- 240,244 ---- wxAnimation = { BaseClass = "wxGDIObject", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL", DefType = "class", IsNumber = false, *************** *** 247,251 **** wxAnimationCtrl = { BaseClass = "wxControl", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL", DefType = "class", IsNumber = false, --- 247,251 ---- wxAnimationCtrl = { BaseClass = "wxControl", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL", DefType = "class", IsNumber = false, *************** *** 253,257 **** }, wxAnimationType = { ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL", DefType = "enum", IsNumber = true, --- 253,257 ---- }, wxAnimationType = { ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL", DefType = "enum", IsNumber = true, *************** *** 4000,4004 **** WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", wxHAS_POWER_EVENTS = "defined(wxHAS_POWER_EVENTS)", - wxLUA_USE_Animation = "wxLUA_USE_Animation", wxLUA_USE_FL = "wxLUA_USE_FL", wxLUA_USE_Geometry = "wxLUA_USE_Geometry", --- 4000,4003 ---- *************** *** 4006,4009 **** --- 4005,4009 ---- wxLUA_USE_wxAboutDialog = "wxLUA_USE_wxAboutDialog", wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable", + wxLUA_USE_wxAnimation = "wxLUA_USE_wxAnimation", wxLUA_USE_wxApp = "wxLUA_USE_wxApp", wxLUA_USE_wxArrayInt = "wxLUA_USE_wxArrayInt", Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** gdi.i 19 Jun 2007 22:26:46 -0000 1.56 --- gdi.i 20 Jun 2007 22:57:34 -0000 1.57 *************** *** 1662,1666 **** // wxAnimation ! %if %wxchkver_2_8 && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL %include "wx/animate.h" --- 1662,1666 ---- // wxAnimation ! %if %wxchkver_2_8 && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL %include "wx/animate.h" *************** *** 1677,1681 **** wxAnimation() wxAnimation(const wxAnimation& anim) ! wxAnimation(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY) virtual bool IsOk() const --- 1677,1681 ---- wxAnimation() wxAnimation(const wxAnimation& anim) ! %msw wxAnimation(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY) virtual bool IsOk() const *************** *** 1714,1716 **** %endclass ! %endif // %wxchkver_2_8 && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL --- 1714,1716 ---- %endclass ! %endif // %wxchkver_2_8 && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL |
|
From: John L. <jr...@us...> - 2007-06-20 22:58:07
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31187/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Fix wxAnimationCtrl condition add more controls to controls.wx.lua sample and show events for everything Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** wxstc_datatypes.lua 19 Jun 2007 22:26:46 -0000 1.65 --- wxstc_datatypes.lua 20 Jun 2007 22:57:33 -0000 1.66 *************** *** 240,244 **** wxAnimation = { BaseClass = "wxGDIObject", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL", DefType = "class", IsNumber = false, --- 240,244 ---- wxAnimation = { BaseClass = "wxGDIObject", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL", DefType = "class", IsNumber = false, *************** *** 247,251 **** wxAnimationCtrl = { BaseClass = "wxControl", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL", DefType = "class", IsNumber = false, --- 247,251 ---- wxAnimationCtrl = { BaseClass = "wxControl", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL", DefType = "class", IsNumber = false, *************** *** 253,257 **** }, wxAnimationType = { ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL", DefType = "enum", IsNumber = true, --- 253,257 ---- }, wxAnimationType = { ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL", DefType = "enum", IsNumber = true, *************** *** 4011,4015 **** WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", wxHAS_POWER_EVENTS = "defined(wxHAS_POWER_EVENTS)", - wxLUA_USE_Animation = "wxLUA_USE_Animation", wxLUA_USE_FL = "wxLUA_USE_FL", wxLUA_USE_Geometry = "wxLUA_USE_Geometry", --- 4011,4014 ---- *************** *** 4017,4020 **** --- 4016,4020 ---- wxLUA_USE_wxAboutDialog = "wxLUA_USE_wxAboutDialog", wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable", + wxLUA_USE_wxAnimation = "wxLUA_USE_wxAnimation", wxLUA_USE_wxApp = "wxLUA_USE_wxApp", wxLUA_USE_wxArrayInt = "wxLUA_USE_wxArrayInt", |
|
From: John L. <jr...@us...> - 2007-06-20 22:58:07
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31187/wxLua/bindings Modified Files: genidocs.lua genwxbind.lua Log Message: Fix wxAnimationCtrl condition add more controls to controls.wx.lua sample and show events for everything Index: genidocs.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** genidocs.lua 17 Jun 2007 17:17:36 -0000 1.7 --- genidocs.lua 20 Jun 2007 22:57:33 -0000 1.8 *************** *** 34,37 **** --- 34,42 ---- colours.blkcomment = "888888" -- grey + colours.in_manual = "AAFFAA" -- for table showing classes + colours.in_wxlua = "AAFFAA" + colours.not_in_manual = "FFAAAA" + colours.not_in_wxlua = "FFAAAA" + -- ---------------------------------------------------------------------------- -- Dummy function that genwxbind.lua has and the XXX_rules.lua might use *************** *** 164,167 **** --- 169,173 ---- table.insert(fileTable, "<tr>") + -- link to class in html file if allClasses[cname] then table.insert(fileTable, "<td>"..MakeLink(cname)) -- optional </td> *************** *** 170,185 **** end if completeClassRefTable and completeClassRefTable[cname] then ! table.insert(fileTable, "<td align=\"center\">X") else ! table.insert(fileTable, "<td> ") end if allClasses[cname] then ! table.insert(fileTable, "<td align=\"center\">X") else ! table.insert(fileTable, "<td> ") end if msgForClassInIndex and msgForClassInIndex[cname] then table.insert(fileTable, "<td>"..msgForClassInIndex[cname]) --- 176,194 ---- end + -- in "manual" or complete list of classes if completeClassRefTable and completeClassRefTable[cname] then ! table.insert(fileTable, "<td align=\"center\" bgcolor="..colours.in_manual..">X") else ! table.insert(fileTable, "<td bgcolor="..colours.not_in_manual.."> ") end + -- wrapped by wxLua if allClasses[cname] then ! table.insert(fileTable, "<td align=\"center\" bgcolor="..colours.in_wxlua..">X") else ! table.insert(fileTable, "<td bgcolor="..colours.not_in_wxlua.."> ") end + -- note about the class if msgForClassInIndex and msgForClassInIndex[cname] then table.insert(fileTable, "<td>"..msgForClassInIndex[cname]) Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.131 retrieving revision 1.132 diff -C2 -d -r1.131 -r1.132 *** genwxbind.lua 19 Jun 2007 22:26:45 -0000 1.131 --- genwxbind.lua 20 Jun 2007 22:57:33 -0000 1.132 *************** *** 909,913 **** preprocConditionTable["wxLUA_USE_wxAboutDialog"] = "wxLUA_USE_wxAboutDialog" preprocConditionTable["wxLUA_USE_wxAcceleratorTable"] = "wxLUA_USE_wxAcceleratorTable" ! preprocConditionTable["wxLUA_USE_Animation"] = "wxLUA_USE_Animation" preprocConditionTable["wxLUA_USE_wxApp"] = "wxLUA_USE_wxApp" preprocConditionTable["wxLUA_USE_wxArrayInt"] = "wxLUA_USE_wxArrayInt" --- 909,913 ---- preprocConditionTable["wxLUA_USE_wxAboutDialog"] = "wxLUA_USE_wxAboutDialog" preprocConditionTable["wxLUA_USE_wxAcceleratorTable"] = "wxLUA_USE_wxAcceleratorTable" ! preprocConditionTable["wxLUA_USE_wxAnimation"] = "wxLUA_USE_wxAnimation" preprocConditionTable["wxLUA_USE_wxApp"] = "wxLUA_USE_wxApp" preprocConditionTable["wxLUA_USE_wxArrayInt"] = "wxLUA_USE_wxArrayInt" |
|
From: John L. <jr...@us...> - 2007-06-20 22:57:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31187/wxLua/modules/wxbind/src Modified Files: gdi.cpp wx_bind.cpp Log Message: Fix wxAnimationCtrl condition add more controls to controls.wx.lua sample and show events for everything Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** wx_bind.cpp 19 Jun 2007 22:26:49 -0000 1.114 --- wx_bind.cpp 20 Jun 2007 22:57:36 -0000 1.115 *************** *** 769,776 **** #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxAC_DEFAULT_STYLE", wxAC_DEFAULT_STYLE }, { "wxAC_NO_AUTORESIZE", wxAC_NO_AUTORESIZE }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxADJUST_MINSIZE", wxADJUST_MINSIZE }, --- 769,776 ---- #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL { "wxAC_DEFAULT_STYLE", wxAC_DEFAULT_STYLE }, { "wxAC_NO_AUTORESIZE", wxAC_NO_AUTORESIZE }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL { "wxADJUST_MINSIZE", wxADJUST_MINSIZE }, *************** *** 806,815 **** #endif // wxLUA_USE_wxDC ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxANIMATION_TYPE_ANI", wxANIMATION_TYPE_ANI }, { "wxANIMATION_TYPE_ANY", wxANIMATION_TYPE_ANY }, { "wxANIMATION_TYPE_GIF", wxANIMATION_TYPE_GIF }, { "wxANIMATION_TYPE_INVALID", wxANIMATION_TYPE_INVALID }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxARCH_32", wxARCH_32 }, --- 806,815 ---- #endif // wxLUA_USE_wxDC ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL { "wxANIMATION_TYPE_ANI", wxANIMATION_TYPE_ANI }, { "wxANIMATION_TYPE_ANY", wxANIMATION_TYPE_ANY }, { "wxANIMATION_TYPE_GIF", wxANIMATION_TYPE_GIF }, { "wxANIMATION_TYPE_INVALID", wxANIMATION_TYPE_INVALID }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL { "wxARCH_32", wxARCH_32 }, *************** *** 6704,6711 **** { "wxActivateEvent", wxActivateEvent_methods, wxActivateEvent_methodCount, CLASSINFO(wxActivateEvent), &s_wxluatag_wxActivateEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxAnimation", wxAnimation_methods, wxAnimation_methodCount, CLASSINFO(wxAnimation), &s_wxluatag_wxAnimation, "wxGDIObject", NULL ,s_wxluadefineArray_None, 0, }, { "wxAnimationCtrl", wxAnimationCtrl_methods, wxAnimationCtrl_methodCount, CLASSINFO(wxAnimationCtrl), &s_wxluatag_wxAnimationCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL #if wxLUA_USE_wxApp --- 6704,6711 ---- { "wxActivateEvent", wxActivateEvent_methods, wxActivateEvent_methodCount, CLASSINFO(wxActivateEvent), &s_wxluatag_wxActivateEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL { "wxAnimation", wxAnimation_methods, wxAnimation_methodCount, CLASSINFO(wxAnimation), &s_wxluatag_wxAnimation, "wxGDIObject", NULL ,s_wxluadefineArray_None, 0, }, { "wxAnimationCtrl", wxAnimationCtrl_methods, wxAnimationCtrl_methodCount, CLASSINFO(wxAnimationCtrl), &s_wxluatag_wxAnimationCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL #if wxLUA_USE_wxApp Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** gdi.cpp 19 Jun 2007 22:26:47 -0000 1.76 --- gdi.cpp 20 Jun 2007 22:57:36 -0000 1.77 *************** *** 14852,14856 **** ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL // --------------------------------------------------------------------------- // Bind class wxAnimation --- 14852,14856 ---- ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL // --------------------------------------------------------------------------- // Bind class wxAnimation *************** *** 14881,14885 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrame[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxAnimation_GetFrame(lua_State *L); --- 14881,14885 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrame[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxAnimation_GetFrame(lua_State *L); *************** *** 14905,14909 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrameCount[] = { &s_wxluatag_wxAnimation, NULL }; --- 14905,14909 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrameCount[] = { &s_wxluatag_wxAnimation, NULL }; *************** *** 14926,14930 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetSize[] = { &s_wxluatag_wxAnimation, NULL }; static int LUACALL wxLua_wxAnimation_GetSize(lua_State *L); --- 14926,14930 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetSize[] = { &s_wxluatag_wxAnimation, NULL }; static int LUACALL wxLua_wxAnimation_GetSize(lua_State *L); *************** *** 14948,14952 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_IsOk[] = { &s_wxluatag_wxAnimation, NULL }; --- 14948,14952 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_IsOk[] = { &s_wxluatag_wxAnimation, NULL }; *************** *** 14969,14973 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_Load[] = { &s_wxluatag_wxAnimation, &s_wxluatag_wxInputStream, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxAnimation_Load(lua_State *L); --- 14969,14973 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_Load[] = { &s_wxluatag_wxAnimation, &s_wxluatag_wxInputStream, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxAnimation_Load(lua_State *L); *************** *** 14994,14998 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_LoadFile[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; --- 14994,14998 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_LoadFile[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; *************** *** 15020,15027 **** } static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_constructor2[] = { &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxAnimation_constructor2(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxAnimation_constructor2[1] = {{ wxLua_wxAnimation_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxAnimation_constructor2 }}; ! // wxAnimation(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY) static int LUACALL wxLua_wxAnimation_constructor2(lua_State *L) { --- 15020,15029 ---- } + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_constructor2[] = { &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxAnimation_constructor2(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxAnimation_constructor2[1] = {{ wxLua_wxAnimation_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxAnimation_constructor2 }}; ! // %msw wxAnimation(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY) static int LUACALL wxLua_wxAnimation_constructor2(lua_State *L) { *************** *** 15045,15048 **** --- 15047,15052 ---- } + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_constructor1[] = { &s_wxluatag_wxAnimation, NULL }; static int LUACALL wxLua_wxAnimation_constructor1(lua_State *L); *************** *** 15087,15091 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimation_constructor_overload(lua_State *L); // function overload table --- 15091,15095 ---- ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimation_constructor_overload(lua_State *L); // function overload table *************** *** 15093,15097 **** --- 15097,15104 ---- { { wxLua_wxAnimation_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 2, s_wxluaargArray_None }, + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)) { wxLua_wxAnimation_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxAnimation_constructor2 }, + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)) { wxLua_wxAnimation_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxAnimation_constructor1 }, { wxLua_wxAnimation_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, *************** *** 15106,15110 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) // Map Lua Class Methods to C Binding Functions --- 15113,15117 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) // Map Lua Class Methods to C Binding Functions *************** *** 15112,15136 **** { "GetDelay", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetDelay, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrame", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrame, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrameCount", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrameCount, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "GetSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetSize, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "IsOk", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_IsOk, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) { "Load", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_Load, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) { "LoadFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_LoadFile, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { "wxAnimation", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAnimation_constructor_overload, s_wxluafunc_wxLua_wxAnimation_constructor_overload_count, 0 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { 0, 0, 0, 0 }, --- 15119,15143 ---- { "GetDelay", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetDelay, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrame", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrame, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrameCount", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrameCount, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "GetSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetSize, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "IsOk", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_IsOk, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) { "Load", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_Load, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) { "LoadFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_LoadFile, 1, NULL }, ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) { "wxAnimation", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAnimation_constructor_overload, s_wxluafunc_wxLua_wxAnimation_constructor_overload_count, 0 }, ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && ((defined(__WXMSW__)) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL)))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) { 0, 0, 0, 0 }, *************** *** 15139,15146 **** int wxAnimation_methodCount = sizeof(wxAnimation_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL // --------------------------------------------------------------------------- // Bind class wxAnimationCtrl --- 15146,15153 ---- int wxAnimation_methodCount = sizeof(wxAnimation_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL // --------------------------------------------------------------------------- // Bind class wxAnimationCtrl *************** *** 15150,15154 **** int s_wxluatag_wxAnimationCtrl = -1; ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Create[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_Create(lua_State *L); --- 15157,15161 ---- int s_wxluatag_wxAnimationCtrl = -1; ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Create[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_Create(lua_State *L); *************** *** 15185,15189 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetAnimation[] = { &s_wxluatag_wxAnimationCtrl, NULL }; --- 15192,15196 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetAnimation[] = { &s_wxluatag_wxAnimationCtrl, NULL }; *************** *** 15209,15213 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, NULL }; static int LUACALL wxLua_wxAnimationCtrl_GetInactiveBitmap(lua_State *L); --- 15216,15220 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, NULL }; static int LUACALL wxLua_wxAnimationCtrl_GetInactiveBitmap(lua_State *L); *************** *** 15231,15235 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_IsPlaying[] = { &s_wxluatag_wxAnimationCtrl, NULL }; --- 15238,15242 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_IsPlaying[] = { &s_wxluatag_wxAnimationCtrl, NULL }; *************** *** 15335,15339 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_SetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxBitmap, NULL }; static int LUACALL wxLua_wxAnimationCtrl_SetInactiveBitmap(lua_State *L); --- 15342,15346 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_SetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxBitmap, NULL }; static int LUACALL wxLua_wxAnimationCtrl_SetInactiveBitmap(lua_State *L); *************** *** 15353,15357 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Stop[] = { &s_wxluatag_wxAnimationCtrl, NULL }; --- 15360,15364 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Stop[] = { &s_wxluatag_wxAnimationCtrl, NULL }; *************** *** 15371,15375 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_constructor1(lua_State *L); --- 15378,15382 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_constructor1(lua_State *L); *************** *** 15407,15411 **** } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxAnimationCtrl_constructor(lua_State *L); --- 15414,15418 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxAnimationCtrl_constructor(lua_State *L); *************** *** 15430,15434 **** ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimationCtrl_LoadFile_overload(lua_State *L); // function overload table --- 15437,15441 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimationCtrl_LoadFile_overload(lua_State *L); // function overload table *************** *** 15448,15454 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimationCtrl_constructor_overload(lua_State *L); // function overload table --- 15455,15461 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimationCtrl_constructor_overload(lua_State *L); // function overload table *************** *** 15457,15463 **** { wxLua_wxAnimationCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 7, s_wxluaargArray_None }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 7, s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; --- 15464,15470 ---- { wxLua_wxAnimationCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 7, s_wxluaargArray_None }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 7, s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; *************** *** 15471,15506 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxAnimationCtrl_methods[] = { ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_Create, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "GetAnimation", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_GetAnimation, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "GetInactiveBitmap", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_GetInactiveBitmap, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "IsPlaying", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_IsPlaying, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { "LoadFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_LoadFile_overload, s_wxluafunc_wxLua_wxAnimationCtrl_LoadFile_overload_count, 0 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { "Play", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_Play, 1, NULL }, { "SetAnimation", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_SetAnimation, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "SetInactiveBitmap", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_SetInactiveBitmap, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "Stop", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_Stop, 1, NULL }, ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { "wxAnimationCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAnimationCtrl_constructor_overload, s_wxluafunc_wxLua_wxAnimationCtrl_constructor_overload_count, 0 }, ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { 0, 0, 0, 0 }, --- 15478,15513 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxAnimationCtrl_methods[] = { ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_Create, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "GetAnimation", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_GetAnimation, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "GetInactiveBitmap", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_GetInactiveBitmap, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "IsPlaying", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_IsPlaying, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) { "LoadFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_LoadFile_overload, s_wxluafunc_wxLua_wxAnimationCtrl_LoadFile_overload_count, 0 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) { "Play", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_Play, 1, NULL }, { "SetAnimation", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_SetAnimation, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "SetInactiveBitmap", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_SetInactiveBitmap, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) { "Stop", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimationCtrl_Stop, 1, NULL }, ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) { "wxAnimationCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAnimationCtrl_constructor_overload, s_wxluafunc_wxLua_wxAnimationCtrl_constructor_overload_count, 0 }, ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL) { 0, 0, 0, 0 }, *************** *** 15509,15512 **** int wxAnimationCtrl_methodCount = sizeof(wxAnimationCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL --- 15516,15519 ---- int wxAnimationCtrl_methodCount = sizeof(wxAnimationCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL |
|
From: John L. <jr...@us...> - 2007-06-20 22:57:41
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31187/wxLua/samples Modified Files: controls.wx.lua Log Message: Fix wxAnimationCtrl condition add more controls to controls.wx.lua sample and show events for everything Index: controls.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** controls.wx.lua 19 Jun 2007 22:26:50 -0000 1.1 --- controls.wx.lua 20 Jun 2007 22:57:37 -0000 1.2 *************** *** 5,9 **** -- Modified by: -- Created: 6/19/2007 ! -- RCS-ID: -- Copyright: (c) 2007 John Labenski -- Licence: wxWidgets licence --- 5,9 ---- -- Modified by: -- Created: 6/19/2007 ! -- RCS-ID: -- Copyright: (c) 2007 John Labenski -- Licence: wxWidgets licence *************** *** 15,27 **** bmp = wx.wxArtProvider.GetBitmap(wx.wxART_INFORMATION) ! ID_BUTTON = 1000 ! ID_BITMAPBUTTON = 1001 ! ! ID_COMBOBOX = 100 ! ID_BITMAPCOMBOBOX = 100 ! ID_CHECKBOX = 100 - ID_CALENDARCTRL = 100 -- --------------------------------------------------------------------------- --- 15,35 ---- bmp = wx.wxArtProvider.GetBitmap(wx.wxART_INFORMATION) ! ID_PARENT_SCROLLEDWINDOW = 1000 ! ID_ANIMATIONCTRL = 1001 ! ID_BITMAPBUTTON = 1002 ! ID_BITMAPCOMBOBOX = 1003 ! ID_BUTTON = 1004 ! ID_CALENDARCTRL = 1005 ! ID_CHECKBOX = 1006 ! ID_CHECKLISTBOX = 1007 ! ID_CHOICE = 1008 ! ID_CHOICEBOOK = 1009 ! ID_COLLAPSIBLEPANE = 1010 ! ID_COMBOBOX = 1011 ! ID_CONTROL = 1012 ! ID_GAUGE = 1013 ! ID_HYPERLINKCTRL = 1014 -- --------------------------------------------------------------------------- *************** *** 35,38 **** --- 43,60 ---- end + -- Turn the array from the binding into a lookup + wxEVT_Table = {} + wxEVT_List = {} + wxEVT_Array = wx.wxLuaBinding_wx.GetEventArray + for i = 1, #wxEVT_Array do + wxEVT_Table[wxEVT_Array[i].eventType] = wxEVT_Array[i] + table.insert(wxEVT_List, string.format("%s %s", wxlua.wxlua_typename(wxEVT_Array[i].class_tag), wxEVT_Array[i].name)) + end + table.sort(wxEVT_List) + + + function wxPtStr(pt) + return string.format("%d, %d", pt.x, pt.y) + end -- --------------------------------------------------------------------------- *************** *** 40,85 **** -- --------------------------------------------------------------------------- ! function EventToString(event) return string.format("wxEvent - GetEventType=%d='%s' GetId=%d GetSkipped=%s GetTimestamp=%d IsCommandEvent=%s ShouldPropagate=%s", event:GetEventType(), wxEVT_Names[event:GetEventType()], event:GetId(), tostring(event:GetSkipped()), event:GetTimestamp(), tostring(event:IsCommandEvent()), tostring(event:ShouldPropagate())) end ! function CommandEventToString(event) ! return string.format("wxCommandEvent - GetExtraLong=%d GetInt=%d GetSelection=%d GetString='%s' IsChecked=%s IsSelection=%s", event:GetExtraLong(), event:GetInt(), event:GetSelection(), event:GetString(), tostring(event:IsChecked()), tostring(event:IsSelection())) end ! function DateEventToString(event) ! return string.format("wxDateEvent - GetDate:Format='%s'", event:GetDate():Format()) end ! function CalendarEventToString(event) ! return string.format("wxCalendarEvent - GetWeekDay=%d", event:GetWeekDay()) end ! -- --------------------------------------------------------------------------- ! -- Handle all wxCommandEvents ! -- --------------------------------------------------------------------------- ! function OnCommandEvent(event) ! local obj_str = event:GetEventObject():DynamicCast("wxWindow"):GetName() ! local evt_str = EventToString(event) ! local cmd_str = CommandEventToString(event) ! ! local s = string.format("%s From: %s Sent - wxCommandEvent \n\t%s\n\t%s\n\n", wx.wxNow(), obj_str, evt_str, cmd_str) ! textCtrl:AppendText(s) end -- --------------------------------------------------------------------------- ! -- Handle all wxCalendarEvents -- --------------------------------------------------------------------------- ! function OnCalendarEvent(event) ! local obj_str = event:GetEventObject():DynamicCast("wxWindow"):GetName() ! local evt_str = EventToString(event) ! local cmd_str = CommandEventToString(event) ! local date_str = DateEventToString(event) ! local cal_str = CalendarEventToString(event) ! ! local s = string.format("%s From: %s Sent - wxCalendarEvent \n\t%s\n\t%s\n\t%s\n\t%s\n\n", wx.wxNow(), obj_str, evt_str, cmd_str, date_str, cal_str) ! textCtrl:AppendText(s) end --- 62,262 ---- -- --------------------------------------------------------------------------- ! function wxEventToString(event) return string.format("wxEvent - GetEventType=%d='%s' GetId=%d GetSkipped=%s GetTimestamp=%d IsCommandEvent=%s ShouldPropagate=%s", event:GetEventType(), wxEVT_Names[event:GetEventType()], event:GetId(), tostring(event:GetSkipped()), event:GetTimestamp(), tostring(event:IsCommandEvent()), tostring(event:ShouldPropagate())) end ! function wxActivateEventToString(event) ! local s = string.format("wxActivateEvent - GetActive=%s", tostring(event:GetActive())) ! return s.."\n\t"..wxEventToString(event) ! end ! ! function wxBookCtrlBaseEventToString(event) ! local s = string.format("wxBookCtrlBaseEvent - GetOldSelection=%d GetOldSelection=%d", event:GetOldSelection(), event:GetSelection()) ! return s.."\n\t"..wxNotifyEventToString(event) ! end ! ! function wxCalculateLayoutEventToString(event) ! local s = string.format("wxCalculateLayoutEvent - GetFlags=%d GetRect=(%d, %d, %d, %d)", event:GetFlags(), event.GetRect():GetX(), event.GetRect():GetY(), event.GetRect():GetWidth(), event.GetRect():GetHeight()) ! return s.."\n\t"..wxEventToString(event) ! end ! ! function wxCalendarEventToString(event) ! local s = string.format("wxCalendarEvent - GetWeekDay=%d", event:GetWeekDay()) ! return s.."\n\t"..wxDateEventToString(event) ! end ! ! function wxChildFocusEventEventToString(event) ! local s = string.format("wxChildFocusEvent - GetWindow='%s'", tostring(event:GetWindow())) ! return s.."\n\t"..wxCommandEventToString(event) ! end ! ! function wxChoiceBookEventToString(event) ! local s = string.format("wxChoiceBookEvent - [nothing]") ! return s.."\n\t"..wxBookCtrlBaseEventToString(event) ! end ! ! function wxCloseEventToString(event) ! local s = string.format("wxCloseEvent - CanVeto=%s GetLoggingOff=%s", tostring(event:CanVeto()), tostring(event:GetLoggingOff())) ! return s.."\n\t"..wxEventToString(event) ! end ! ! function wxCollapsiblePaneEventToString(event) ! local s = string.format("wxCollapsiblePaneEvent - GetCollapsed=%s", tostring(event:GetCollapsed())) ! return s.."\n\t"..wxCommandEventToString(event) ! end ! ! function wxColourPickerEventEventToString(event) ! local c = event:GetColour() ! local s = string.format("wxColourPickerEvent - GetColour=(%s)", c:GetAsString()) ! c:delete() ! return s.."\n\t"..wxCommandEventToString(event) ! end ! ! function wxCommandEventToString(event) ! local s = string.format("wxCommandEvent - GetExtraLong=%d GetInt=%d GetSelection=%d GetString='%s' IsChecked=%s IsSelection=%s", event:GetExtraLong(), event:GetInt(), event:GetSelection(), event:GetString(), tostring(event:IsChecked()), tostring(event:IsSelection())) + return s.."\n\t"..wxEventToString(event) end ! function wxContextMenuEventEventEventToString(event) ! local s = string.format("wxContextMenuEvent - GetPosition=(%d, %d)", event:GetPosition().x, event:GetPosition().y) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxDateEventToString(event) ! local s = string.format("wxDateEvent - GetDate:Format='%s'", event:GetDate():Format()) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxDisplayChangedEventToString(event) ! local s = string.format("wxDisplayChangedEvent - [No values]") ! return s.."\n\t"..wxEventToString(event) ! end ! ! function wxDropfilesEventToString(event) ! local s = string.format("wxDropfilesEvent - GetNumberOfFiles=%d GetPosition=(%s) GetFiles=(%s)", event:GetNumberOfFiles(), wxPtStr(event:GetPosition()), table.concat(event.GetFiles(), ", ")) ! return s.."\n\t"..wxEventToString(event) ! end ! ! function wxEraseEventToString(event) ! local s = string.format("wxEraseEvent - [No values]") ! return s.."\n\t"..wxEventToString(event) ! end ! ! function wxFileDirPickerEventEventToString(event) ! local s = string.format("wxFileDirPickerEvent - GetPath='%s'", event:GetPath()) ! return s.."\n\t"..wxCommandEventToString(event) ! end ! ! -- FIXME missing wxFindDialogEvent ! ! function wxFocusEventToString(event) ! local s = string.format("wxFocusEvent - GetWindow='%s'", tostring(event:GetWindow())) ! return s.."\n\t"..wxCommandEventToString(event) ! end ! ! function wxFontPickerEventToString(event) ! local f = event:GetFont() ! local s = string.format("wxFontPickerEvent - GetFont='%s'", f:GetNativeFontInfoDesc()) ! f:delete() ! return s.."\n\t"..wxCommandEventToString(event) ! end ! ! -- FIXME missing wxGridXXX events ! ! function wxHelpEventToString(event) ! local s = string.format("wxHelpEvent - GetLink='%s' GetPosition=(%s) GetTarget='%s' GetOrigin=%d", event:GetLink(), wxPtStr(event:GetPosition()), event:GetTarget(), event:GetOrigin()) ! return s.."\n\t"..wxCommandEventToString(event) ! end ! ! function wxHyperlinkEventToString(event) ! local s = string.format("wxHyperlinkEvent - GetURL='%s'", event:GetURL()) ! return s.."\n\t"..wxCommandEventToString(event) ! end ! ! function wxIconizeEventToString(event) ! local s = string.format("wxIconizeEvent - Iconized=%s", tostring(event:Iconized())) ! return s.."\n\t"..wxEventToString(event) ! end ! ! function wxIdleEventToString(event) ! local s = string.format("wxIdleEvent - GetMode=%d MoreRequested=%s", event:GetMode(), tostring(event:MoreRequested())) ! return s.."\n\t"..wxEventToString(event) ! end ! ! function wxKeyEventToString(event) ! local s = string.format("wxKeyEvent - AltDown='%s' CmdDown='%s' ControlDown='%s' MetaDown='%s' ShiftDown='%s' HasModifiers='%s' GetModifiers=%d GetKeyCode=%d GetPosition=(%s)", ! tostring(event:AltDown()), tostring(event:CmdDown()), tostring(event:ControlDown()), tostring(event:MetaDown()), tostring(event:ShiftDown()), tostring(event:HasModifiers()), event:GetModifiers(), event:GetKeyCode(), wxPtStr(event:GetPosition())) ! return s.."\n\t"..wxEventToString(event) ! end ! ! function wxNotifyEventToString(event) ! local s = string.format("wxNotifyEvent - IsAllowed=%s", tostring(event:IsAllowed())) ! return s.."\n\t"..wxCommandEventToString(event) end -- --------------------------------------------------------------------------- ! -- Handle all wxCommandEvents -- --------------------------------------------------------------------------- ! ! wxEVT_Funcs = { ! ["wxEvent"] = wxEventToString, ! ["wxCommandEvent"] = wxCommandEventToString, ! ["wxNotifyEvent"] = wxNotifyEventToString, ! ["wxDateEvent"] = wxDateEventToString, ! ["wxCalendarEvent"] = wxCalendarEventToString, ! ["wxBookCtrlBaseEvent"] = wxBookCtrlBaseEventToString, ! ["wxChoiceBookEvent"] = wxChoiceBookEventToString, ! ["wxCollapsiblePaneEvent"] = wxCollapsiblePaneEventToString, ! ["wxHyperlinkEvent"] = wxHyperlinkEventToString, ! } ! ignoreEVTs = { ! ["wxEVT_IDLE"] = true, ! ["wxEVT_UPDATE_UI"] = true, ! ["wxEVT_ERASE_BACKGROUND"] = true, ! ["wxEVT_PAINT"] = true, ! ["wxEVT_MOTION"] = true, ! ["wxEVT_SET_CURSOR"] = true, ! ["wxEVT_CREATE"] = true, ! ["wxEVT_SIZE"] = true, ! ["wxEVT_TIMER"] = true, ! ["wxEVT_SHOW"] = true ! } ! ! ! function OnEvent(event) ! local str = "" ! ! local evtClassName = wxlua.wxlua_typename(wxEVT_Table[event:GetEventType()].class_tag) ! local evtTypeStr = wxEVT_Table[event:GetEventType()].name ! ! if ignoreEVTs[evtTypeStr] then ! event:Skip() ! return ! end ! ! if wxEVT_Funcs[evtClassName] then ! str = wxEVT_Funcs[evtClassName](event) ! end ! ! print(evtClassName, wxEVT_Table[event:GetEventType()].name) ! ! local obj_str = "event:GetEventObject()=NULL" ! if event:GetEventObject() then ! local classInfo = event:GetEventObject():GetClassInfo() ! if classInfo then ! obj_str = classInfo:GetClassName() ! else ! obj_str = "event:GetEventObject() does not have wxClassInfo" ! end ! end ! ! local s = string.format("%s From: %s Sent - "..evtClassName.." \n\t%s\n\n", wx.wxNow(), obj_str, str) ! if textCtrl then ! textCtrl:AppendText(s) ! end ! ! event:Skip() end *************** *** 89,133 **** function CreateControlsWindow(parent) ! local scrollWin = wx.wxScrolledWindow(parent, wx.wxID_ANY, wx.wxDefaultPosition, wx.wxDefaultSize, ! wx.wxHSCROLL + wx.wxVSCROLL) -- Give the scrollwindow enough size so sizer works when calling Fit() scrollWin:SetScrollbars(15, 15, 400, 600, 0, 0, false) local mainSizer = wx.wxBoxSizer(wx.wxVERTICAL) local flexSizer = wx.wxFlexGridSizer(20, 2, 5, 5) flexSizer:AddGrowableCol(1) ! local statText = nil -- not used outside of this function ! -- ----------------------------------------------------------------------- local control = nil - - statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxButton") - control = wx.wxButton(scrollWin, ID_BUTTON, "wxButton!", - wx.wxDefaultPosition, wx.wxDefaultSize) - flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) - flexSizer:Add(control, 1, wx.wxALIGN_CENTER) ! -- ----------------------------------------------------------------------- - statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxBitmapButton") control = wx.wxBitmapButton(scrollWin, ID_BITMAPBUTTON, bmp, wx.wxDefaultPosition, wx.wxDefaultSize) ! flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) ! flexSizer:Add(control, 1, wx.wxALIGN_CENTER) ! -- ----------------------------------------------------------------------- - statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxCheckBox") control = wx.wxCheckBox(scrollWin, ID_CHECKBOX, "wxCheckBox", wx.wxDefaultPosition, wx.wxDefaultSize) ! flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) ! flexSizer:Add(control, 1, wx.wxALIGN_CENTER) ! -- ----------------------------------------------------------------------- - statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxComboBox") control = wx.wxComboBox(scrollWin, ID_COMBOBOX, "wxComboBox!", wx.wxDefaultPosition, wx.wxDefaultSize, --- 266,402 ---- function CreateControlsWindow(parent) ! local scrollWin = wx.wxScrolledWindow(parent, ID_PARENT_SCROLLEDWINDOW, wx.wxDefaultPosition, wx.wxDefaultSize, ! wx.wxHSCROLL + wx.wxVSCROLL) -- Give the scrollwindow enough size so sizer works when calling Fit() scrollWin:SetScrollbars(15, 15, 400, 600, 0, 0, false) + scrollWin:SetBackgroundColour(wx.wxWHITE) local mainSizer = wx.wxBoxSizer(wx.wxVERTICAL) local flexSizer = wx.wxFlexGridSizer(20, 2, 5, 5) flexSizer:AddGrowableCol(1) ! local statText = nil -- not used outside of this function ! ! -- ----------------------------------------------------------------------- ! ! -- Connect ALL events to the window ! local function ConnectEvents(control) ! -- Note this is the same as doing this, but we connect all of them ! -- scrollWin:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnCommandEvent) ! ! for i = 1, #wxEVT_Array do ! if not ignoreEVTs[wxEVT_Array[i].name] then ! control:Connect(wx.wxID_ANY, wxEVT_Array[i].eventType, OnEvent) ! end ! end ! end ! ! -- ----------------------------------------------------------------------- ! ! local function AddControl(txt, control) ! local statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, txt) ! ! flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) ! flexSizer:Add(control, 1, wx.wxALIGN_CENTER) ! ! flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) ! flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) ! ! ConnectEvents(control) ! end ! -- ----------------------------------------------------------------------- local control = nil ! -- ----------------------------------------------------------------------- ! ! local e1 = wx.wxFileExists("throbber.gif") ! local e2 = wx.wxFileExists("../art/throbber.gif") ! ! if wx.wxAnimation and (e1 or e2) then ! local ani = wx.wxAnimation() ! if e1 then ani:LoadFile("throbber.gif") end ! if e2 then ani:LoadFile("../art/throbber.gif") end ! ! control = wx.wxAnimationCtrl(scrollWin, ID_ANIMATIONCTRL, ani, ! wx.wxDefaultPosition, wx.wxDefaultSize) ! control:Play() ! ani:delete() ! AddControl("wxAnimationCtrl", control) ! else ! control = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxAnimation is missing or unable to load [../art/]throbber.gif") ! AddControl("wxAnimationCtrl", control) ! end ! ! -- ----------------------------------------------------------------------- control = wx.wxBitmapButton(scrollWin, ID_BITMAPBUTTON, bmp, wx.wxDefaultPosition, wx.wxDefaultSize) ! AddControl("wxBitmapButton", control) ! -- ----------------------------------------------------------------------- ! ! control = wx.wxBitmapComboBox(scrollWin, ID_BITMAPCOMBOBOX, "wxBitmapComboBox!", ! wx.wxDefaultPosition, wx.wxDefaultSize, ! {"Item 1", "Item 2", "Item 3 text is long for default size"}, ! wx.wxTE_PROCESS_ENTER) -- generates event when enter is pressed ! control:Append("Appended w/ bitmap", bmp) ! control:Insert("Inserted at 0 w/ bitmap", bmp, 0) ! control:SetItemBitmap(2, bmp) ! AddControl("wxBitmapComboBox", control) ! ! -- ----------------------------------------------------------------------- ! ! control = wx.wxButton(scrollWin, ID_BUTTON, "wxButton!", ! wx.wxDefaultPosition, wx.wxDefaultSize) ! AddControl("wxButton", control) ! ! -- ----------------------------------------------------------------------- ! ! control = wx.wxCalendarCtrl(scrollWin, ID_CALENDARCTRL, wx.wxDefaultDateTime, ! wx.wxDefaultPosition, wx.wxDefaultSize, ! wx.wxCAL_SHOW_HOLIDAYS+wx.wxCAL_BORDER_SQUARE) ! AddControl("wxCalendarCtrl", control) ! ! -- ----------------------------------------------------------------------- control = wx.wxCheckBox(scrollWin, ID_CHECKBOX, "wxCheckBox", wx.wxDefaultPosition, wx.wxDefaultSize) ! AddControl("wxCheckBox", control) ! -- ----------------------------------------------------------------------- ! ! control = wx.wxCheckListBox(scrollWin, ID_CHECKLISTBOX, ! wx.wxDefaultPosition, wx.wxDefaultSize, ! {"Item 1", "Item 2", "Item 3"}) ! AddControl("wxCheckListBox", control) ! ! -- ----------------------------------------------------------------------- ! ! control = wx.wxChoice(scrollWin, ID_CHOICE, ! wx.wxDefaultPosition, wx.wxDefaultSize, ! {"Item 1", "Item 2", "Item 3"}) ! AddControl("wxChoice", control) ! ! -- ----------------------------------------------------------------------- ! ! control = wx.wxChoicebook(scrollWin, ID_CHOICEBOOK, ! wx.wxDefaultPosition, wx.wxDefaultSize) ! control:AddPage(wx.wxStaticText(control, wx.wxID_ANY, "Page 1 Window"), "Page 1") ! control:AddPage(wx.wxStaticText(control, wx.wxID_ANY, "Page 2 Window"), "Page 2") ! control:GetPage(0):SetBackgroundColour(wx.wxBLUE) ! control:GetPage(1):SetBackgroundColour(wx.wxRED) ! AddControl("wxChoicebook", control) ! ! -- ----------------------------------------------------------------------- ! ! control = wx.wxCollapsiblePane(scrollWin, ID_COLLAPSIBLEPANE, "wxCollapsiblePane", ! wx.wxDefaultPosition, wx.wxDefaultSize) ! AddControl("wxCollapsiblePane", control) ! ! -- ----------------------------------------------------------------------- control = wx.wxComboBox(scrollWin, ID_COMBOBOX, "wxComboBox!", wx.wxDefaultPosition, wx.wxDefaultSize, *************** *** 136,187 **** control:Append("Appended item") control:Insert("Inserted at 0", 0) ! flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) ! flexSizer:Add(control, 1, wx.wxALIGN_CENTER) ! -- ----------------------------------------------------------------------- ! statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxBitmapComboBox") ! control = wx.wxBitmapComboBox(scrollWin, ID_BITMAPCOMBOBOX, "wxBitmapComboBox!", ! wx.wxDefaultPosition, wx.wxDefaultSize, ! {"Item 1", "Item 2", "Item 3 text is long for default size"}, ! wx.wxTE_PROCESS_ENTER) -- generates event when enter is pressed ! control:Append("Appended w/ bitmap", bmp) ! control:Insert("Inserted at 0 w/ bitmap", bmp, 0) ! control:SetItemBitmap(2, bmp) ! flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) ! flexSizer:Add(control, 1, wx.wxALIGN_CENTER) ! -- ----------------------------------------------------------------------- ! statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxCalendarCtrl") ! control = wx.wxCalendarCtrl(scrollWin, ID_CALENDARCTRL, wx.wxDefaultDateTime, ! wx.wxDefaultPosition, wx.wxDefaultSize, ! wx.wxCAL_SHOW_HOLIDAYS+wx.wxCAL_BORDER_SQUARE) ! flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) ! flexSizer:Add(control, 1, wx.wxALIGN_CENTER) ! ! -- ----------------------------------------------------------------------- ! flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) ! flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) ! -- central event handler for all items that send wxCommandEvents ! -- Note this is the same as doing this ! --scrollWin:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnCommandEvent) ! ! for k, v in pairs(wxEVT_Names) do ! -- luckily all the wxCommandEvents start w/ wxEVT_COMMAND_ ! if string.find(v, "wxEVT_COMMAND_", 1, 1) == 1 then ! scrollWin:Connect(wx.wxID_ANY, k, OnCommandEvent) ! end ! end ! for k, v in pairs(wxEVT_Names) do ! if string.find(v, "wxEVT_CALENDAR_", 1, 1) == 1 then ! scrollWin:Connect(wx.wxID_ANY, k, OnCalendarEvent) ! end ! end ! -- ----------------------------------------------------------------------- mainSizer:Add(flexSizer, 1, wx.wxEXPAND) --- 405,438 ---- control:Append("Appended item") control:Insert("Inserted at 0", 0) ! AddControl("wxComboBox", control) ! -- ----------------------------------------------------------------------- ! control = wx.wxControl(scrollWin, ID_CONTROL, ! wx.wxDefaultPosition, wx.wxDefaultSize, ! wx.wxSUNKEN_BORDER) ! AddControl("wxControl", control) ! -- ----------------------------------------------------------------------- ! control = wx.wxGauge(scrollWin, ID_GAUGE, 100, ! wx.wxDefaultPosition, wx.wxDefaultSize) ! control:SetValue(30) ! AddControl("wxGauge", control) + -- ----------------------------------------------------------------------- ! control = wx.wxStaticText(scrollWin, wx.wxID_ANY, "See wxGrid sample") ! AddControl("wxGrid", control) ! -- ----------------------------------------------------------------------- ! control = wx.wxHyperlinkCtrl(scrollWin, ID_HYPERLINKCTRL, "Goto wxlua.sourceforge.net", "http://wxlua.sourceforge.net", ! wx.wxDefaultPosition, wx.wxDefaultSize) ! AddControl("wxHyperlinkCtrl", control) ! ! -- ----------------------------------------------------------------------- ! ! -- ----------------------------------------------------------------------- mainSizer:Add(flexSizer, 1, wx.wxEXPAND) *************** *** 238,248 **** splitter:SetSashGravity(.8) ! controlsWin = CreateControlsWindow(splitter) ! ! textCtrl = wx.wxTextCtrl(splitter, wx.wxID_ANY, "", wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxTE_READONLY+wx.wxTE_MULTILINE+wx.wxTE_DONTWRAP) ! ! splitter:SplitHorizontally(controlsWin, textCtrl, 300) -- ----------------------------------------------------------------------- --- 489,508 ---- splitter:SetSashGravity(.8) ! textCtrl = wx.wxTextCtrl(splitter, wx.wxID_ANY, "", wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxTE_READONLY+wx.wxTE_MULTILINE+wx.wxTE_DONTWRAP) ! ! splitter2 = wx.wxSplitterWindow(splitter, wx.wxID_ANY) ! splitter2:SetMinimumPaneSize(50) -- don't let it unsplit ! splitter2:SetSashGravity(.1) ! ! eventCheckListBox = wx.wxCheckListBox(splitter2, wx.wxID_ANY, ! wx.wxDefaultPosition, wx.wxDefaultSize, ! wxEVT_List, ! wx.wxLB_EXTENDED) ! controlsWin = CreateControlsWindow(splitter2) ! ! splitter2:SplitVertically(eventCheckListBox, controlsWin, 300) ! splitter:SplitHorizontally(splitter2, textCtrl, 300) -- ----------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-06-20 22:57:39
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31187/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Fix wxAnimationCtrl condition add more controls to controls.wx.lua sample and show events for everything Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** wxbind.h 19 Jun 2007 22:26:46 -0000 1.80 --- wxbind.h 20 Jun 2007 22:57:35 -0000 1.81 *************** *** 219,225 **** #endif // wxCHECK_VERSION(2,8,0) ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL #include "wx/animate.h" ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE --- 219,225 ---- #endif // wxCHECK_VERSION(2,8,0) ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL #include "wx/animate.h" ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE *************** *** 1238,1242 **** #endif // wxCHECK_VERSION(2,8,0) ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimation; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimation_methods[]; --- 1238,1242 ---- #endif // wxCHECK_VERSION(2,8,0) ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimation; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimation_methods[]; *************** *** 1245,1249 **** extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimationCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxAnimationCtrl_methodCount; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE --- 1245,1249 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimationCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxAnimationCtrl_methodCount; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE |
|
From: John L. <jr...@us...> - 2007-06-20 22:57:37
|
Update of /cvsroot/wxlua/wxLua/art In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31187/wxLua/art Added Files: throbber.gif Log Message: Fix wxAnimationCtrl condition add more controls to controls.wx.lua sample and show events for everything --- NEW FILE: throbber.gif --- (This appears to be a binary file; contents omitted.) |
|
From: John L. <jr...@us...> - 2007-06-19 22:27:21
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10494/wxLua/bindings/wxwidgets Modified Files: dialogs.i gdi.i picker.i windows.i wx_datatypes.lua Log Message: Add samples for picker and other controls Fix some binding problems found from the samples Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** windows.i 18 Jun 2007 21:40:32 -0000 1.46 --- windows.i 19 Jun 2007 22:26:46 -0000 1.47 *************** *** 985,989 **** // wxCollapsiblePane ! %if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE %include "wx/collpane.h" --- 985,989 ---- // wxCollapsiblePane ! %if %wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE %include "wx/collpane.h" *************** *** 1009,1013 **** %class %delete wxCollapsiblePaneEvent, wxCommandEvent ! %define wxEVT_COMMAND_COLLPANE_CHANGED // EVT_COLLAPSIBLEPANE_CHANGED(id, fn) wxCollapsiblePaneEvent() --- 1009,1013 ---- %class %delete wxCollapsiblePaneEvent, wxCommandEvent ! %define_event wxEVT_COMMAND_COLLPANE_CHANGED // EVT_COLLAPSIBLEPANE_CHANGED(id, fn) wxCollapsiblePaneEvent() *************** *** 1018,1022 **** %endclass ! %endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE // --------------------------------------------------------------------------- --- 1018,1022 ---- %endclass ! %endif // %wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE // --------------------------------------------------------------------------- Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** wx_datatypes.lua 19 Jun 2007 13:58:15 -0000 1.74 --- wx_datatypes.lua 19 Jun 2007 22:26:46 -0000 1.75 *************** *** 240,244 **** wxAnimation = { BaseClass = "wxGDIObject", ! Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", DefType = "class", IsNumber = false, --- 240,244 ---- wxAnimation = { BaseClass = "wxGDIObject", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL", DefType = "class", IsNumber = false, *************** *** 247,251 **** wxAnimationCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", DefType = "class", IsNumber = false, --- 247,251 ---- wxAnimationCtrl = { BaseClass = "wxControl", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL", DefType = "class", IsNumber = false, *************** *** 253,257 **** }, wxAnimationType = { ! Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", DefType = "enum", IsNumber = true, --- 253,257 ---- }, wxAnimationType = { ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL", DefType = "enum", IsNumber = true, *************** *** 608,612 **** wxCollapsiblePane = { BaseClass = "wxControl", ! Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", DefType = "class", IsNumber = false, --- 608,612 ---- wxCollapsiblePane = { BaseClass = "wxControl", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", DefType = "class", IsNumber = false, *************** *** 615,619 **** wxCollapsiblePaneEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", DefType = "class", IsNumber = false, --- 615,619 ---- wxCollapsiblePaneEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", DefType = "class", IsNumber = false, *************** *** 650,654 **** wxColourPickerCtrl = { BaseClass = "wxPickerBase", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)", DefType = "class", IsNumber = false, --- 650,654 ---- wxColourPickerCtrl = { BaseClass = "wxPickerBase", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)", DefType = "class", IsNumber = false, *************** *** 657,661 **** wxColourPickerEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)", DefType = "class", IsNumber = false, --- 657,661 ---- wxColourPickerEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)", DefType = "class", IsNumber = false, *************** *** 850,854 **** wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)", DefType = "class", IsNumber = false, --- 850,854 ---- wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)", DefType = "class", IsNumber = false, *************** *** 944,948 **** wxDirPickerCtrl = { BaseClass = "wxFileDirPickerCtrlBase", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, --- 944,948 ---- wxDirPickerCtrl = { BaseClass = "wxFileDirPickerCtrlBase", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, *************** *** 1162,1166 **** wxFileDirPickerCtrlBase = { BaseClass = "wxPickerBase", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, --- 1162,1166 ---- wxFileDirPickerCtrlBase = { BaseClass = "wxPickerBase", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, *************** *** 1169,1173 **** wxFileDirPickerEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, --- 1169,1173 ---- wxFileDirPickerEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, *************** *** 1215,1219 **** wxFilePickerCtrl = { BaseClass = "wxFileDirPickerCtrlBase", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, --- 1215,1219 ---- wxFilePickerCtrl = { BaseClass = "wxFileDirPickerCtrlBase", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, *************** *** 1353,1357 **** wxFontPickerCtrl = { BaseClass = "wxPickerBase", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)", DefType = "class", IsNumber = false, --- 1353,1357 ---- wxFontPickerCtrl = { BaseClass = "wxPickerBase", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)", DefType = "class", IsNumber = false, *************** *** 1360,1364 **** wxFontPickerEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)", DefType = "class", IsNumber = false, --- 1360,1364 ---- wxFontPickerEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)", DefType = "class", IsNumber = false, *************** *** 2692,2696 **** wxPickerBase = { BaseClass = "wxControl", ! Condition = "wxchkver_2_8 && wxLUA_USE_wxPicker", DefType = "class", IsNumber = false, --- 2692,2696 ---- wxPickerBase = { BaseClass = "wxControl", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker", DefType = "class", IsNumber = false, Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** gdi.i 18 Jun 2007 21:40:31 -0000 1.55 --- gdi.i 19 Jun 2007 22:26:46 -0000 1.56 *************** *** 1662,1666 **** // wxAnimation ! %if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 %include "wx/animate.h" --- 1662,1666 ---- // wxAnimation ! %if %wxchkver_2_8 && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL %include "wx/animate.h" *************** *** 1714,1716 **** %endclass ! %endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 --- 1714,1716 ---- %endclass ! %endif // %wxchkver_2_8 && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL Index: picker.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/picker.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** picker.i 18 Jun 2007 14:54:58 -0000 1.2 --- picker.i 19 Jun 2007 22:26:46 -0000 1.3 *************** *** 8,12 **** // =========================================================================== ! %if wxchkver_2_8 && wxLUA_USE_wxPicker // --------------------------------------------------------------------------- --- 8,12 ---- // =========================================================================== ! %if %wxchkver_2_8 && wxLUA_USE_wxPicker // --------------------------------------------------------------------------- *************** *** 97,102 **** %include "wx/datectrl.h" %enum ! wxDP_SPIN wxDP_DROPDOWN wxDP_DEFAULT --- 97,104 ---- %include "wx/datectrl.h" + // Note: this sends a wxDateEvent wxEVT_DATE_CHANGED // EVT_DATE_CHANGED(id, fn) + %enum ! wxDP_SPIN // MSW only wxDP_DROPDOWN wxDP_DEFAULT *************** *** 207,213 **** %define wxFNTP_FONTDESC_AS_LABEL ! %define wxFNTP_USE_TEXTCTRL %define wxFNTP_DEFAULT_STYLE ! %define wxFNTP_MAXPOINT_SIZE %class wxFontPickerCtrl, wxPickerBase --- 209,217 ---- %define wxFNTP_FONTDESC_AS_LABEL ! %define wxFNTP_USEFONT_FOR_LABEL ! %define wxFNTP_USE_TEXTCTRL // (wxFNTP_FONTDESC_AS_LABEL|wxFNTP_USEFONT_FOR_LABEL) %define wxFNTP_DEFAULT_STYLE ! ! %define wxFNTP_MAXPOINT_SIZE // 100 the default max size to allow %class wxFontPickerCtrl, wxPickerBase *************** *** 239,243 **** %endif // wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL ! %endif // wxchkver_2_8 && wxLUA_USE_wxPicker --- 243,247 ---- %endif // wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL ! %endif // %wxchkver_2_8 && wxLUA_USE_wxPicker Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** dialogs.i 18 Jun 2007 02:56:23 -0000 1.35 --- dialogs.i 19 Jun 2007 22:26:46 -0000 1.36 *************** *** 52,55 **** --- 52,56 ---- // %function wxTipProvider* wxCreateFileTipProvider(const wxString& filename, size_t currentTip) + %define_string wxDirSelectorPromptStr %function wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& default_path = "", long style = wxDD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, wxWindow *parent = NULL) %function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1) *************** *** 231,234 **** --- 232,238 ---- %include "wx/filedlg.h" + %define_string wxFileSelectorPromptStr + %define_string wxFileSelectorDefaultWildcardStr + %class wxFileDialog, wxDialog // wxFileDialog() no default constructor in MSW |
|
From: John L. <jr...@us...> - 2007-06-19 22:27:20
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10494/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Add samples for picker and other controls Fix some binding problems found from the samples Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** wxbind.h 18 Jun 2007 21:40:35 -0000 1.79 --- wxbind.h 19 Jun 2007 22:26:46 -0000 1.80 *************** *** 84,87 **** --- 84,103 ---- #endif // (wxCHECK_VERSION(2,6,0)) && (wxUSE_NUMBERDLG) + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) + #include "wx/filepicker.h" + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) + #include "wx/clrpicker.h" + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) + #include "wx/datectrl.h" + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) + #include "wx/fontpicker.h" + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) + #if (wxLUA_USE_wxButton && wxUSE_BUTTON) && (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) #include "wx/bmpbuttn.h" *************** *** 176,195 **** #endif // (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) - #include "wx/filepicker.h" - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) - #include "wx/clrpicker.h" - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) - #include "wx/datectrl.h" - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) - #include "wx/fontpicker.h" - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) - #include "sys/stat.h" #include "wx/control.h" --- 192,195 ---- *************** *** 219,222 **** --- 219,234 ---- #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL + #include "wx/animate.h" + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL + + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + #include "wx/collpane.h" + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker + #include "wx/pickerbase.h" + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths #include "wx/stdpaths.h" *************** *** 239,246 **** #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook - #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 - #include "wx/animate.h" - #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 - #if wxLUA_USE_Geometry && wxUSE_GEOMETRY #include "wx/geometry.h" --- 251,254 ---- *************** *** 722,733 **** #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard - #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE - #include "wx/collpane.h" - #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE - - #if wxchkver_2_8 && wxLUA_USE_wxPicker - #include "wx/pickerbase.h" - #endif // wxchkver_2_8 && wxLUA_USE_wxPicker - // --------------------------------------------------------------------------- --- 730,733 ---- *************** *** 735,738 **** --- 735,780 ---- // --------------------------------------------------------------------------- + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileDirPickerCtrlBase; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileDirPickerCtrlBase_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileDirPickerCtrlBase_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileDirPickerEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileDirPickerEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileDirPickerEvent_methodCount; + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourPickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxColourPickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourPickerCtrl_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourPickerEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxColourPickerEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourPickerEvent_methodCount; + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDatePickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDatePickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDatePickerCtrl_methodCount; + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDirPickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDirPickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDirPickerCtrl_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFilePickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFilePickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFilePickerCtrl_methodCount; + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) + + #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontPickerCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFontPickerCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontPickerCtrl_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontPickerEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFontPickerEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontPickerEvent_methodCount; + #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) + #if (wxCHECK_VERSION(2,8,0)) && (defined(wxHAS_POWER_EVENTS)) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPowerEvent; *************** *** 1011,1056 **** #endif // (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileDirPickerCtrlBase; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileDirPickerCtrlBase_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileDirPickerCtrlBase_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileDirPickerEvent; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFileDirPickerEvent_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileDirPickerEvent_methodCount; - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourPickerCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxColourPickerCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourPickerCtrl_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourPickerEvent; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxColourPickerEvent_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourPickerEvent_methodCount; - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDatePickerCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDatePickerCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxDatePickerCtrl_methodCount; - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDirPickerCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxDirPickerCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxDirPickerCtrl_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFilePickerCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFilePickerCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxFilePickerCtrl_methodCount; - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) - - #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontPickerCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFontPickerCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontPickerCtrl_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFontPickerEvent; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFontPickerEvent_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxFontPickerEvent_methodCount; - #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxActivateEvent; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxActivateEvent_methods[]; --- 1053,1056 ---- *************** *** 1238,1241 **** --- 1238,1265 ---- #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimation; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimation_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxAnimation_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimationCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimationCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxAnimationCtrl_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL + + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCollapsiblePane; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxCollapsiblePane_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxCollapsiblePane_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCollapsiblePaneEvent; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxCollapsiblePaneEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxCollapsiblePaneEvent_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPickerBase; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxPickerBase_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxPickerBase_methodCount; + #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker + #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStandardPaths; *************** *** 1279,1291 **** #endif // wxCHECK_VERSION(2,8,0) && wxUSE_TREEBOOK && wxLUA_USE_wxTreebook - #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimation; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimation_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxAnimation_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAnimationCtrl; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxAnimationCtrl_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxAnimationCtrl_methodCount; - #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 - #if wxLUA_USE_Geometry && wxUSE_GEOMETRY extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPoint2DDouble; --- 1303,1306 ---- *************** *** 2584,2602 **** #endif // wxUSE_WIZARDDLG && wxLUA_USE_wxWizard - #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCollapsiblePane; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxCollapsiblePane_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxCollapsiblePane_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCollapsiblePaneEvent; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxCollapsiblePaneEvent_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxCollapsiblePaneEvent_methodCount; - #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE - - #if wxchkver_2_8 && wxLUA_USE_wxPicker - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPickerBase; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxPickerBase_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxPickerBase_methodCount; - #endif // wxchkver_2_8 && wxLUA_USE_wxPicker - --- 2599,2602 ---- |
|
From: John L. <jr...@us...> - 2007-06-19 22:27:19
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10494/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Add samples for picker and other controls Fix some binding problems found from the samples Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** wxstc_datatypes.lua 19 Jun 2007 13:58:15 -0000 1.64 --- wxstc_datatypes.lua 19 Jun 2007 22:26:46 -0000 1.65 *************** *** 240,244 **** wxAnimation = { BaseClass = "wxGDIObject", ! Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", DefType = "class", IsNumber = false, --- 240,244 ---- wxAnimation = { BaseClass = "wxGDIObject", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL", DefType = "class", IsNumber = false, *************** *** 247,251 **** wxAnimationCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", DefType = "class", IsNumber = false, --- 247,251 ---- wxAnimationCtrl = { BaseClass = "wxControl", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL", DefType = "class", IsNumber = false, *************** *** 253,257 **** }, wxAnimationType = { ! Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", DefType = "enum", IsNumber = true, --- 253,257 ---- }, wxAnimationType = { ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL", DefType = "enum", IsNumber = true, *************** *** 608,612 **** wxCollapsiblePane = { BaseClass = "wxControl", ! Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", DefType = "class", IsNumber = false, --- 608,612 ---- wxCollapsiblePane = { BaseClass = "wxControl", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", DefType = "class", IsNumber = false, *************** *** 615,619 **** wxCollapsiblePaneEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", DefType = "class", IsNumber = false, --- 615,619 ---- wxCollapsiblePaneEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", DefType = "class", IsNumber = false, *************** *** 650,654 **** wxColourPickerCtrl = { BaseClass = "wxPickerBase", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)", DefType = "class", IsNumber = false, --- 650,654 ---- wxColourPickerCtrl = { BaseClass = "wxPickerBase", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)", DefType = "class", IsNumber = false, *************** *** 657,661 **** wxColourPickerEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)", DefType = "class", IsNumber = false, --- 657,661 ---- wxColourPickerEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)", DefType = "class", IsNumber = false, *************** *** 850,854 **** wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)", DefType = "class", IsNumber = false, --- 850,854 ---- wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)", DefType = "class", IsNumber = false, *************** *** 944,948 **** wxDirPickerCtrl = { BaseClass = "wxFileDirPickerCtrlBase", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, --- 944,948 ---- wxDirPickerCtrl = { BaseClass = "wxFileDirPickerCtrlBase", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, *************** *** 1162,1166 **** wxFileDirPickerCtrlBase = { BaseClass = "wxPickerBase", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, --- 1162,1166 ---- wxFileDirPickerCtrlBase = { BaseClass = "wxPickerBase", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, *************** *** 1169,1173 **** wxFileDirPickerEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, --- 1169,1173 ---- wxFileDirPickerEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, *************** *** 1215,1219 **** wxFilePickerCtrl = { BaseClass = "wxFileDirPickerCtrlBase", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, --- 1215,1219 ---- wxFilePickerCtrl = { BaseClass = "wxFileDirPickerCtrlBase", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))", DefType = "class", IsNumber = false, *************** *** 1353,1357 **** wxFontPickerCtrl = { BaseClass = "wxPickerBase", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)", DefType = "class", IsNumber = false, --- 1353,1357 ---- wxFontPickerCtrl = { BaseClass = "wxPickerBase", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)", DefType = "class", IsNumber = false, *************** *** 1360,1364 **** wxFontPickerEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)", DefType = "class", IsNumber = false, --- 1360,1364 ---- wxFontPickerEvent = { BaseClass = "wxCommandEvent", ! Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)", DefType = "class", IsNumber = false, *************** *** 2692,2696 **** wxPickerBase = { BaseClass = "wxControl", ! Condition = "wxchkver_2_8 && wxLUA_USE_wxPicker", DefType = "class", IsNumber = false, --- 2692,2696 ---- wxPickerBase = { BaseClass = "wxControl", ! Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker", DefType = "class", IsNumber = false, |
|
From: John L. <jr...@us...> - 2007-06-19 22:27:19
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10494/wxLua/bindings Modified Files: genidocs_rules.lua genwxbind.lua Log Message: Add samples for picker and other controls Fix some binding problems found from the samples Index: genidocs_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs_rules.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** genidocs_rules.lua 18 Jun 2007 02:56:22 -0000 1.2 --- genidocs_rules.lua 19 Jun 2007 22:26:45 -0000 1.3 *************** *** 42,45 **** --- 42,46 ---- "mdi.i", "menutool.i", + "picker.i", "print.i", "regex.i", Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.130 retrieving revision 1.131 diff -C2 -d -r1.130 -r1.131 *** genwxbind.lua 19 Jun 2007 13:58:15 -0000 1.130 --- genwxbind.lua 19 Jun 2007 22:26:45 -0000 1.131 *************** *** 556,559 **** --- 556,560 ---- if preprocConditionTable[condition] then result = preprocConditionTable[condition] + elseif string.find(condition, "%wxchkver_", 1, 1) then -- check for conditions like %wxchkver_1_2_3 = wxCHECK_VERSION(1,2,3) *************** *** 566,571 **** result = string.format("wxCHECK_VERSION(%d,%d,%d)", ver[1], ver[2], ver[3]) preprocConditionTable[condition] = result -- cache result ! elseif string.find(condition, "%wxchkver2", 1, 1) then ! assert(false, "ERROR: %wxchkverXYZ has been replaced by %wxchkver_X_Y_Z, please update your bindings.") elseif string.find(condition, "%wxcompat_", 1, 1) then -- check for conditions like %wxcompat_1_2 = WXWIN_COMPATIBILITY_1_2 --- 567,573 ---- result = string.format("wxCHECK_VERSION(%d,%d,%d)", ver[1], ver[2], ver[3]) preprocConditionTable[condition] = result -- cache result ! elseif string.find(condition, "wxchkver_", 1, 1) then ! print("Warning found wxchkver_XXX, did you forget the leading '%'? '"..condition.."'") ! elseif string.find(condition, "%wxcompat_", 1, 1) then -- check for conditions like %wxcompat_1_2 = WXWIN_COMPATIBILITY_1_2 *************** *** 575,584 **** result = "(defined("..result..") && "..result..")" preprocConditionTable[condition] = result -- cache result ! elseif string.find(condition, "%wxcompat2", 1, 1) then ! assert(false, "ERROR: %wxcompatXY has been replaced by %wxcompat_X_Y, please update your bindings.") elseif string.find(condition, "wxLUA_USE_", 1, 1) then print("Warning unknown wxLUA_USE_XXX tag, maybe a missing condition? '"..condition.."'") elseif string.find(condition, "wxUSE_", 1, 1) then print("Warning unknown wxUSE_XXX tag, maybe a missing condition? '"..condition.."'") end --- 577,592 ---- result = "(defined("..result..") && "..result..")" preprocConditionTable[condition] = result -- cache result ! elseif string.find(condition, "wxcompat_", 1, 1) then ! print("Warning found wxcompat_XXX, did you forget the leading '%'? '"..condition.."'") ! elseif string.find(condition, "wxLUA_USE_", 1, 1) then print("Warning unknown wxLUA_USE_XXX tag, maybe a missing condition? '"..condition.."'") elseif string.find(condition, "wxUSE_", 1, 1) then print("Warning unknown wxUSE_XXX tag, maybe a missing condition? '"..condition.."'") + + elseif string.find(condition, "%wxchkver2", 1, 1) then + assert(false, "ERROR: %wxchkverXYZ has been replaced by %wxchkver_X_Y_Z, please update your bindings.") + elseif string.find(condition, "%wxcompat2", 1, 1) then + assert(false, "ERROR: %wxcompatXY has been replaced by %wxcompat_X_Y, please update your bindings.") end |
|
From: John L. <jr...@us...> - 2007-06-19 22:26:54
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10494/wxLua/samples Added Files: controls.wx.lua picker.wx.lua Log Message: Add samples for picker and other controls Fix some binding problems found from the samples --- NEW FILE: picker.wx.lua --- ----------------------------------------------------------------------------- -- Name: picker.wx.lua -- Purpose: Picker wxLua sample -- Author: John Labenski -- Modified by: -- Created: 6/19/2007 -- RCS-ID: -- Copyright: (c) 2007 John Labenski -- Licence: wxWidgets licence ----------------------------------------------------------------------------- frame = nil textCtrl = nil ID_COLOURPICKER1 = 1001 ID_COLOURPICKER2 = 1002 ID_COLOURPICKER3 = 1003 ID_DATEPICKER1 = 2001 ID_DATEPICKER2 = 2002 ID_DATEPICKER3 = 2003 ID_DATEPICKER4 = 2004 ID_DATEPICKER5 = 2005 ID_DIRPICKER1 = 3001 ID_DIRPICKER2 = 3002 ID_DIRPICKER3 = 3003 ID_DIRPICKER4 = 3004 ID_FILEPICKER1 = 4001 ID_FILEPICKER2 = 4002 ID_FILEPICKER3 = 4003 ID_FILEPICKER4 = 4004 ID_FILEPICKER5 = 4005 ID_FONTPICKER1 = 5001 ID_FONTPICKER2 = 5002 ID_FONTPICKER3 = 5003 ID_FONTPICKER4 = 5004 ID_FONTPICKER5 = 5005 -- --------------------------------------------------------------------------- -- Gather up all of the wxEVT_XXX names and hash by their value -- --------------------------------------------------------------------------- wxEVT_Names = {} for k, v in pairs(wx) do if string.find(k, "wxEVT_", 1, 1) == 1 then wxEVT_Names[v] = k end end -- --------------------------------------------------------------------------- -- Handle all wxColourPickerEvents -- --------------------------------------------------------------------------- function OnColourPicker(event) local evt_type = event:GetEventType() local c = event:GetColour() local val = c:GetAsString() c:delete() -- delete all wxColours when done local s = string.format("%s wxColourPickerEvent type: %s=%d id: %d GetColour = '%s'\n\n", wx.wxNow(), wxEVT_Names[evt_type], evt_type, event:GetId(), val) textCtrl:AppendText(s) end -- --------------------------------------------------------------------------- -- Handle all wxDateEvents -- --------------------------------------------------------------------------- function OnDatePicker(event) local evt_type = event:GetEventType() local val = event:GetDate():Format() local s = string.format("%s wxDateEvent type: %s=%d id: %d GetDate = '%s'\n\n", wx.wxNow(), wxEVT_Names[evt_type], evt_type, event:GetId(), val) textCtrl:AppendText(s) end -- --------------------------------------------------------------------------- -- Handle all wxFileDirPickerEvents -- --------------------------------------------------------------------------- function OnFileDirPicker(event) local evt_type = event:GetEventType() local val = event:GetPath() local s = string.format("%s wxFileDirPickerEvent type: %s=%d id: %d GetPath = '%s'\n\n", wx.wxNow(), wxEVT_Names[evt_type], evt_type, event:GetId(), val) textCtrl:AppendText(s) end -- --------------------------------------------------------------------------- -- Handle all wxFontPickerEvents -- --------------------------------------------------------------------------- function OnFontPicker(event) local evt_type = event:GetEventType() local f = event:GetFont() local val = f:GetNativeFontInfoDesc() f:delete() -- delete all wxFonts when done local s = string.format("%s wxFontPickerEvent type: %s=%d id: %d GetFont = '%s'\n\n", wx.wxNow(), wxEVT_Names[evt_type], evt_type, event:GetId(), val) textCtrl:AppendText(s) end -- --------------------------------------------------------------------------- -- Create the window with the picker controls -- --------------------------------------------------------------------------- function CreatePickerWindow(parent) local scrollWin = wx.wxScrolledWindow(parent, wx.wxID_ANY, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxHSCROLL + wx.wxVSCROLL) -- Give the scrollwindow enough size so sizer works when calling Fit() scrollWin:SetScrollbars(15, 15, 400, 600, 0, 0, false) local mainSizer = wx.wxBoxSizer(wx.wxVERTICAL) local flexSizer = wx.wxFlexGridSizer(20, 2, 5, 5) flexSizer:AddGrowableCol(1) local statText = nil -- not used outside of this function -- ----------------------------------------------------------------------- local colourPicker = nil -- not used outside of this function statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxColourPickerCtrl + wxCLRP_DEFAULT_STYLE") colourPicker = wx.wxColourPickerCtrl(scrollWin, ID_COLOURPICKER1, wx.wxBLACK, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxCLRP_DEFAULT_STYLE) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(colourPicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxColourPickerCtrl + wxCLRP_USE_TEXTCTRL") colourPicker = wx.wxColourPickerCtrl(scrollWin, ID_COLOURPICKER2, wx.wxBLACK, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxCLRP_USE_TEXTCTRL) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(colourPicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxColourPickerCtrl + wxCLRP_SHOW_LABEL") colourPicker = wx.wxColourPickerCtrl(scrollWin, ID_COLOURPICKER3, wx.wxBLACK, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxCLRP_SHOW_LABEL) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(colourPicker, 1, wx.wxEXPAND) -- central event handler for all wxColourPickerEvent scrollWin:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_COLOURPICKER_CHANGED, OnColourPicker) -- ----------------------------------------------------------------------- flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) local datePicker = nil -- not used outside of this function statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxDatePickerCtrl + wxDP_DEFAULT") datePicker = wx.wxDatePickerCtrl(scrollWin, ID_DATEPICKER1, wx.wxDefaultDateTime, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxDP_DEFAULT) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(datePicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxDatePickerCtrl + wxDP_SPIN") if wx.__WXMSW__ then 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") end flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(datePicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxDatePickerCtrl + wxDP_DROPDOWN") datePicker = wx.wxDatePickerCtrl(scrollWin, ID_DATEPICKER3, wx.wxDefaultDateTime, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxDP_DROPDOWN) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(datePicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxDatePickerCtrl + wxDP_ALLOWNONE") datePicker = wx.wxDatePickerCtrl(scrollWin, ID_DATEPICKER4, wx.wxDefaultDateTime, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxDP_ALLOWNONE) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(datePicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxDatePickerCtrl + wxDP_SHOWCENTURY") datePicker = wx.wxDatePickerCtrl(scrollWin, ID_DATEPICKER5, wx.wxDefaultDateTime, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxDP_SHOWCENTURY) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(datePicker, 1, wx.wxEXPAND) -- central event handler for all wxDatePickerCtrls scrollWin:Connect(wx.wxID_ANY, wx.wxEVT_DATE_CHANGED, OnDatePicker) -- ----------------------------------------------------------------------- flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) local dirPicker = nil -- not used outside of this function statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxDirPickerCtrl + wxDIRP_DEFAULT_STYLE") dirPicker = wx.wxDirPickerCtrl(scrollWin, ID_DIRPICKER1, wx.wxGetCwd(), wx.wxDirSelectorPromptStr, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxDIRP_DEFAULT_STYLE) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(dirPicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxDirPickerCtrl + wxDIRP_USE_TEXTCTRL") dirPicker = wx.wxDirPickerCtrl(scrollWin, ID_DIRPICKER2, wx.wxGetCwd(), "I'm the message parameter", wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxDIRP_USE_TEXTCTRL) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(dirPicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxDirPickerCtrl + wxDIRP_CHANGE_DIR") dirPicker = wx.wxDirPickerCtrl(scrollWin, ID_DIRPICKER3, wx.wxGetCwd(), wx.wxDirSelectorPromptStr, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxDIRP_CHANGE_DIR) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(dirPicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxDirPickerCtrl + wxDIRP_DIR_MUST_EXIST") dirPicker = wx.wxDirPickerCtrl(scrollWin, ID_DIRPICKER4, wx.wxGetCwd(), wx.wxDirSelectorPromptStr, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxDIRP_DIR_MUST_EXIST) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(dirPicker, 1, wx.wxEXPAND) -- central event handler for all wxDirPickerCtrl scrollWin:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_DIRPICKER_CHANGED, OnFileDirPicker) -- ----------------------------------------------------------------------- flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) local filePicker = nil -- not used outside of this function statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxFilePickerCtrl + wxFLP_DEFAULT_STYLE") filePicker = wx.wxFilePickerCtrl(scrollWin, ID_FILEPICKER1, wx.wxGetCwd(), "I'm the message parameter", "*", wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxFLP_DEFAULT_STYLE) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(filePicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxFilePickerCtrl + wxFLP_USE_TEXTCTRL") filePicker = wx.wxFilePickerCtrl(scrollWin, ID_FILEPICKER2, wx.wxGetCwd(), wx.wxFileSelectorPromptStr, wx.wxFileSelectorDefaultWildcardStr, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxFLP_USE_TEXTCTRL) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(filePicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxFilePickerCtrl + wxFLP_CHANGE_DIR") filePicker = wx.wxFilePickerCtrl(scrollWin, ID_FILEPICKER3, wx.wxGetCwd(), wx.wxFileSelectorPromptStr, wx.wxFileSelectorDefaultWildcardStr, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxFLP_CHANGE_DIR) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(filePicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxFilePickerCtrl + wxFLP_OPEN+wxFLP_FILE_MUST_EXIST") filePicker = wx.wxFilePickerCtrl(scrollWin, ID_FILEPICKER4, wx.wxGetCwd(), wx.wxFileSelectorPromptStr, wx.wxFileSelectorDefaultWildcardStr, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxFLP_OPEN + wx.wxFLP_FILE_MUST_EXIST) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(filePicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxFilePickerCtrl + wxFLP_SAVE+wxFLP_OVERWRITE_PROMPT") filePicker = wx.wxFilePickerCtrl(scrollWin, ID_FILEPICKER5, wx.wxGetCwd(), wx.wxFileSelectorPromptStr, wx.wxFileSelectorDefaultWildcardStr, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxFLP_SAVE + wx.wxFLP_OVERWRITE_PROMPT) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(filePicker, 1, wx.wxEXPAND) -- central event handler for all wxDirPickerCtrl scrollWin:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_FILEPICKER_CHANGED, OnFileDirPicker) -- ----------------------------------------------------------------------- flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) local fontPicker = nil -- not used outside of this function statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxFontPickerCtrl + wxFNTP_DEFAULT_STYLE, wxNullFont") fontPicker = wx.wxFontPickerCtrl(scrollWin, ID_FONTPICKER1, wx.wxNullFont, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxFNTP_DEFAULT_STYLE) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(fontPicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxFontPickerCtrl + wxFNTP_USE_TEXTCTRL, wxNORMAL_FONT") fontPicker = wx.wxFontPickerCtrl(scrollWin, ID_FONTPICKER2, wx.wxNORMAL_FONT, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxFNTP_USE_TEXTCTRL) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(fontPicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxFontPickerCtrl + wxFNTP_FONTDESC_AS_LABEL, wxSMALL_FONT") fontPicker = wx.wxFontPickerCtrl(scrollWin, ID_FONTPICKER3, wx.wxSMALL_FONT, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxFNTP_FONTDESC_AS_LABEL) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(fontPicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxFontPickerCtrl + wxFNTP_USEFONT_FOR_LABEL, wxITALIC_FONT") fontPicker = wx.wxFontPickerCtrl(scrollWin, ID_FONTPICKER4, wx.wxITALIC_FONT, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxFNTP_USEFONT_FOR_LABEL) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(fontPicker, 1, wx.wxEXPAND) statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxFontPickerCtrl + wxFNTP_USEFONT_FOR_LABEL, wxSWISS_FONT") fontPicker = wx.wxFontPickerCtrl(scrollWin, ID_FONTPICKER5, wx.wxSWISS_FONT, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxFNTP_USEFONT_FOR_LABEL) flexSizer:Add(statText, 1, wx.wxALIGN_CENTER_VERTICAL) flexSizer:Add(fontPicker, 1, wx.wxEXPAND) -- central event handler for all wxDirPickerCtrl scrollWin:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_FONTPICKER_CHANGED, OnFontPicker) -- ----------------------------------------------------------------------- mainSizer:Add(flexSizer, 1, wx.wxEXPAND) scrollWin:SetSizer(mainSizer) mainSizer:Fit(scrollWin) return scrollWin end -- --------------------------------------------------------------------------- -- Main function of the program -- --------------------------------------------------------------------------- function main() frame = wx.wxFrame( wx.NULL, -- no parent needed for toplevel windows wx.wxID_ANY, -- don't need a wxWindow ID "wxLua Picker Demo", -- caption on the frame wx.wxDefaultPosition, -- let system place the frame wx.wxSize(550, 450), -- set the size of the frame wx.wxDEFAULT_FRAME_STYLE ) -- use default frame styles local fileMenu = wx.wxMenu() fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program") local helpMenu = wx.wxMenu() helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua Picker Application") local menuBar = wx.wxMenuBar() menuBar:Append(fileMenu, "&File") menuBar:Append(helpMenu, "&Help") frame:SetMenuBar(menuBar) frame:CreateStatusBar(1) frame:SetStatusText("Welcome to wxLua.") -- connect the selection event of the exit menu item to an -- event handler that closes the window frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(true) end ) -- connect the selection event of the about menu item frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the Picker wxLua sample.\n'.. wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, frame) end ) -- ----------------------------------------------------------------------- splitter = wx.wxSplitterWindow(frame, wx.wxID_ANY) splitter:SetMinimumPaneSize(50) -- don't let it unsplit splitter:SetSashGravity(.8) pickerWin = CreatePickerWindow(splitter) textCtrl = wx.wxTextCtrl(splitter, wx.wxID_ANY, "", wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxTE_READONLY+wx.wxTE_MULTILINE+wx.wxTE_DONTWRAP) splitter:SplitHorizontally(pickerWin, textCtrl, 300) -- ----------------------------------------------------------------------- frame:Show(true) -- show the frame window end main() --- NEW FILE: controls.wx.lua --- ----------------------------------------------------------------------------- -- Name: picker.wx.lua -- Purpose: Picker wxLua sample -- Author: John Labenski -- Modified by: -- Created: 6/19/2007 -- RCS-ID: -- Copyright: (c) 2007 John Labenski -- Licence: wxWidgets licence ----------------------------------------------------------------------------- frame = nil textCtrl = nil bmp = wx.wxArtProvider.GetBitmap(wx.wxART_INFORMATION) ID_BUTTON = 1000 ID_BITMAPBUTTON = 1001 ID_COMBOBOX = 100 ID_BITMAPCOMBOBOX = 100 ID_CHECKBOX = 100 ID_CALENDARCTRL = 100 -- --------------------------------------------------------------------------- -- Gather up all of the wxEVT_XXX names and hash by their value -- --------------------------------------------------------------------------- wxEVT_Names = {} for k, v in pairs(wx) do if string.find(k, "wxEVT_", 1, 1) == 1 then wxEVT_Names[v] = k end end -- --------------------------------------------------------------------------- -- Format all of the values you can get from different event types -- --------------------------------------------------------------------------- function EventToString(event) return string.format("wxEvent - GetEventType=%d='%s' GetId=%d GetSkipped=%s GetTimestamp=%d IsCommandEvent=%s ShouldPropagate=%s", event:GetEventType(), wxEVT_Names[event:GetEventType()], event:GetId(), tostring(event:GetSkipped()), event:GetTimestamp(), tostring(event:IsCommandEvent()), tostring(event:ShouldPropagate())) end function CommandEventToString(event) return string.format("wxCommandEvent - GetExtraLong=%d GetInt=%d GetSelection=%d GetString='%s' IsChecked=%s IsSelection=%s", event:GetExtraLong(), event:GetInt(), event:GetSelection(), event:GetString(), tostring(event:IsChecked()), tostring(event:IsSelection())) end function DateEventToString(event) return string.format("wxDateEvent - GetDate:Format='%s'", event:GetDate():Format()) end function CalendarEventToString(event) return string.format("wxCalendarEvent - GetWeekDay=%d", event:GetWeekDay()) end -- --------------------------------------------------------------------------- -- Handle all wxCommandEvents -- --------------------------------------------------------------------------- function OnCommandEvent(event) local obj_str = event:GetEventObject():DynamicCast("wxWindow"):GetName() local evt_str = EventToString(event) local cmd_str = CommandEventToString(event) local s = string.format("%s From: %s Sent - wxCommandEvent \n\t%s\n\t%s\n\n", wx.wxNow(), obj_str, evt_str, cmd_str) textCtrl:AppendText(s) end -- --------------------------------------------------------------------------- -- Handle all wxCalendarEvents -- --------------------------------------------------------------------------- function OnCalendarEvent(event) local obj_str = event:GetEventObject():DynamicCast("wxWindow"):GetName() local evt_str = EventToString(event) local cmd_str = CommandEventToString(event) local date_str = DateEventToString(event) local cal_str = CalendarEventToString(event) local s = string.format("%s From: %s Sent - wxCalendarEvent \n\t%s\n\t%s\n\t%s\n\t%s\n\n", wx.wxNow(), obj_str, evt_str, cmd_str, date_str, cal_str) textCtrl:AppendText(s) end -- --------------------------------------------------------------------------- -- Create the window with the controls -- --------------------------------------------------------------------------- function CreateControlsWindow(parent) local scrollWin = wx.wxScrolledWindow(parent, wx.wxID_ANY, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxHSCROLL + wx.wxVSCROLL) -- Give the scrollwindow enough size so sizer works when calling Fit() scrollWin:SetScrollbars(15, 15, 400, 600, 0, 0, false) local mainSizer = wx.wxBoxSizer(wx.wxVERTICAL) local flexSizer = wx.wxFlexGridSizer(20, 2, 5, 5) flexSizer:AddGrowableCol(1) local statText = nil -- not used outside of this function -- ----------------------------------------------------------------------- local control = nil statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxButton") control = wx.wxButton(scrollWin, ID_BUTTON, "wxButton!", wx.wxDefaultPosition, wx.wxDefaultSize) flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) flexSizer:Add(control, 1, wx.wxALIGN_CENTER) -- ----------------------------------------------------------------------- statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxBitmapButton") control = wx.wxBitmapButton(scrollWin, ID_BITMAPBUTTON, bmp, wx.wxDefaultPosition, wx.wxDefaultSize) flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) flexSizer:Add(control, 1, wx.wxALIGN_CENTER) -- ----------------------------------------------------------------------- statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxCheckBox") control = wx.wxCheckBox(scrollWin, ID_CHECKBOX, "wxCheckBox", wx.wxDefaultPosition, wx.wxDefaultSize) flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) flexSizer:Add(control, 1, wx.wxALIGN_CENTER) -- ----------------------------------------------------------------------- statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxComboBox") control = wx.wxComboBox(scrollWin, ID_COMBOBOX, "wxComboBox!", wx.wxDefaultPosition, wx.wxDefaultSize, {"Item 1", "Item 2", "Item 3 text is long for default size"}, wx.wxTE_PROCESS_ENTER) -- generates event when enter is pressed control:Append("Appended item") control:Insert("Inserted at 0", 0) flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) flexSizer:Add(control, 1, wx.wxALIGN_CENTER) -- ----------------------------------------------------------------------- statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxBitmapComboBox") control = wx.wxBitmapComboBox(scrollWin, ID_BITMAPCOMBOBOX, "wxBitmapComboBox!", wx.wxDefaultPosition, wx.wxDefaultSize, {"Item 1", "Item 2", "Item 3 text is long for default size"}, wx.wxTE_PROCESS_ENTER) -- generates event when enter is pressed control:Append("Appended w/ bitmap", bmp) control:Insert("Inserted at 0 w/ bitmap", bmp, 0) control:SetItemBitmap(2, bmp) flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) flexSizer:Add(control, 1, wx.wxALIGN_CENTER) -- ----------------------------------------------------------------------- statText = wx.wxStaticText(scrollWin, wx.wxID_ANY, "wxCalendarCtrl") control = wx.wxCalendarCtrl(scrollWin, ID_CALENDARCTRL, wx.wxDefaultDateTime, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxCAL_SHOW_HOLIDAYS+wx.wxCAL_BORDER_SQUARE) flexSizer:Add(statText, 0, wx.wxALIGN_CENTER_VERTICAL, 5) flexSizer:Add(control, 1, wx.wxALIGN_CENTER) -- ----------------------------------------------------------------------- flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) flexSizer:Add(wx.wxStaticLine(scrollWin, wx.wxID_ANY), 1, wx.wxEXPAND) -- central event handler for all items that send wxCommandEvents -- Note this is the same as doing this --scrollWin:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnCommandEvent) for k, v in pairs(wxEVT_Names) do -- luckily all the wxCommandEvents start w/ wxEVT_COMMAND_ if string.find(v, "wxEVT_COMMAND_", 1, 1) == 1 then scrollWin:Connect(wx.wxID_ANY, k, OnCommandEvent) end end for k, v in pairs(wxEVT_Names) do if string.find(v, "wxEVT_CALENDAR_", 1, 1) == 1 then scrollWin:Connect(wx.wxID_ANY, k, OnCalendarEvent) end end -- ----------------------------------------------------------------------- mainSizer:Add(flexSizer, 1, wx.wxEXPAND) scrollWin:SetSizer(mainSizer) mainSizer:Fit(scrollWin) return scrollWin end -- --------------------------------------------------------------------------- -- Main function of the program -- --------------------------------------------------------------------------- function main() frame = wx.wxFrame( wx.NULL, -- no parent needed for toplevel windows wx.wxID_ANY, -- don't need a wxWindow ID "wxLua Controls Demo",-- caption on the frame wx.wxDefaultPosition, -- let system place the frame wx.wxSize(550, 450), -- set the size of the frame wx.wxDEFAULT_FRAME_STYLE ) -- use default frame styles local fileMenu = wx.wxMenu() fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program") local helpMenu = wx.wxMenu() helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua Controls Application") local menuBar = wx.wxMenuBar() menuBar:Append(fileMenu, "&File") menuBar:Append(helpMenu, "&Help") frame:SetMenuBar(menuBar) frame:CreateStatusBar(1) frame:SetStatusText("Welcome to wxLua.") -- connect the selection event of the exit menu item to an -- event handler that closes the window frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(true) end ) -- connect the selection event of the about menu item frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the Controls wxLua sample.\n'.. wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, frame) end ) -- ----------------------------------------------------------------------- splitter = wx.wxSplitterWindow(frame, wx.wxID_ANY) splitter:SetMinimumPaneSize(50) -- don't let it unsplit splitter:SetSashGravity(.8) controlsWin = CreateControlsWindow(splitter) textCtrl = wx.wxTextCtrl(splitter, wx.wxID_ANY, "", wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxTE_READONLY+wx.wxTE_MULTILINE+wx.wxTE_DONTWRAP) splitter:SplitHorizontally(controlsWin, textCtrl, 300) -- ----------------------------------------------------------------------- frame:Show(true) -- show the frame window end main() |
|
From: John L. <jr...@us...> - 2007-06-19 22:26:54
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10494/wxLua/modules/wxbind/src Modified Files: gdi.cpp picker.cpp windows.cpp wx_bind.cpp Log Message: Add samples for picker and other controls Fix some binding problems found from the samples Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** windows.cpp 18 Jun 2007 21:40:50 -0000 1.66 --- windows.cpp 19 Jun 2007 22:26:48 -0000 1.67 *************** *** 10511,10515 **** ! #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE // --------------------------------------------------------------------------- // Bind class wxCollapsiblePane --- 10511,10515 ---- ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE // --------------------------------------------------------------------------- // Bind class wxCollapsiblePane *************** *** 10539,10543 **** ! #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePane_Create[] = { &s_wxluatag_wxCollapsiblePane, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxCollapsiblePane_Create(lua_State *L); --- 10539,10543 ---- ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePane_Create[] = { &s_wxluatag_wxCollapsiblePane, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxCollapsiblePane_Create(lua_State *L); *************** *** 10576,10580 **** } ! #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePane_Expand[] = { &s_wxluatag_wxCollapsiblePane, NULL }; --- 10576,10580 ---- } ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePane_Expand[] = { &s_wxluatag_wxCollapsiblePane, NULL }; *************** *** 10648,10652 **** ! #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePane_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxCollapsiblePane_constructor1(lua_State *L); --- 10648,10652 ---- ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePane_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxCollapsiblePane_constructor1(lua_State *L); *************** *** 10686,10690 **** } ! #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxCollapsiblePane_constructor(lua_State *L); --- 10686,10690 ---- } ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxCollapsiblePane_constructor(lua_State *L); *************** *** 10709,10713 **** ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) static int LUACALL wxLua_wxCollapsiblePane_constructor_overload(lua_State *L); // function overload table --- 10709,10713 ---- ! #if (((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) static int LUACALL wxLua_wxCollapsiblePane_constructor_overload(lua_State *L); // function overload table *************** *** 10716,10722 **** { wxLua_wxCollapsiblePane_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None }, ! #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxCollapsiblePane_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatagArray_wxLua_wxCollapsiblePane_constructor1 }, ! #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxCollapsiblePane_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; --- 10716,10722 ---- { wxLua_wxCollapsiblePane_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 8, s_wxluaargArray_None }, ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxCollapsiblePane_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatagArray_wxLua_wxCollapsiblePane_constructor1 }, ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxCollapsiblePane_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; *************** *** 10730,10734 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) // Map Lua Class Methods to C Binding Functions --- 10730,10734 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) // Map Lua Class Methods to C Binding Functions *************** *** 10736,10742 **** { "Collapse", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_Collapse, 1, NULL }, ! #if ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_Create, 1, NULL }, ! #endif // ((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect) { "Expand", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_Expand, 1, NULL }, --- 10736,10742 ---- { "Collapse", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_Collapse, 1, NULL }, ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_Create, 1, NULL }, ! #endif // ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { "Expand", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_Expand, 1, NULL }, *************** *** 10745,10751 **** { "IsExpanded", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_IsExpanded, 1, NULL }, ! #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { "wxCollapsiblePane", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxCollapsiblePane_constructor_overload, s_wxluafunc_wxLua_wxCollapsiblePane_constructor_overload_count, 0 }, ! #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE)) && (wxLUA_USE_wxPointSizeRect))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { 0, 0, 0, 0 }, --- 10745,10751 ---- { "IsExpanded", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxCollapsiblePane_IsExpanded, 1, NULL }, ! #if (((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { "wxCollapsiblePane", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxCollapsiblePane_constructor_overload, s_wxluafunc_wxLua_wxCollapsiblePane_constructor_overload_count, 0 }, ! #endif // (((wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { 0, 0, 0, 0 }, *************** *** 10754,10761 **** int wxCollapsiblePane_methodCount = sizeof(wxCollapsiblePane_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE ! #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE // --------------------------------------------------------------------------- // Bind class wxCollapsiblePaneEvent --- 10754,10761 ---- int wxCollapsiblePane_methodCount = sizeof(wxCollapsiblePane_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE // --------------------------------------------------------------------------- // Bind class wxCollapsiblePaneEvent *************** *** 10817,10821 **** ! #if (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePaneEvent_constructor1[] = { &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxCollapsiblePaneEvent_constructor1(lua_State *L); --- 10817,10821 ---- ! #if (wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) static wxLuaArgTag s_wxluatagArray_wxLua_wxCollapsiblePaneEvent_constructor1[] = { &s_wxluatag_wxObject, &s_wxluaarg_Number, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxCollapsiblePaneEvent_constructor1(lua_State *L); *************** *** 10843,10847 **** } ! #endif // (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject) static int LUACALL wxLua_wxCollapsiblePaneEvent_constructor(lua_State *L); --- 10843,10847 ---- } ! #endif // (wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) static int LUACALL wxLua_wxCollapsiblePaneEvent_constructor(lua_State *L); *************** *** 10866,10870 **** ! #if ((wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) static int LUACALL wxLua_wxCollapsiblePaneEvent_constructor_overload(lua_State *L); // function overload table --- 10866,10870 ---- ! #if ((wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) static int LUACALL wxLua_wxCollapsiblePaneEvent_constructor_overload(lua_State *L); // function overload table *************** *** 10873,10879 **** { wxLua_wxCollapsiblePaneEvent_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None }, ! #if (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject) { wxLua_wxCollapsiblePaneEvent_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxCollapsiblePaneEvent_constructor1 }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject) { wxLua_wxCollapsiblePaneEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; --- 10873,10879 ---- { wxLua_wxCollapsiblePaneEvent_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 3, s_wxluaargArray_None }, ! #if (wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { wxLua_wxCollapsiblePaneEvent_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxCollapsiblePaneEvent_constructor1 }, ! #endif // (wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { wxLua_wxCollapsiblePaneEvent_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; *************** *** 10887,10891 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) // Map Lua Class Methods to C Binding Functions --- 10887,10891 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // ((wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) // Map Lua Class Methods to C Binding Functions *************** *** 10895,10901 **** { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxCollapsiblePaneEvent_delete, 1, NULL }, ! #if ((wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { "wxCollapsiblePaneEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxCollapsiblePaneEvent_constructor_overload, s_wxluafunc_wxLua_wxCollapsiblePaneEvent_constructor_overload_count, 0 }, ! #endif // ((wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) && (wxLUA_USE_wxObject))||(wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { 0, 0, 0, 0 }, --- 10895,10901 ---- { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxCollapsiblePaneEvent_delete, 1, NULL }, ! #if ((wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { "wxCollapsiblePaneEvent", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxCollapsiblePaneEvent_constructor_overload, s_wxluafunc_wxLua_wxCollapsiblePaneEvent_constructor_overload_count, 0 }, ! #endif // ((wxLUA_USE_wxObject) && (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE) { 0, 0, 0, 0 }, *************** *** 10904,10908 **** int wxCollapsiblePaneEvent_methodCount = sizeof(wxCollapsiblePaneEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE --- 10904,10908 ---- int wxCollapsiblePaneEvent_methodCount = sizeof(wxCollapsiblePaneEvent_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** wx_bind.cpp 19 Jun 2007 13:58:16 -0000 1.113 --- wx_bind.cpp 19 Jun 2007 22:26:49 -0000 1.114 *************** *** 108,126 **** { "wxEVT_COMMAND_CHOICE_SELECTED", &wxEVT_COMMAND_CHOICE_SELECTED, &s_wxluatag_wxCommandEvent }, ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxEVT_COMMAND_COLOURPICKER_CHANGED", &wxEVT_COMMAND_COLOURPICKER_CHANGED, &s_wxluatag_wxColourPickerEvent }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxEVT_COMMAND_COMBOBOX_SELECTED", &wxEVT_COMMAND_COMBOBOX_SELECTED, &s_wxluatag_wxCommandEvent }, ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxEVT_COMMAND_DIRPICKER_CHANGED", &wxEVT_COMMAND_DIRPICKER_CHANGED, &s_wxluatag_wxFileDirPickerEvent }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxEVT_COMMAND_ENTER", &wxEVT_COMMAND_ENTER, &s_wxluatag_wxCommandEvent }, ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxEVT_COMMAND_FILEPICKER_CHANGED", &wxEVT_COMMAND_FILEPICKER_CHANGED, &s_wxluatag_wxFileDirPickerEvent }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog --- 108,130 ---- { "wxEVT_COMMAND_CHOICE_SELECTED", &wxEVT_COMMAND_CHOICE_SELECTED, &s_wxluatag_wxCommandEvent }, ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE ! { "wxEVT_COMMAND_COLLPANE_CHANGED", &wxEVT_COMMAND_COLLPANE_CHANGED, &s_wxluatag_wxCollapsiblePaneEvent }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE ! ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxEVT_COMMAND_COLOURPICKER_CHANGED", &wxEVT_COMMAND_COLOURPICKER_CHANGED, &s_wxluatag_wxColourPickerEvent }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxEVT_COMMAND_COMBOBOX_SELECTED", &wxEVT_COMMAND_COMBOBOX_SELECTED, &s_wxluatag_wxCommandEvent }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxEVT_COMMAND_DIRPICKER_CHANGED", &wxEVT_COMMAND_DIRPICKER_CHANGED, &s_wxluatag_wxFileDirPickerEvent }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxEVT_COMMAND_ENTER", &wxEVT_COMMAND_ENTER, &s_wxluatag_wxCommandEvent }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxEVT_COMMAND_FILEPICKER_CHANGED", &wxEVT_COMMAND_FILEPICKER_CHANGED, &s_wxluatag_wxFileDirPickerEvent }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog *************** *** 132,138 **** #endif // wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) { "wxEVT_COMMAND_FONTPICKER_CHANGED", &wxEVT_COMMAND_FONTPICKER_CHANGED, &s_wxluatag_wxFontPickerEvent }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl --- 136,142 ---- #endif // wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) { "wxEVT_COMMAND_FONTPICKER_CHANGED", &wxEVT_COMMAND_FONTPICKER_CHANGED, &s_wxluatag_wxFontPickerEvent }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) #if wxCHECK_VERSION(2,8,0) && wxUSE_HYPERLINKCTRL && wxLUA_USE_wxHyperlinkCtrl *************** *** 765,772 **** #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL ! #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 { "wxAC_DEFAULT_STYLE", wxAC_DEFAULT_STYLE }, { "wxAC_NO_AUTORESIZE", wxAC_NO_AUTORESIZE }, ! #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 { "wxADJUST_MINSIZE", wxADJUST_MINSIZE }, --- 769,776 ---- #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxAC_DEFAULT_STYLE", wxAC_DEFAULT_STYLE }, { "wxAC_NO_AUTORESIZE", wxAC_NO_AUTORESIZE }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxADJUST_MINSIZE", wxADJUST_MINSIZE }, *************** *** 802,811 **** #endif // wxLUA_USE_wxDC ! #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 { "wxANIMATION_TYPE_ANI", wxANIMATION_TYPE_ANI }, { "wxANIMATION_TYPE_ANY", wxANIMATION_TYPE_ANY }, { "wxANIMATION_TYPE_GIF", wxANIMATION_TYPE_GIF }, { "wxANIMATION_TYPE_INVALID", wxANIMATION_TYPE_INVALID }, ! #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 { "wxARCH_32", wxARCH_32 }, --- 806,815 ---- #endif // wxLUA_USE_wxDC ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxANIMATION_TYPE_ANI", wxANIMATION_TYPE_ANI }, { "wxANIMATION_TYPE_ANY", wxANIMATION_TYPE_ANY }, { "wxANIMATION_TYPE_GIF", wxANIMATION_TYPE_GIF }, { "wxANIMATION_TYPE_INVALID", wxANIMATION_TYPE_INVALID }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxARCH_32", wxARCH_32 }, *************** *** 1045,1053 **** #endif // (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxFrame) ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxCLRP_DEFAULT_STYLE", wxCLRP_DEFAULT_STYLE }, { "wxCLRP_SHOW_LABEL", wxCLRP_SHOW_LABEL }, { "wxCLRP_USE_TEXTCTRL", wxCLRP_USE_TEXTCTRL }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxCOLOURED", wxCOLOURED }, --- 1049,1057 ---- #endif // (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxFrame) ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxCLRP_DEFAULT_STYLE", wxCLRP_DEFAULT_STYLE }, { "wxCLRP_SHOW_LABEL", wxCLRP_SHOW_LABEL }, { "wxCLRP_USE_TEXTCTRL", wxCLRP_USE_TEXTCTRL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxCOLOURED", wxCOLOURED }, *************** *** 1072,1078 **** #endif // !wxCHECK_VERSION(2,8,0) ! #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE { "wxCP_DEFAULT_STYLE", wxCP_DEFAULT_STYLE }, ! #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE #if wxLUA_USE_wxColourPenBrush --- 1076,1082 ---- #endif // !wxCHECK_VERSION(2,8,0) ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE { "wxCP_DEFAULT_STYLE", wxCP_DEFAULT_STYLE }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE #if wxLUA_USE_wxColourPenBrush *************** *** 1233,1242 **** #endif // wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxDIRP_CHANGE_DIR", wxDIRP_CHANGE_DIR }, { "wxDIRP_DEFAULT_STYLE", wxDIRP_DEFAULT_STYLE }, { "wxDIRP_DIR_MUST_EXIST", wxDIRP_DIR_MUST_EXIST }, { "wxDIRP_USE_TEXTCTRL", wxDIRP_USE_TEXTCTRL }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxLUA_USE_wxDir --- 1237,1246 ---- #endif // wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxDIRP_CHANGE_DIR", wxDIRP_CHANGE_DIR }, { "wxDIRP_DEFAULT_STYLE", wxDIRP_DEFAULT_STYLE }, { "wxDIRP_DIR_MUST_EXIST", wxDIRP_DIR_MUST_EXIST }, { "wxDIRP_USE_TEXTCTRL", wxDIRP_USE_TEXTCTRL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxLUA_USE_wxDir *************** *** 1265,1269 **** { "wxDOWN", wxDOWN }, ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) { "wxDP_ALLOWNONE", wxDP_ALLOWNONE }, { "wxDP_DEFAULT", wxDP_DEFAULT }, --- 1269,1273 ---- { "wxDOWN", wxDOWN }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) { "wxDP_ALLOWNONE", wxDP_ALLOWNONE }, { "wxDP_DEFAULT", wxDP_DEFAULT }, *************** *** 1271,1275 **** { "wxDP_SHOWCENTURY", wxDP_SHOWCENTURY }, { "wxDP_SPIN", wxDP_SPIN }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) #if wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE --- 1275,1279 ---- { "wxDP_SHOWCENTURY", wxDP_SHOWCENTURY }, { "wxDP_SPIN", wxDP_SPIN }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) #if wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE *************** *** 1312,1319 **** { "wxEVENT_PROPAGATE_NONE", wxEVENT_PROPAGATE_NONE }, - #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE - { "wxEVT_COMMAND_COLLPANE_CHANGED", wxEVT_COMMAND_COLLPANE_CHANGED }, - #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE - #if wxLUA_USE_wxProcess { "wxEXEC_ASYNC", wxEXEC_ASYNC }, --- 1316,1319 ---- *************** *** 1385,1389 **** #endif // wxLUA_USE_wxDC ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFLP_CHANGE_DIR", wxFLP_CHANGE_DIR }, { "wxFLP_DEFAULT_STYLE", wxFLP_DEFAULT_STYLE }, --- 1385,1389 ---- #endif // wxLUA_USE_wxDC ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFLP_CHANGE_DIR", wxFLP_CHANGE_DIR }, { "wxFLP_DEFAULT_STYLE", wxFLP_DEFAULT_STYLE }, *************** *** 1393,1404 **** { "wxFLP_SAVE", wxFLP_SAVE }, { "wxFLP_USE_TEXTCTRL", wxFLP_USE_TEXTCTRL }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) { "wxFNTP_DEFAULT_STYLE", wxFNTP_DEFAULT_STYLE }, { "wxFNTP_FONTDESC_AS_LABEL", wxFNTP_FONTDESC_AS_LABEL }, { "wxFNTP_MAXPOINT_SIZE", wxFNTP_MAXPOINT_SIZE }, { "wxFNTP_USE_TEXTCTRL", wxFNTP_USE_TEXTCTRL }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) #if wxLUA_USE_wxFont --- 1393,1405 ---- { "wxFLP_SAVE", wxFLP_SAVE }, { "wxFLP_USE_TEXTCTRL", wxFLP_USE_TEXTCTRL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) { "wxFNTP_DEFAULT_STYLE", wxFNTP_DEFAULT_STYLE }, { "wxFNTP_FONTDESC_AS_LABEL", wxFNTP_FONTDESC_AS_LABEL }, { "wxFNTP_MAXPOINT_SIZE", wxFNTP_MAXPOINT_SIZE }, + { "wxFNTP_USEFONT_FOR_LABEL", wxFNTP_USEFONT_FOR_LABEL }, { "wxFNTP_USE_TEXTCTRL", wxFNTP_USE_TEXTCTRL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) #if wxLUA_USE_wxFont *************** *** 2741,2747 **** #endif // wxLUA_USE_wxFileName ! #if wxchkver_2_8 && wxLUA_USE_wxPicker { "wxPB_USE_TEXTCTRL", wxPB_USE_TEXTCTRL }, ! #endif // wxchkver_2_8 && wxLUA_USE_wxPicker #if wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog --- 2742,2748 ---- #endif // wxLUA_USE_wxFileName ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker { "wxPB_USE_TEXTCTRL", wxPB_USE_TEXTCTRL }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker #if wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog *************** *** 3668,3671 **** --- 3669,3673 ---- #endif // wxLUA_USE_wxArtProvider + { "wxDirSelectorPromptStr", wxDirSelectorPromptStr }, { "wxFILE_SEP_DSK", wxT(":") }, { "wxFILE_SEP_EXT", wxT(".") }, *************** *** 3676,3679 **** --- 3678,3686 ---- { "wxFILE_SEP_PATH_VMS", wxT(".") }, + #if wxLUA_USE_wxFileDialog && wxUSE_FILEDLG + { "wxFileSelectorDefaultWildcardStr", wxFileSelectorDefaultWildcardStr }, + { "wxFileSelectorPromptStr", wxFileSelectorPromptStr }, + #endif // wxLUA_USE_wxFileDialog && wxUSE_FILEDLG + #if wxLUA_USE_wxGrid && wxUSE_GRID { "wxGRID_VALUE_BOOL", wxGRID_VALUE_BOOL }, *************** *** 6697,6704 **** { "wxActivateEvent", wxActivateEvent_methods, wxActivateEvent_methodCount, CLASSINFO(wxActivateEvent), &s_wxluatag_wxActivateEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 { "wxAnimation", wxAnimation_methods, wxAnimation_methodCount, CLASSINFO(wxAnimation), &s_wxluatag_wxAnimation, "wxGDIObject", NULL ,s_wxluadefineArray_None, 0, }, { "wxAnimationCtrl", wxAnimationCtrl_methods, wxAnimationCtrl_methodCount, CLASSINFO(wxAnimationCtrl), &s_wxluatag_wxAnimationCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 #if wxLUA_USE_wxApp --- 6704,6711 ---- { "wxActivateEvent", wxActivateEvent_methods, wxActivateEvent_methodCount, CLASSINFO(wxActivateEvent), &s_wxluatag_wxActivateEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL { "wxAnimation", wxAnimation_methods, wxAnimation_methodCount, CLASSINFO(wxAnimation), &s_wxluatag_wxAnimation, "wxGDIObject", NULL ,s_wxluadefineArray_None, 0, }, { "wxAnimationCtrl", wxAnimationCtrl_methods, wxAnimationCtrl_methodCount, CLASSINFO(wxAnimationCtrl), &s_wxluatag_wxAnimationCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL #if wxLUA_USE_wxApp *************** *** 6847,6854 **** { "wxCloseEvent", wxCloseEvent_methods, wxCloseEvent_methodCount, CLASSINFO(wxCloseEvent), &s_wxluatag_wxCloseEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE { "wxCollapsiblePane", wxCollapsiblePane_methods, wxCollapsiblePane_methodCount, CLASSINFO(wxCollapsiblePane), &s_wxluatag_wxCollapsiblePane, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, { "wxCollapsiblePaneEvent", wxCollapsiblePaneEvent_methods, wxCollapsiblePaneEvent_methodCount, CLASSINFO(wxCollapsiblePaneEvent), &s_wxluatag_wxCollapsiblePaneEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE #if wxLUA_USE_wxColourPenBrush --- 6854,6861 ---- { "wxCloseEvent", wxCloseEvent_methods, wxCloseEvent_methodCount, CLASSINFO(wxCloseEvent), &s_wxluatag_wxCloseEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE { "wxCollapsiblePane", wxCollapsiblePane_methods, wxCollapsiblePane_methodCount, CLASSINFO(wxCollapsiblePane), &s_wxluatag_wxCollapsiblePane, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, { "wxCollapsiblePaneEvent", wxCollapsiblePaneEvent_methods, wxCollapsiblePaneEvent_methodCount, CLASSINFO(wxCollapsiblePaneEvent), &s_wxluatag_wxCollapsiblePaneEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE #if wxLUA_USE_wxColourPenBrush *************** *** 6868,6875 **** #endif // wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxColourPickerCtrl", wxColourPickerCtrl_methods, wxColourPickerCtrl_methodCount, CLASSINFO(wxColourPickerCtrl), &s_wxluatag_wxColourPickerCtrl, "wxPickerBase", NULL ,s_wxluadefineArray_None, 0, }, { "wxColourPickerEvent", wxColourPickerEvent_methods, wxColourPickerEvent_methodCount, CLASSINFO(wxColourPickerEvent), &s_wxluatag_wxColourPickerEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) #if wxLUA_USE_wxComboBox && wxUSE_COMBOBOX --- 6875,6882 ---- #endif // wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) { "wxColourPickerCtrl", wxColourPickerCtrl_methods, wxColourPickerCtrl_methodCount, CLASSINFO(wxColourPickerCtrl), &s_wxluatag_wxColourPickerCtrl, "wxPickerBase", NULL ,s_wxluadefineArray_None, 0, }, { "wxColourPickerEvent", wxColourPickerEvent_methods, wxColourPickerEvent_methodCount, CLASSINFO(wxColourPickerEvent), &s_wxluatag_wxColourPickerEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL) #if wxLUA_USE_wxComboBox && wxUSE_COMBOBOX *************** *** 6947,6953 **** #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) { "wxDatePickerCtrl", wxDatePickerCtrl_methods, wxDatePickerCtrl_methodCount, CLASSINFO(wxDatePickerCtrl), &s_wxluatag_wxDatePickerCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME --- 6954,6960 ---- #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) { "wxDatePickerCtrl", wxDatePickerCtrl_methods, wxDatePickerCtrl_methodCount, CLASSINFO(wxDatePickerCtrl), &s_wxluatag_wxDatePickerCtrl, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME *************** *** 6977,6983 **** #endif // wxLUA_USE_wxDirDialog && wxUSE_DIRDLG ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxDirPickerCtrl", wxDirPickerCtrl_methods, wxDirPickerCtrl_methodCount, CLASSINFO(wxDirPickerCtrl), &s_wxluatag_wxDirPickerCtrl, "wxFileDirPickerCtrlBase", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY --- 6984,6990 ---- #endif // wxLUA_USE_wxDirDialog && wxUSE_DIRDLG ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxDirPickerCtrl", wxDirPickerCtrl_methods, wxDirPickerCtrl_methodCount, CLASSINFO(wxDirPickerCtrl), &s_wxluatag_wxDirPickerCtrl, "wxFileDirPickerCtrlBase", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY *************** *** 7032,7039 **** #endif // wxLUA_USE_wxFileDialog && wxUSE_FILEDLG ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFileDirPickerCtrlBase", wxFileDirPickerCtrlBase_methods, wxFileDirPickerCtrlBase_methodCount, CLASSINFO(wxFileDirPickerCtrlBase), &s_wxluatag_wxFileDirPickerCtrlBase, "wxPickerBase", NULL ,s_wxluadefineArray_None, 0, }, { "wxFileDirPickerEvent", wxFileDirPickerEvent_methods, wxFileDirPickerEvent_methodCount, CLASSINFO(wxFileDirPickerEvent), &s_wxluatag_wxFileDirPickerEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE --- 7039,7046 ---- #endif // wxLUA_USE_wxFileDialog && wxUSE_FILEDLG ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFileDirPickerCtrlBase", wxFileDirPickerCtrlBase_methods, wxFileDirPickerCtrlBase_methodCount, CLASSINFO(wxFileDirPickerCtrlBase), &s_wxluatag_wxFileDirPickerCtrlBase, "wxPickerBase", NULL ,s_wxluadefineArray_None, 0, }, { "wxFileDirPickerEvent", wxFileDirPickerEvent_methods, wxFileDirPickerEvent_methodCount, CLASSINFO(wxFileDirPickerEvent), &s_wxluatag_wxFileDirPickerEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) #if wxLUA_USE_wxFileHistory && wxUSE_DOC_VIEW_ARCHITECTURE *************** *** 7053,7059 **** #endif // wxUSE_STREAMS ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFilePickerCtrl", wxFilePickerCtrl_methods, wxFilePickerCtrl_methodCount, CLASSINFO(wxFilePickerCtrl), &s_wxluatag_wxFilePickerCtrl, "wxFileDirPickerCtrlBase", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFileType", wxFileType_methods, wxFileType_methodCount, NULL, &s_wxluatag_wxFileType, NULL, NULL ,s_wxluadefineArray_None, 0, }, --- 7060,7066 ---- #endif // wxUSE_STREAMS ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFilePickerCtrl", wxFilePickerCtrl_methods, wxFilePickerCtrl_methodCount, CLASSINFO(wxFilePickerCtrl), &s_wxluatag_wxFilePickerCtrl, "wxFileDirPickerCtrlBase", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL )) { "wxFileType", wxFileType_methods, wxFileType_methodCount, NULL, &s_wxluatag_wxFileType, NULL, NULL ,s_wxluadefineArray_None, 0, }, *************** *** 7094,7101 **** #endif // wxLUA_USE_wxFontMapper ! #if (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) { "wxFontPickerCtrl", wxFontPickerCtrl_methods, wxFontPickerCtrl_methodCount, CLASSINFO(wxFontPickerCtrl), &s_wxluatag_wxFontPickerCtrl, "wxPickerBase", NULL ,s_wxluadefineArray_None, 0, }, { "wxFontPickerEvent", wxFontPickerEvent_methods, wxFontPickerEvent_methodCount, CLASSINFO(wxFontPickerEvent), &s_wxluatag_wxFontPickerEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) #if wxLUA_USE_wxFrame --- 7101,7108 ---- #endif // wxLUA_USE_wxFontMapper ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) { "wxFontPickerCtrl", wxFontPickerCtrl_methods, wxFontPickerCtrl_methodCount, CLASSINFO(wxFontPickerCtrl), &s_wxluatag_wxFontPickerCtrl, "wxPickerBase", NULL ,s_wxluadefineArray_None, 0, }, { "wxFontPickerEvent", wxFontPickerEvent_methods, wxFontPickerEvent_methodCount, CLASSINFO(wxFontPickerEvent), &s_wxluatag_wxFontPickerEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL) #if wxLUA_USE_wxFrame *************** *** 7497,7503 **** #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxPenList) ! #if wxchkver_2_8 && wxLUA_USE_wxPicker { "wxPickerBase", wxPickerBase_methods, wxPickerBase_methodCount, CLASSINFO(wxPickerBase), &s_wxluatag_wxPickerBase, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxchkver_2_8 && wxLUA_USE_wxPicker { "wxPlatformInfo", wxPlatformInfo_methods, wxPlatformInfo_methodCount, NULL, &s_wxluatag_wxPlatformInfo, NULL, NULL ,s_wxluadefineArray_None, 0, }, --- 7504,7510 ---- #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxPenList) ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker { "wxPickerBase", wxPickerBase_methods, wxPickerBase_methodCount, CLASSINFO(wxPickerBase), &s_wxluatag_wxPickerBase, "wxControl", NULL ,s_wxluadefineArray_None, 0, }, ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker { "wxPlatformInfo", wxPlatformInfo_methods, wxPlatformInfo_methodCount, NULL, &s_wxluatag_wxPlatformInfo, NULL, NULL ,s_wxluadefineArray_None, 0, }, Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** gdi.cpp 18 Jun 2007 21:40:42 -0000 1.75 --- gdi.cpp 19 Jun 2007 22:26:47 -0000 1.76 *************** *** 14852,14856 **** ! #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 // --------------------------------------------------------------------------- // Bind class wxAnimation --- 14852,14856 ---- ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL // --------------------------------------------------------------------------- // Bind class wxAnimation *************** *** 14881,14885 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrame[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxAnimation_GetFrame(lua_State *L); --- 14881,14885 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrame[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxAnimation_GetFrame(lua_State *L); *************** *** 14905,14909 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrameCount[] = { &s_wxluatag_wxAnimation, NULL }; --- 14905,14909 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetFrameCount[] = { &s_wxluatag_wxAnimation, NULL }; *************** *** 14926,14930 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetSize[] = { &s_wxluatag_wxAnimation, NULL }; static int LUACALL wxLua_wxAnimation_GetSize(lua_State *L); --- 14926,14930 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_GetSize[] = { &s_wxluatag_wxAnimation, NULL }; static int LUACALL wxLua_wxAnimation_GetSize(lua_State *L); *************** *** 14948,14952 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_IsOk[] = { &s_wxluatag_wxAnimation, NULL }; --- 14948,14952 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_IsOk[] = { &s_wxluatag_wxAnimation, NULL }; *************** *** 14969,14973 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_Load[] = { &s_wxluatag_wxAnimation, &s_wxluatag_wxInputStream, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxAnimation_Load(lua_State *L); --- 14969,14973 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_Load[] = { &s_wxluatag_wxAnimation, &s_wxluatag_wxInputStream, &s_wxluaarg_Integer, NULL }; static int LUACALL wxLua_wxAnimation_Load(lua_State *L); *************** *** 14994,14998 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_LoadFile[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; --- 14994,14998 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimation_LoadFile[] = { &s_wxluatag_wxAnimation, &s_wxluaarg_String, &s_wxluaarg_Integer, NULL }; *************** *** 15087,15091 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) static int LUACALL wxLua_wxAnimation_constructor_overload(lua_State *L); // function overload table --- 15087,15091 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimation_constructor_overload(lua_State *L); // function overload table *************** *** 15106,15110 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) // Map Lua Class Methods to C Binding Functions --- 15106,15110 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) // Map Lua Class Methods to C Binding Functions *************** *** 15112,15136 **** { "GetDelay", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetDelay, 1, NULL }, ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrame", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrame, 1, NULL }, ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrameCount", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrameCount, 1, NULL }, ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) { "GetSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetSize, 1, NULL }, ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) { "IsOk", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_IsOk, 1, NULL }, ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxUSE_STREAMS) { "Load", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_Load, 1, NULL }, ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxUSE_STREAMS) { "LoadFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_LoadFile, 1, NULL }, ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) { "wxAnimation", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAnimation_constructor_overload, s_wxluafunc_wxLua_wxAnimation_constructor_overload_count, 0 }, ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) { 0, 0, 0, 0 }, --- 15112,15136 ---- { "GetDelay", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetDelay, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrame", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrame, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxImage && wxUSE_IMAGE) { "GetFrameCount", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetFrameCount, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "GetSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_GetSize, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { "IsOk", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_IsOk, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) { "Load", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_Load, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxUSE_STREAMS) { "LoadFile", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAnimation_LoadFile, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { "wxAnimation", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAnimation_constructor_overload, s_wxluafunc_wxLua_wxAnimation_constructor_overload_count, 0 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) { 0, 0, 0, 0 }, *************** *** 15139,15146 **** int wxAnimation_methodCount = sizeof(wxAnimation_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 ! #if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 // --------------------------------------------------------------------------- // Bind class wxAnimationCtrl --- 15139,15146 ---- int wxAnimation_methodCount = sizeof(wxAnimation_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL ! #if wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL // --------------------------------------------------------------------------- // Bind class wxAnimationCtrl *************** *** 15150,15154 **** int s_wxluatag_wxAnimationCtrl = -1; ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Create[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_Create(lua_State *L); --- 15150,15154 ---- int s_wxluatag_wxAnimationCtrl = -1; ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Create[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_Create(lua_State *L); *************** *** 15185,15189 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetAnimation[] = { &s_wxluatag_wxAnimationCtrl, NULL }; --- 15185,15189 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetAnimation[] = { &s_wxluatag_wxAnimationCtrl, NULL }; *************** *** 15209,15213 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, NULL }; static int LUACALL wxLua_wxAnimationCtrl_GetInactiveBitmap(lua_State *L); --- 15209,15213 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_GetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, NULL }; static int LUACALL wxLua_wxAnimationCtrl_GetInactiveBitmap(lua_State *L); *************** *** 15231,15235 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_IsPlaying[] = { &s_wxluatag_wxAnimationCtrl, NULL }; --- 15231,15235 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_IsPlaying[] = { &s_wxluatag_wxAnimationCtrl, NULL }; *************** *** 15335,15339 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_SetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxBitmap, NULL }; static int LUACALL wxLua_wxAnimationCtrl_SetInactiveBitmap(lua_State *L); --- 15335,15339 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_SetInactiveBitmap[] = { &s_wxluatag_wxAnimationCtrl, &s_wxluatag_wxBitmap, NULL }; static int LUACALL wxLua_wxAnimationCtrl_SetInactiveBitmap(lua_State *L); *************** *** 15353,15357 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Stop[] = { &s_wxluatag_wxAnimationCtrl, NULL }; --- 15353,15357 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxBitmap) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_Stop[] = { &s_wxluatag_wxAnimationCtrl, NULL }; *************** *** 15371,15375 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_constructor1(lua_State *L); --- 15371,15375 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxAnimation, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxAnimationCtrl_constructor1(lua_State *L); *************** *** 15407,15411 **** } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxAnimationCtrl_constructor(lua_State *L); --- 15407,15411 ---- } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxAnimationCtrl_constructor(lua_State *L); *************** *** 15430,15434 **** ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) static int LUACALL wxLua_wxAnimationCtrl_LoadFile_overload(lua_State *L); // function overload table --- 15430,15434 ---- ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimationCtrl_LoadFile_overload(lua_State *L); // function overload table *************** *** 15448,15454 **** return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) ! #if ((wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) static int LUACALL wxLua_wxAnimationCtrl_constructor_overload(lua_State *L); // function overload table --- 15448,15454 ---- return wxlState.CallOverloadedFunction(&overload_method); } ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) ! #if ((wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect))||(wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) static int LUACALL wxLua_wxAnimationCtrl_constructor_overload(lua_State *L); // function overload table *************** *** 15457,15463 **** { wxLua_wxAnimationCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 7, s_wxluaargArray_None }, ! #if (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 7, s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1 }, ! #endif // (wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; --- 15457,15463 ---- { wxLua_wxAnimationCtrl_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 7, s_wxluaargArray_None }, ! #if (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 7, s_wxluatagArray_wxLua_wxAnimationCtrl_constructor1 }, ! #endif // (wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxAnimationCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; ***... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-06-19 15:20:46
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32404/docs Modified Files: wxluaref.html Log Message: Add picker controls Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxluaref.html 18 Jun 2007 21:40:33 -0000 1.29 --- wxluaref.html 19 Jun 2007 15:20:29 -0000 1.30 *************** *** 3412,3415 **** --- 3412,3416 ---- <a href="#wxwidgets_mdi.i">wxwidgets/mdi.i</a><br> <a href="#wxwidgets_menutool.i">wxwidgets/menutool.i</a><br> + <a href="#wxwidgets_picker.i">wxwidgets/picker.i</a><br> <a href="#wxwidgets_print.i">wxwidgets/print.i</a><br> <a href="#wxwidgets_regex.i">wxwidgets/regex.i</a><br> *************** *** 7941,7945 **** <font color=#AA0000><i>%function</i> <a href="#wxWindow">wxWindow</a>* wxFindWindowAtPoint(const <a href="#wxPoint">wxPoint</a>& pt)</font><br> <font color=#AA0000><i>%function</i> <a href="#wxWindow">wxWindow</a>* wxFindWindowAtPointer(<a href="#wxPoint">wxPoint</a>& pt)</font><br> ! <font color=#AA0000><i>%win</i> <i>%function</i> <a href="#wxWindow">wxWindow</a>* wxGetActiveWindow()</font><br> <font color=#009900>// <a href="#wxBatteryState">wxBatteryState</a> wxGetBatteryState()</font><br> <font color=#009900>// X only <i>%function</i> <a href="#wxString">wxString</a> wxGetDisplayName()</font><br> --- 7942,7946 ---- <font color=#AA0000><i>%function</i> <a href="#wxWindow">wxWindow</a>* wxFindWindowAtPoint(const <a href="#wxPoint">wxPoint</a>& pt)</font><br> <font color=#AA0000><i>%function</i> <a href="#wxWindow">wxWindow</a>* wxFindWindowAtPointer(<a href="#wxPoint">wxPoint</a>& pt)</font><br> ! <font color=#AA0000><i>%wxchkver_2_8_4</i> <i>%function</i> <a href="#wxWindow">wxWindow</a>* wxGetActiveWindow()</font><br> <font color=#009900>// <a href="#wxBatteryState">wxBatteryState</a> wxGetBatteryState()</font><br> <font color=#009900>// X only <i>%function</i> <a href="#wxString">wxString</a> wxGetDisplayName()</font><br> *************** *** 15763,15766 **** --- 15764,16027 ---- <br><HR> + <h2><a name="wxwidgets_picker.i">wxwidgets/picker.i</a></h2> + <HR> + + <font color=#009900>// ===========================================================================</font><br> + <font color=#009900>// Purpose: wxPickerXXX controls</font><br> + <font color=#009900>// Author: John Labenski</font><br> + <font color=#009900>// Created: 14/11/2001</font><br> + <font color=#009900>// Copyright: (c) 2007 John Labenski</font><br> + <font color=#009900>// Licence: wxWidgets licence</font><br> + <font color=#009900>// wxWidgets: Updated to 2.6.3</font><br> + <font color=#009900>// ===========================================================================</font><br> + <br> + <i>%if</i> wxchkver_2_8 && wxLUA_USE_wxPicker<br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxPickerBase">wxPickerBase</a></font><br> + <br> + <i>%include</i> "wx/pickerbase.h"<br> + <br> + <font color=#006666><i>%define</i> wxPB_USE_TEXTCTRL</font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxPickerBase">wxPickerBase</a>, <a href="#wxControl">wxControl</a></font></b> + <blockquote> + <font color=#009900>// No construcor - this is a base class</font><br> + <br> + <font color=#009900>// margin between the text control and the picker</font><br> + void SetInternalMargin(int newmargin)<br> + int GetInternalMargin() const<br> + <br> + <font color=#009900>// proportion of the text control</font><br> + void SetTextCtrlProportion(int prop)<br> + int GetTextCtrlProportion() const<br> + <br> + <font color=#009900>// proportion of the picker control</font><br> + void SetPickerCtrlProportion(int prop)<br> + int GetPickerCtrlProportion() const<br> + <br> + bool IsTextCtrlGrowable() const<br> + void SetTextCtrlGrowable(bool grow = true)<br> + <br> + bool IsPickerCtrlGrowable() const<br> + void SetPickerCtrlGrowable(bool grow = true)<br> + <br> + bool HasTextCtrl() const<br> + <a href="#wxTextCtrl">wxTextCtrl</a> *GetTextCtrl()<br> + <a href="#wxControl">wxControl</a> *GetPickerCtrl()<br> + <br> + <font color=#009900>// methods that derived class must/may override</font><br> + virtual void UpdatePickerFromTextCtrl()<br> + virtual void UpdateTextCtrlFromPicker()<br> + <br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxColourPickerCtrl">wxColourPickerCtrl</a></font><br> + <br> + <i>%if</i> wxLUA_USE_wxColourPickerCtrl & wxUSE_COLOURPICKERCTRL<br> + <br> + <i>%include</i> "wx/clrpicker.h"<br> + <br> + <font color=#006666><i>%define</i> wxCLRP_SHOW_LABEL</font><br> + <font color=#006666><i>%define</i> wxCLRP_USE_TEXTCTRL</font><br> + <font color=#006666><i>%define</i> wxCLRP_DEFAULT_STYLE</font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxColourPickerCtrl">wxColourPickerCtrl</a>, <a href="#wxPickerBase">wxPickerBase</a></font></b> + <blockquote> + <a href="#wxColourPickerCtrl">wxColourPickerCtrl</a>()<br> + <font color=#009900>// Note default color is *wxBLACK</font><br> + <a href="#wxColourPickerCtrl">wxColourPickerCtrl</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxColour">wxColour</a>& col, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxCLRP_DEFAULT_STYLE, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxColourPickerCtrl")<br> + <font color=#009900>//bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxColour">wxColour</a>& col = *wxBLACK, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxCLRP_DEFAULT_STYLE, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxColourPickerCtrl")</font><br> + <br> + <font color=#009900>// get the colour chosen</font><br> + <a href="#wxColour">wxColour</a> GetColour() const<br> + <font color=#009900>// set currently displayed color</font><br> + void SetColour(const <a href="#wxColour">wxColour</a>& col)<br> + <font color=#009900>// set colour using RGB(r,g,b) syntax or considering given text as a colour name;</font><br> + <font color=#009900>// returns true if the given text was successfully recognized.</font><br> + bool SetColour(const <a href="#wxString">wxString</a>& text)<br> + <br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxColourPickerEvent">wxColourPickerEvent</a></font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxColourPickerEvent">wxColourPickerEvent</a>, <a href="#wxCommandEvent">wxCommandEvent</a></font></b> + <blockquote> + <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_COLOURPICKER_CHANGED <font color=#009900>// EVT_COLOURPICKER_CHANGED(id, func)</font></font><br> + <br> + <a href="#wxColourPickerEvent">wxColourPickerEvent</a>()<br> + <a href="#wxColourPickerEvent">wxColourPickerEvent</a>(<a href="#wxObject">wxObject</a> *generator, int id, const <a href="#wxColour">wxColour</a> &col)<br> + <br> + <a href="#wxColour">wxColour</a> GetColour() const<br> + void SetColour(const <a href="#wxColour">wxColour</a> &c)<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>//wxLUA_USE_wxColourPickerCtrl & wxUSE_COLOURPICKERCTRL</font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxDatePickerCtrl">wxDatePickerCtrl</a></font><br> + <br> + <i>%if</i> wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL<br> + <br> + <i>%include</i> "wx/datectrl.h"<br> + <br> + <b><font size=+1 color=#0066CC><i>%enum</i></font></b> + <blockquote><font color=#0066CC> + wxDP_SPIN<br> + wxDP_DROPDOWN<br> + wxDP_DEFAULT<br> + wxDP_ALLOWNONE<br> + wxDP_SHOWCENTURY<br> + </font> + </blockquote><font color=#0066CC><i>%endenum</i></font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxDatePickerCtrl">wxDatePickerCtrl</a>, <a href="#wxControl">wxControl</a></font></b> + <blockquote> + <font color=#009900>//<a href="#wxDatePickerCtrl">wxDatePickerCtrl</a>()</font><br> + <a href="#wxDatePickerCtrl">wxDatePickerCtrl</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxDateTime">wxDateTime</a>& dt = wxDefaultDateTime, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxDatePickerCtrl")<br> + <font color=#009900>//bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxDateTime">wxDateTime</a>& dt = wxDefaultDateTime, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxDatePickerCtrl")</font><br> + <br> + <font color=#BB0055> <font color=#009900>// <i>%override</i> [bool, <a href="#wxDateTime">wxDateTime</a> dt1, <a href="#wxDateTime">wxDateTime</a> dt2] wxDatePickerCtrl::GetRange() const</font></font><br> + <font color=#009900>// C++ Func: bool GetRange(<a href="#wxDateTime">wxDateTime</a> *dt1, <a href="#wxDateTime">wxDateTime</a> *dt2) const</font><br> + bool GetRange() const<br> + <a href="#wxDateTime">wxDateTime</a> GetValue() const<br> + void SetRange(const <a href="#wxDateTime">wxDateTime</a>& dt1, const <a href="#wxDateTime">wxDateTime</a>& dt2)<br> + void SetValue(const <a href="#wxDateTime">wxDateTime</a>& dt)<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>//wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL</font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxFileDirPickerCtrlBase">wxFileDirPickerCtrlBase</a></font><br> + <br> + <i>%if</i> (wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL)<br> + <br> + <i>%include</i> "wx/filepicker.h"<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxFileDirPickerCtrlBase">wxFileDirPickerCtrlBase</a>, <a href="#wxPickerBase">wxPickerBase</a></font></b> + <blockquote> + <font color=#009900>// No constructor - this is a base class</font><br> + <br> + <a href="#wxString">wxString</a> GetPath() const<br> + void SetPath(const <a href="#wxString">wxString</a> &str)<br> + <br> + <font color=#009900>// return true if the given path is valid for this control</font><br> + bool CheckPath(const <a href="#wxString">wxString</a>& path) const<br> + <font color=#009900>// return the text control value in canonical form</font><br> + <a href="#wxString">wxString</a> GetTextCtrlValue() const<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxFileDirPickerEvent">wxFileDirPickerEvent</a></font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxFileDirPickerEvent">wxFileDirPickerEvent</a>, <a href="#wxCommandEvent">wxCommandEvent</a></font></b> + <blockquote> + <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_FILEPICKER_CHANGED <font color=#009900>// EVT_FILEPICKER_CHANGED(id, fn)</font></font><br> + <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_DIRPICKER_CHANGED <font color=#009900>// EVT_DIRPICKER_CHANGED(id, fn)</font></font><br> + <br> + <font color=#009900>//<a href="#wxFileDirPickerEvent">wxFileDirPickerEvent</a>()</font><br> + <a href="#wxFileDirPickerEvent">wxFileDirPickerEvent</a>(wxEventType type, <a href="#wxObject">wxObject</a> *generator, int id, const <a href="#wxString">wxString</a> &path)<br> + <br> + <a href="#wxString">wxString</a> GetPath() const<br> + void SetPath(const <a href="#wxString">wxString</a> &p)<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// (wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL)</font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxDirPickerCtrl">wxDirPickerCtrl</a></font><br> + <br> + <i>%if</i> wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL)<br> + <br> + <font color=#006666><i>%define</i> wxDIRP_DIR_MUST_EXIST</font><br> + <font color=#006666><i>%define</i> wxDIRP_CHANGE_DIR</font><br> + <br> + <font color=#006666><i>%define</i> wxDIRP_DEFAULT_STYLE</font><br> + <font color=#006666><i>%define</i> wxDIRP_USE_TEXTCTRL</font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxDirPickerCtrl">wxDirPickerCtrl</a>, <a href="#wxFileDirPickerCtrlBase">wxFileDirPickerCtrlBase</a></font></b> + <blockquote> + <font color=#009900>//<a href="#wxDirPickerCtrl">wxDirPickerCtrl</a>()</font><br> + <a href="#wxDirPickerCtrl">wxDirPickerCtrl</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxString">wxString</a>& path = "", const <a href="#wxString">wxString</a>& message = wxDirSelectorPromptStr, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxDirPickerCtrl")<br> + <font color=#009900>//bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxString">wxString</a>& path = "", const <a href="#wxString">wxString</a>& message = wxDirSelectorPromptStr, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxDirPickerCtrl")</font><br> + <br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL)<br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxFilePickerCtrl">wxFilePickerCtrl</a></font><br> + <br> + <i>%if</i> wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL)<br> + <br> + <font color=#006666><i>%define</i> wxFLP_OPEN</font><br> + <font color=#006666><i>%define</i> wxFLP_SAVE</font><br> + <font color=#006666><i>%define</i> wxFLP_OVERWRITE_PROMPT</font><br> + <font color=#006666><i>%define</i> wxFLP_FILE_MUST_EXIST</font><br> + <font color=#006666><i>%define</i> wxFLP_CHANGE_DIR</font><br> + <br> + <font color=#006666><i>%define</i> wxFLP_DEFAULT_STYLE</font><br> + <font color=#006666><i>%define</i> wxFLP_USE_TEXTCTRL</font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxFilePickerCtrl">wxFilePickerCtrl</a>, <a href="#wxFileDirPickerCtrlBase">wxFileDirPickerCtrlBase</a></font></b> + <blockquote> + <font color=#009900>//<a href="#wxFilePickerCtrl">wxFilePickerCtrl</a>()</font><br> + <a href="#wxFilePickerCtrl">wxFilePickerCtrl</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxString">wxString</a>& path = "", const <a href="#wxString">wxString</a>& message = wxFileSelectorPromptStr, const <a href="#wxString">wxString</a>& wildcard = wxFileSelectorDefaultWildcardStr, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxFLP_DEFAULT_STYLE, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxFilePickerCtrl")<br> + <br> + <font color=#009900>//bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxString">wxString</a>& path = "", const <a href="#wxString">wxString</a>& message = wxFileSelectorPromptStr, const <a href="#wxString">wxString</a>& wildcard = wxFileSelectorDefaultWildcardStr, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxFLP_DEFAULT_STYLE, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxFilePickerCtrl")</font><br> + <br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL)</font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxFontPickerCtrl">wxFontPickerCtrl</a></font><br> + <br> + <i>%if</i> wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL<br> + <br> + <i>%include</i> "wx/fontpicker.h"<br> + <br> + <font color=#006666><i>%define</i> wxFNTP_FONTDESC_AS_LABEL</font><br> + <font color=#006666><i>%define</i> wxFNTP_USE_TEXTCTRL</font><br> + <font color=#006666><i>%define</i> wxFNTP_DEFAULT_STYLE</font><br> + <font color=#006666><i>%define</i> wxFNTP_MAXPOINT_SIZE</font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxFontPickerCtrl">wxFontPickerCtrl</a>, <a href="#wxPickerBase">wxPickerBase</a></font></b> + <blockquote> + <font color=#009900>//<a href="#wxFontPickerCtrl">wxFontPickerCtrl</a>()</font><br> + <a href="#wxFontPickerCtrl">wxFontPickerCtrl</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxFont">wxFont</a>& initial = wxNullFont, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxFNTP_DEFAULT_STYLE, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxFontPickerCtrl")<br> + <font color=#009900>//bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxFont">wxFont</a>& initial = wxNullFont, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxFNTP_DEFAULT_STYLE, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxFontPickerCtrl")</font><br> + <br> + <a href="#wxFont">wxFont</a> GetSelectedFont() const<br> + virtual void SetSelectedFont(const <a href="#wxFont">wxFont</a> &f)<br> + <br> + void SetMaxPointSize(unsigned int max)<br> + unsigned int GetMaxPointSize() const<br> + <br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxFontPickerEvent">wxFontPickerEvent</a></font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxFontPickerEvent">wxFontPickerEvent</a>, <a href="#wxCommandEvent">wxCommandEvent</a></font></b> + <blockquote> + <font color=#006666> <i>%define_event</i> wxEVT_COMMAND_FONTPICKER_CHANGED <font color=#009900>// EVT_FONTPICKER_CHANGED(id, fn)</font></font><br> + <br> + <font color=#009900>//<a href="#wxFontPickerEvent">wxFontPickerEvent</a>()</font><br> + <a href="#wxFontPickerEvent">wxFontPickerEvent</a>(<a href="#wxObject">wxObject</a> *generator, int id, const <a href="#wxFont">wxFont</a> &f)<br> + <br> + <a href="#wxFont">wxFont</a> GetFont() const<br> + void SetFont(const <a href="#wxFont">wxFont</a> &c)<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL</font><br> + <br> + <i>%endif</i> <font color=#009900>// wxchkver_2_8 && wxLUA_USE_wxPicker</font><br> + <br> + <br> + <br><HR> + <h2><a name="wxwidgets_print.i">wxwidgets/print.i</a></h2> <HR> |
|
From: John L. <jr...@us...> - 2007-06-19 13:58:19
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31712/wxLua/samples Modified Files: settings.wx.lua Log Message: AMD64 fixes Index: settings.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/settings.wx.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** settings.wx.lua 18 Jun 2007 23:52:22 -0000 1.1 --- settings.wx.lua 19 Jun 2007 13:58:16 -0000 1.2 *************** *** 20,30 **** function AddListItem(colTable) - local lc_item = listCtrl:GetItemCount() lc_item = listCtrl:InsertItem(lc_item, colTable[1]) ! for col = 2, #colTable do ! listCtrl:SetItem(lc_item, col - 1, tostring(colTable[col])) ! end return lc_item --- 20,27 ---- function AddListItem(colTable) local lc_item = listCtrl:GetItemCount() lc_item = listCtrl:InsertItem(lc_item, colTable[1]) ! listCtrl:SetItem(lc_item, 1, tostring(colTable[2])) return lc_item *************** *** 226,230 **** AddListItem({"wx.wxGetOsDescription()", wx.wxGetOsDescription()}) AddListItem({"wx.wxGetOSDirectory()", wx.wxGetOSDirectory()}) ! AddListItem({"wx.wxGetOsVersion()", wx.wxGetOsVersion()}) AddListItem({"wx.wxGetProcessId()", wx.wxGetProcessId()}) --- 223,227 ---- AddListItem({"wx.wxGetOsDescription()", wx.wxGetOsDescription()}) AddListItem({"wx.wxGetOSDirectory()", wx.wxGetOSDirectory()}) ! AddListItem({"wx.wxGetOsVersion()", table.concat({wx.wxGetOsVersion()}, ", ")}) AddListItem({"wx.wxGetProcessId()", wx.wxGetProcessId()}) |
|
From: John L. <jr...@us...> - 2007-06-19 13:58:19
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31712/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: AMD64 fixes Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** wxstc_datatypes.lua 18 Jun 2007 21:40:28 -0000 1.63 --- wxstc_datatypes.lua 19 Jun 2007 13:58:15 -0000 1.64 *************** *** 4001,4004 **** --- 4001,4005 ---- ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)", ["%wxchkver_2_8_1"] = "wxCHECK_VERSION(2,8,1)", + ["%wxchkver_2_8_4"] = "wxCHECK_VERSION(2,8,4)", ["%wxcompat_2_4"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)", ["%wxcompat_2_6"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", *************** *** 4319,4322 **** --- 4320,4324 ---- wxUSE_TOOLBOOK = "wxUSE_TOOLBOOK", wxUSE_TOOLTIPS = "wxUSE_TOOLTIPS", + wxUSE_TREEBOOK = "wxUSE_TREEBOOK", wxUSE_TREECTRL = "wxUSE_TREECTRL", wxUSE_TREELAYOUT = "wxUSE_TREELAYOUT", |
|
From: John L. <jr...@us...> - 2007-06-19 13:58:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31712/wxLua/modules/wxluadebug/src Modified Files: wxlstack.cpp Log Message: AMD64 fixes Index: wxlstack.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxlstack.cpp 18 Jun 2007 18:37:47 -0000 1.8 --- wxlstack.cpp 19 Jun 2007 13:58:16 -0000 1.9 *************** *** 32,36 **** #endif ! // Define our own flag to help track down where we've hacked thing to work // equally well with the treectrl for MSW #if defined(__WXMSW__) --- 32,36 ---- #endif ! // Define our own flag to help track down where we've hacked thing to work // equally well with the treectrl for MSW #if defined(__WXMSW__) *************** *** 135,139 **** m_stackChoice = new wxChoice( panel, ID_WXLUA_STACK_CHOICE, wxDefaultPosition, wxDefaultSize, ! 0, NULL ); m_stackChoice->SetToolTip(wxT("Select lua stack to display.")); --- 135,139 ---- m_stackChoice = new wxChoice( panel, ID_WXLUA_STACK_CHOICE, wxDefaultPosition, wxDefaultSize, ! 0, NULL, 0, wxDefaultValidator ); // help GCC find which fn to call m_stackChoice->SetToolTip(wxT("Select lua stack to display.")); *************** *** 471,475 **** // add dummy item for MSW to expand properly, also it shows that ! // there's nothing in this level if they try to expand it and there // aren't any real items (see below) m_treeCtrl->AppendItem(id, DUMMY_TREEITEM); --- 471,475 ---- // add dummy item for MSW to expand properly, also it shows that ! // there's nothing in this level if they try to expand it and there // aren't any real items (see below) m_treeCtrl->AppendItem(id, DUMMY_TREEITEM); *************** *** 500,504 **** #if !defined(WXLUA_STACK_MSWTREE) // Cannot expand hidden root, nor can you check it ! if (treeId && ((treeId != m_treeCtrl->GetRootItem()) || ((m_treeCtrl->GetWindowStyle() & wxTR_HIDE_ROOT) == 0)) && !m_treeCtrl->IsExpanded(treeId)) --- 500,504 ---- #if !defined(WXLUA_STACK_MSWTREE) // Cannot expand hidden root, nor can you check it ! if (treeId && ((treeId != m_treeCtrl->GetRootItem()) || ((m_treeCtrl->GetWindowStyle() & wxTR_HIDE_ROOT) == 0)) && !m_treeCtrl->IsExpanded(treeId)) |
|
From: John L. <jr...@us...> - 2007-06-19 13:58:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31712/wxLua/modules/wxbind/src Modified Files: wx_bind.cpp Log Message: AMD64 fixes Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** wx_bind.cpp 18 Jun 2007 21:40:51 -0000 1.112 --- wx_bind.cpp 19 Jun 2007 13:58:16 -0000 1.113 *************** *** 4667,4672 **** #endif // (((defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) ! #if defined(__WXMSW__) ! // %win %function wxWindow* wxGetActiveWindow() static int LUACALL wxLua_function_wxGetActiveWindow(lua_State *L) { --- 4667,4672 ---- #endif // (((defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) ! #if wxCHECK_VERSION(2,8,4) ! // %wxchkver_2_8_4 %function wxWindow* wxGetActiveWindow() static int LUACALL wxLua_function_wxGetActiveWindow(lua_State *L) { *************** *** 4682,4686 **** static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxGetActiveWindow[1] = {{ wxLua_function_wxGetActiveWindow, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; ! #endif // defined(__WXMSW__) #if wxLUA_USE_wxApp --- 4682,4686 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_function_wxGetActiveWindow[1] = {{ wxLua_function_wxGetActiveWindow, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; ! #endif // wxCHECK_VERSION(2,8,4) #if wxLUA_USE_wxApp *************** *** 6460,6466 **** #endif // (((defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) ! #if defined(__WXMSW__) { "wxGetActiveWindow", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_wxGetActiveWindow, 1, NULL }, ! #endif // defined(__WXMSW__) #if wxLUA_USE_wxApp --- 6460,6466 ---- #endif // (((defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL)) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) ! #if wxCHECK_VERSION(2,8,4) { "wxGetActiveWindow", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_wxGetActiveWindow, 1, NULL }, ! #endif // wxCHECK_VERSION(2,8,4) #if wxLUA_USE_wxApp |
