Menu
▾
▴
[Wxlua-commit] wxLua/samples controls.wx.lua,1.1,1.2
|
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) -- ----------------------------------------------------------------------- |
