From a9e45832c588c38765e917a7df464772f7ad4093 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Tue, 19 Mar 2024 15:00:12 +0100 Subject: [PATCH 01/10] update Wx::App run docu --- lib/wx/doc/app.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/wx/doc/app.rb b/lib/wx/doc/app.rb index 1a297d4e..02600797 100644 --- a/lib/wx/doc/app.rb +++ b/lib/wx/doc/app.rb @@ -13,10 +13,12 @@ class App # Optionally runs a given block as the applications #on_init callback # if no actual #on_init method has been defined. # A given block will be ignored if an actual #on_init method has been defined. + # @yieldreturn [Boolean] return true if init block succeeded, false otherwise def run(&block) end # Convenience method to instantiate an application object of the class # and call the {#run} method for that application object. + # @yieldreturn [Boolean] return true if init block succeeded, false otherwise def self.run(&block) end class << self From 8f09550e67fd4de43f59d29b6c2d2837d40bf54b Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Wed, 20 Mar 2024 10:43:45 +0100 Subject: [PATCH 02/10] add Wx::EvtHandler#connect/#disconnect docu --- lib/wx/doc/evthandler.rb | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/wx/doc/evthandler.rb b/lib/wx/doc/evthandler.rb index 957f45eb..8c180e45 100644 --- a/lib/wx/doc/evthandler.rb +++ b/lib/wx/doc/evthandler.rb @@ -29,8 +29,30 @@ def self.clear_filters; end # @return [Integer] unique event type id def self.register_class(klass, konstant = nil, meth = nil, arity = nil) end - def connect(first_id, last_id, evt_type, handler) end - + # Connects the given event handler dynamically for id(s) and event type. + # + # This is the core event connecting method. + # In Ruby using named event connector methods like {Wx::EvtHandler#evt_menu} is highly recommended as using #connect + # does not provide any better options (less even) than using named event connectors as all event connecting is dynamic. + # + # @param [Integer] first_id The first ID of the identifier range to be associated with the event handler. Should be Wx::ANY_ID for events that do not require identifiers. + # @param [Integer] last_id The last ID of the identifier range to be associated with the event handler. Should be Wx::ANY_ID for events requiring a single identifier (like {Wx::MenuEvt}). + # @param [Integer] evt_id The event type identifier like {Wx::EVT_MENU}. + # @param [Proc,Method] handler The event handler proc or method. + # @return [Boolean] Always returns true. + def connect(first_id, last_id, evt_id, handler) end + + # Disconnects any event handler connected for the specified id(s) and event type. + # + # Looks up connected event handler(s) using the specified parameters as search criteria and returning true if (a) + # matching handler(s) has(have) been found and removed. + # + # @note Note that in wxRuby it is not possible to remove a specific handler if multiple (chained) handler(s) have been connected. + # + # @param [Integer] first_id The first ID of the identifier range associated with the event handler. Should be Wx::ANY_ID for events that have no associated identifiers. + # @param [Integer] last_id The last ID of the identifier range associated with the event handler. Should be Wx::ANY_ID for events that have a single identifier associated. + # @param [Integer,Symbol] evt_id The event type identifier like {Wx::EVT_MENU} or event connector symbol (like `:evt_menu`). + # @return [Boolean] Returns true if any event handler found and removed, false otherwise. def disconnect(first_id, last_id, evt_spec) end # Processes an event, searching event tables and calling zero or more suitable event handler function(s). From 4ac17108be4432acc54025196773c49321d1a023 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Wed, 20 Mar 2024 12:24:22 +0100 Subject: [PATCH 03/10] fix typo --- lib/wx/doc/evthandler.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/wx/doc/evthandler.rb b/lib/wx/doc/evthandler.rb index 8c180e45..9a31836b 100644 --- a/lib/wx/doc/evthandler.rb +++ b/lib/wx/doc/evthandler.rb @@ -53,7 +53,7 @@ def connect(first_id, last_id, evt_id, handler) end # @param [Integer] last_id The last ID of the identifier range associated with the event handler. Should be Wx::ANY_ID for events that have a single identifier associated. # @param [Integer,Symbol] evt_id The event type identifier like {Wx::EVT_MENU} or event connector symbol (like `:evt_menu`). # @return [Boolean] Returns true if any event handler found and removed, false otherwise. - def disconnect(first_id, last_id, evt_spec) end + def disconnect(first_id, last_id, evt_id) end # Processes an event, searching event tables and calling zero or more suitable event handler function(s). # From 9a398b70fa6be6f63c977a13e44315ceaed40bc7 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Wed, 20 Mar 2024 12:26:06 +0100 Subject: [PATCH 04/10] add nil as arg option --- lib/wx/doc/evthandler.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/wx/doc/evthandler.rb b/lib/wx/doc/evthandler.rb index 9a31836b..5f6c4edf 100644 --- a/lib/wx/doc/evthandler.rb +++ b/lib/wx/doc/evthandler.rb @@ -51,7 +51,7 @@ def connect(first_id, last_id, evt_id, handler) end # # @param [Integer] first_id The first ID of the identifier range associated with the event handler. Should be Wx::ANY_ID for events that have no associated identifiers. # @param [Integer] last_id The last ID of the identifier range associated with the event handler. Should be Wx::ANY_ID for events that have a single identifier associated. - # @param [Integer,Symbol] evt_id The event type identifier like {Wx::EVT_MENU} or event connector symbol (like `:evt_menu`). + # @param [Integer,Symbol,nil] evt_id The event type identifier like {Wx::EVT_MENU} or event connector symbol (like `:evt_menu`). # @return [Boolean] Returns true if any event handler found and removed, false otherwise. def disconnect(first_id, last_id, evt_id) end From d0b073da2f41c976e5037e58aba1c9f1b8b76c30 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Wed, 20 Mar 2024 12:27:41 +0100 Subject: [PATCH 05/10] accept digits in event macro names --- rakelib/lib/generate/doc.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rakelib/lib/generate/doc.rb b/rakelib/lib/generate/doc.rb index f50b9ee6..816ff386 100644 --- a/rakelib/lib/generate/doc.rb +++ b/rakelib/lib/generate/doc.rb @@ -494,9 +494,10 @@ def para_to_doc(node) when /The following event handler macros redirect.*(\{.*})/ event_ref = $1 "The following event-handler methods redirect the events to member method or handler blocks for #{event_ref} events." - when /\AEVT_[A-Z]+/ - if event_list? && /\A(EVT_[_A-Z]+)\((.*,)\s+\w+\):(.*)/ =~ para + when /\AEVT_[_A-Z0-9]+/ + if event_list? && /\A(EVT_[_A-Z0-9]+)\((.*,)\s+\w+\):(.*)/ =~ para evthnd_name = $1.downcase + docstr = $3.lstrip if override_spec = get_event_override(evthnd_name) evthnd_name, evt_type, evt_arity, evt_klass = override_spec idarg = case evt_arity @@ -511,10 +512,9 @@ def para_to_doc(node) else arglist = "#{$2} meth = nil, &block" end - docstr = $3.lstrip package.event_docs[evthnd_name] = [arglist, docstr.dup] # register for eventlist doc gen "{Wx::EvtHandler\##{evthnd_name}}(#{arglist}): #{docstr}" - elsif event_list? && /\A(EVT_[_A-Z]+)(\*)?\(\w+\):(.*)/ =~ para + elsif event_list? && /\A(EVT_[_A-Z0-9]+)(\*)?\(\w+\):(.*)/ =~ para wildcard = ($2 == '*') evthnd_name = $1.downcase arglist = "meth = nil, &block" From 56bc4b98408d76cbc72cdcc5a6c95da555101494 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Wed, 20 Mar 2024 16:59:25 +0100 Subject: [PATCH 06/10] docu update --- lib/wx/doc/app.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/wx/doc/app.rb b/lib/wx/doc/app.rb index 02600797..dfc8bbf2 100644 --- a/lib/wx/doc/app.rb +++ b/lib/wx/doc/app.rb @@ -14,11 +14,13 @@ class App # if no actual #on_init method has been defined. # A given block will be ignored if an actual #on_init method has been defined. # @yieldreturn [Boolean] return true if init block succeeded, false otherwise + # @return [Integer] return code from the #on_exit callback (`0` if no #on_exit defined or called) def run(&block) end # Convenience method to instantiate an application object of the class - # and call the {#run} method for that application object. + # and call the {Wx::App#run} method for that application object. # @yieldreturn [Boolean] return true if init block succeeded, false otherwise + # @return [Integer] return code from {Wx::App#run} def self.run(&block) end class << self From 50e2ff5d7545b1173c4015103b1f04e4a2c03468 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Mon, 25 Mar 2024 12:20:41 +0100 Subject: [PATCH 07/10] update gem metadata for homepage, add source uri --- rakelib/gem.rake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rakelib/gem.rake b/rakelib/gem.rake index 3b9d289c..d2e68e99 100644 --- a/rakelib/gem.rake +++ b/rakelib/gem.rake @@ -88,7 +88,8 @@ file WXRuby3::Gem.gem_file => WXRuby3::Gem.manifest do "'--exclude=lib/wx/(aui|core|grid|html|pg|prt|rbn|rtc|stc|wxruby)/.*'" gem.metadata = { "bug_tracker_uri" => "https://github.com/mcorino/wxRuby3/issues", - "homepage_uri" => "https://github.com/mcorino/wxRuby3", + "homepage_uri" => "https://github.com/mcorino/wxRuby3/wiki", + "source_code_uri" => "https://github.com/mcorino/wxRuby3", "documentation_uri" => "https://mcorino.github.io/wxRuby3", "github_repo" => "https://github.com/mcorino/wxRuby3" } From 51d33c4fb0bab1290611dc9e6637e7072286a47f Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Mon, 25 Mar 2024 14:21:48 +0100 Subject: [PATCH 08/10] add missing constants --- rakelib/lib/director/art_provider.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rakelib/lib/director/art_provider.rb b/rakelib/lib/director/art_provider.rb index 8b2bbe24..c59db6d3 100644 --- a/rakelib/lib/director/art_provider.rb +++ b/rakelib/lib/director/art_provider.rb @@ -28,6 +28,10 @@ def setup // ArtId and ArtClient are basically just strings ... typedef wxString wxArtID; typedef wxString wxArtClient; + + // Missing from docs + %constant const char* wxART_STOP = wxART_STOP; + %constant const char* wxART_REFRESH = wxART_REFRESH; __HEREDOC spec.map *%w[wxArtID wxArtClient], as: 'String', swig: false do map_in From 0c841940a572234b90a9d97cf818fd2ba54f9598 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Mon, 25 Mar 2024 15:08:56 +0100 Subject: [PATCH 09/10] simplify; use ArtProvider for (most) icons; add icon to Run menu --- samples/sampler/back.xpm | 21 ------------ samples/sampler/copy.xpm | 44 ------------------------- samples/sampler/cut.xpm | 46 -------------------------- samples/sampler/editor.rb | 24 +++++++------- samples/sampler/filesave.xpm | 42 ------------------------ samples/sampler/find.xpm | 62 ----------------------------------- samples/sampler/findrepl.xpm | 63 ------------------------------------ samples/sampler/forward.xpm | 21 ------------ samples/sampler/paste.xpm | 46 -------------------------- samples/sampler/redo.xpm | 58 --------------------------------- samples/sampler/undo.xpm | 58 --------------------------------- 11 files changed, 13 insertions(+), 472 deletions(-) delete mode 100644 samples/sampler/back.xpm delete mode 100644 samples/sampler/copy.xpm delete mode 100644 samples/sampler/cut.xpm delete mode 100644 samples/sampler/filesave.xpm delete mode 100644 samples/sampler/find.xpm delete mode 100644 samples/sampler/findrepl.xpm delete mode 100644 samples/sampler/forward.xpm delete mode 100644 samples/sampler/paste.xpm delete mode 100644 samples/sampler/redo.xpm delete mode 100644 samples/sampler/undo.xpm diff --git a/samples/sampler/back.xpm b/samples/sampler/back.xpm deleted file mode 100644 index d5c1de51..00000000 --- a/samples/sampler/back.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static const char *const back_xpm[] = { -"16 15 3 1", -" c None", -". c Black", -"X c Gray100", -" ", -" ", -" . ", -" .. ", -" .X. ", -" .XX........ ", -" .XXXXXXXXXX. ", -" .XXXXXXXXXXX. ", -" .XXXXXXXXXXX. ", -" .XXXXXXXXXX. ", -" .XX........ ", -" .X. ", -" .. ", -" . ", -" "}; diff --git a/samples/sampler/copy.xpm b/samples/sampler/copy.xpm deleted file mode 100644 index f393cd23..00000000 --- a/samples/sampler/copy.xpm +++ /dev/null @@ -1,44 +0,0 @@ -/* XPM */ -static const char *const copy_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 23 1", -"o c #97C4E7", -"* c #FFFFFF", -"@ c #60A9DA", -"= c #D1E5F5", -"& c #C3DDF1", -". c #7EA6C0", -" c None", -"X c #2F93CD", -"O c #85BBE2", -", c #EFF6FC", -"; c #DEEDF8", -"+ c #72B2DD", -"3 c #F7FBFD", -"4 c #FAFCFE", -": c #DAEAF7", -"< c #E9F3FA", -"1 c #E2EFF8", -"- c #FDFDFE", -"% c #B6D5EE", -"$ c #A5CCEA", -"> c #E5F0F9", -"# c #AFD1EC", -"2 c #F4F9FD", -/* pixels */ -" .....XX ", -" .oO+@X#X ", -" .$oO+X##X ", -" .%$o........ ", -" .&%$.*=&#o.-. ", -" .=&%.*;=&#.--. ", -" .:=&.*>;=&.... ", -" .>:=.*,>;=&#o. ", -" .<1:.*2,>:=&#. ", -" .2<1.*32,>:=&. ", -" .32<.*432,>:=. ", -" .32<.*-432,>:. ", -" .....**-432,>. ", -" .***-432,. ", -" .......... " -}; diff --git a/samples/sampler/cut.xpm b/samples/sampler/cut.xpm deleted file mode 100644 index e638157f..00000000 --- a/samples/sampler/cut.xpm +++ /dev/null @@ -1,46 +0,0 @@ -/* XPM */ -static const char *const cut_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 25 1", -"6 c #D8BDC0", -": c #C3C3C4", -"- c #FFFFFF", -". c #6C6D70", -"2 c #AD3A45", -"o c #DBDBDB", -"# c #939495", -"< c #E42234", -"& c #C3C5C8", -"; c #C6CCD3", -"% c #B7B7B8", -" c None", -"* c #DFE0E2", -"5 c #B69596", -"3 c #9C2A35", -"1 c #CFCFD0", -", c #AB5C64", -"+ c #D2D3D4", -"$ c #BCBDBE", -"@ c #C6C8CA", -"> c #CDC0C1", -"O c #826F72", -"X c #979BA0", -"4 c #9B8687", -"= c #9FA0A0", -/* pixels */ -" .X .o ", -" O.+ @. ", -" O. .. ", -" O#$ %.& ", -" O.*.. ", -" #%#.. ", -" O=-.. ", -" #%#;. ", -" OO:=O ", -" >,,<, ,<,,1 ", -" ><23<1 1<32<1 ", -" ,2 4< <5 2, ", -" <, ,2 2, ,< ", -" 23,<5 5<,32 ", -" 6225 522> " -}; diff --git a/samples/sampler/editor.rb b/samples/sampler/editor.rb index 5d1db54f..45639b82 100644 --- a/samples/sampler/editor.rb +++ b/samples/sampler/editor.rb @@ -271,7 +271,9 @@ def initialize(sampler, sample, pos: Wx::DEFAULT_POSITION , style: Wx::DEFAULT_F menuFile = Wx::Menu.new menuFile.append(ID::SAVE, "&Save\tCtrl-S", 'Save the sample to a local folder') - menuFile.append(ID::RUN, "&Run\tCtrl-G", 'Run the (changed) sample') + runItem = Wx::MenuItem.new(menuFile, ID::RUN, "&Run\tCtrl-G", 'Run the (changed) sample') + runItem.set_bitmap(bitmap(:play)) + menuFile.append(runItem) menuFile.append_separator menuFile.append(ID::QUIT, "&Close\tCtrl-Q", "Close the sample editor") @@ -315,20 +317,20 @@ def initialize(sampler, sample, pos: Wx::DEFAULT_POSITION , style: Wx::DEFAULT_F panel_szr = Wx::VBoxSizer.new @tbar = Wx::ToolBar.new(panel, style: Wx::TB_HORIZONTAL | Wx::NO_BORDER | Wx::TB_FLAT) @tbar.tool_bitmap_size = [ 16, 16 ] - @tbar.add_tool(ID::SAVE, 'Save', bitmap(:filesave), 'Save the sample to a local folder') + @tbar.add_tool(ID::SAVE, 'Save', Wx::ArtProvider.get_bitmap(Wx::ART_FILE_SAVE, Wx::ART_TOOLBAR, [16,16]), 'Save the sample to a local folder') @tbar.add_tool(ID::RUN, 'Run', bitmap(:play), 'Run the (changed) sample') @tbar.add_separator - @tbar.add_tool(ID::UNDO, 'Undo', bitmap(:undo), 'Undo change') - @tbar.add_tool(ID::REDO, 'Redo', bitmap(:redo), 'Redo change') + @tbar.add_tool(ID::UNDO, 'Undo', Wx::ArtProvider.get_bitmap(Wx::ART_UNDO, Wx::ART_TOOLBAR, [16,16]), 'Undo change') + @tbar.add_tool(ID::REDO, 'Redo', Wx::ArtProvider.get_bitmap(Wx::ART_REDO, Wx::ART_TOOLBAR, [16,16]), 'Redo change') @tbar.add_separator - @tbar.add_tool(ID::COPY, 'Copy', bitmap(:copy), 'Copy selection') - @tbar.add_tool(ID::CUT, 'Cut', bitmap(:cut), 'Cut selection') - @tbar.add_tool(ID::PASTE, 'Paste', bitmap(:paste), 'Paste selection') + @tbar.add_tool(ID::COPY, 'Copy', Wx::ArtProvider.get_bitmap(Wx::ART_COPY, Wx::ART_TOOLBAR, [16,16]), 'Copy selection') + @tbar.add_tool(ID::CUT, 'Cut', Wx::ArtProvider.get_bitmap(Wx::ART_CUT, Wx::ART_TOOLBAR, [16,16]), 'Cut selection') + @tbar.add_tool(ID::PASTE, 'Paste', Wx::ArtProvider.get_bitmap(Wx::ART_PASTE, Wx::ART_TOOLBAR, [16,16]), 'Paste selection') @tbar.add_separator - @tbar.add_tool(ID::FIND, 'Find', bitmap(:find), 'Show Find Dialog') - @tbar.add_tool(ID::FIND_NEXT, 'FindNext', bitmap(:forward), 'Find next occurrence of the search phrase') - @tbar.add_tool(ID::FIND_PREV, 'FindPrev', bitmap(:back), 'Find previous occurrence of the search phrase') - @tbar.add_tool(ID::REPLACE, 'Replace', bitmap(:findrepl), 'Show Replace Dialog') + @tbar.add_tool(ID::FIND, 'Find', Wx::ArtProvider.get_bitmap(Wx::ART_FIND, Wx::ART_TOOLBAR, [16,16]), 'Show Find Dialog') + @tbar.add_tool(ID::FIND_NEXT, 'FindNext', Wx::ArtProvider.get_bitmap(Wx::ART_GO_FORWARD, Wx::ART_TOOLBAR, [16,16]), 'Find next occurrence of the search phrase') + @tbar.add_tool(ID::FIND_PREV, 'FindPrev', Wx::ArtProvider.get_bitmap(Wx::ART_GO_BACK, Wx::ART_TOOLBAR, [16,16]), 'Find previous occurrence of the search phrase') + @tbar.add_tool(ID::REPLACE, 'Replace', Wx::ArtProvider.get_bitmap(Wx::ART_FIND_AND_REPLACE, Wx::ART_TOOLBAR, [16,16]), 'Show Replace Dialog') @tbar.realize panel_szr.add(@tbar) diff --git a/samples/sampler/filesave.xpm b/samples/sampler/filesave.xpm deleted file mode 100644 index f571025c..00000000 --- a/samples/sampler/filesave.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *const filesave_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 21 1", -"O c #FFFFFF", -"> c #D5D6D8", -"; c #446A8C", -"1 c #CAD2DC", -": c #C0C7D1", -" c #5F666D", -"% c #A5B0BA", -"o c #65839D", -", c #DCE2EA", -"< c #C3C5C8", -"- c #E1E6EE", -"* c #C6CCD3", -". c None", -"$ c #305F81", -"2 c #D6DFE7", -"= c #D2D9E0", -"& c #B7BFC7", -"X c #1B4467", -"# c #BCBDBE", -"@ c #7A90AC", -"+ c #5D7C93", -/* pixels */ -" .", -" XoOOOOOOOOO+X .", -" @oO#######O+@ .", -" @oOOOOOOOOO+@ .", -" @oO#######O+@ .", -" @oOOOOOOOOO+@ .", -" @@+++++++++@@ .", -" @@@@@@@@@@@@@ .", -" @@@$$$$$$$$@@ .", -" @@$%%%&*=-O$@ .", -" @@$%X;;*=-O$@ .", -" @@$%X;;:>,O$@ .", -" @@$%X;;<12O$@ .", -" @@$<<2OOOOO$@ .", -". .." -}; diff --git a/samples/sampler/find.xpm b/samples/sampler/find.xpm deleted file mode 100644 index a31ecde6..00000000 --- a/samples/sampler/find.xpm +++ /dev/null @@ -1,62 +0,0 @@ -/* XPM */ -static const char *const find_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 41 1", -"y c #A06959", -"9 c #A7DAF2", -"$ c #B5CAD7", -"> c #35B4E1", -"t c #6B98B8", -"w c #B6E0F4", -"q c #AEC9D7", -"1 c #5A89A6", -"+ c #98B3C6", -"4 c #EAF6FC", -"3 c #DEF1FA", -"= c #4CBCE3", -"d c #DB916B", -"X c #85A7BC", -"s c #D8BCA4", -"o c #749BB4", -"e c #BCD9EF", -"* c #62B4DD", -"< c #91D2EF", -"a c #E6DED2", -"0 c #E9F4FB", -" c None", -"@ c #A0BACB", -"O c #AABFCD", -"i c #6591AE", -": c #B9CBD5", -"- c #71C5E7", -"5 c #D3ECF8", -"% c #81A3B9", -"6 c #8AD0EE", -"8 c #FDFDFE", -"p c #8EA9BC", -"r c #B6D5EE", -", c #81CCEB", -". c #ACC4D3", -"; c #AFD1DE", -"7 c #EFF8FC", -"u c #C2CBDB", -"# c #C0D1DC", -"2 c #CAD6E1", -"& c #8FB0C3", -/* pixels */ -" .XooXO ", -" +@###$+% ", -" .&#*==-;@@ ", -" o:*>,<--:X ", -" 12>-345-#% ", -" 12>678392% ", -" %$*,3059q& ", -" @Oq,wwer@@ ", -" t@q22q&+ ", -" yyui+%o%p ", -" yasy ", -" yasdy ", -" yasdy ", -" ysdy ", -" yy " -}; diff --git a/samples/sampler/findrepl.xpm b/samples/sampler/findrepl.xpm deleted file mode 100644 index 5d688ba4..00000000 --- a/samples/sampler/findrepl.xpm +++ /dev/null @@ -1,63 +0,0 @@ -/* XPM */ -static const char *const findrepl_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 42 1", -"y c #A06959", -"9 c #A7DAF2", -"$ c #B5CAD7", -"> c #35B4E1", -"t c #6B98B8", -"w c #B6E0F4", -"q c #AEC9D7", -"1 c #5A89A6", -"+ c #98B3C6", -"4 c #EAF6FC", -"d c #008000", -"3 c #DEF1FA", -"= c #4CBCE3", -"f c #DB916B", -"X c #85A7BC", -"s c #D8BCA4", -"o c #749BB4", -"e c #BCD9EF", -"* c #62B4DD", -"< c #91D2EF", -"a c #E6DED2", -"0 c #E9F4FB", -" c None", -"@ c #A0BACB", -"O c #AABFCD", -"i c #6591AE", -": c #B9CBD5", -"- c #71C5E7", -"5 c #D3ECF8", -"% c #81A3B9", -"6 c #8AD0EE", -"8 c #FDFDFE", -"p c #8EA9BC", -"r c #B6D5EE", -", c #81CCEB", -". c #ACC4D3", -"; c #AFD1DE", -"7 c #EFF8FC", -"u c #C2CBDB", -"# c #C0D1DC", -"2 c #CAD6E1", -"& c #8FB0C3", -/* pixels */ -" .XooXO ", -" +@###$+% ", -" .&#*==-;@@ ", -" o:*>,<--:X ", -" 12>-345-#% ", -" 12>678392% ", -" %$*,3059q& ", -" @Oq,wwer@@ ", -" t@q22q&+ ", -" yyui+%o%p ", -" yasy d d ", -" yasfy dd dd ", -"yasfy ddddddddd", -"ysfy dd dd ", -" yy d d " -}; diff --git a/samples/sampler/forward.xpm b/samples/sampler/forward.xpm deleted file mode 100644 index 81f62b03..00000000 --- a/samples/sampler/forward.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static const char *const forward_xpm[] = { -"16 15 3 1", -" c None", -". c Black", -"X c Gray100", -" ", -" ", -" . ", -" .. ", -" .X. ", -" ........XX. ", -" .XXXXXXXXXX. ", -" .XXXXXXXXXXX. ", -" .XXXXXXXXXXX. ", -" .XXXXXXXXXX. ", -" ........XX. ", -" .X. ", -" .. ", -" . ", -" "}; diff --git a/samples/sampler/paste.xpm b/samples/sampler/paste.xpm deleted file mode 100644 index a2155a3e..00000000 --- a/samples/sampler/paste.xpm +++ /dev/null @@ -1,46 +0,0 @@ -/* XPM */ -static const char *const paste_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 25 1", -"< c #FEECE4", -"> c #FEE3D7", -"O c #FFFFFF", -"o c #7B767D", -"% c #F79586", -"& c #CAE1F3", -"@ c #F08B62", -"# c #FCCBB8", -"- c #FDD8C9", -"4 c #FFF8F4", -"5 c #FFF5F0", -" c None", -"$ c #F8AA8F", -", c #EFF6FC", -"1 c #F7FBFD", -"2 c #FAFCFE", -"; c #DAEAF7", -": c #E9F3FA", -"6 c #FFFAF8", -". c #3C78A6", -"3 c #FFF1ED", -"X c #9B8687", -"+ c #FBBCA4", -"* c #B6D5EE", -"= c #F4F9FD", -/* pixels */ -" ...... ", -" .XoOOOOoo. ", -".+XOOOOOOX@. ", -".+XXXXXXXX@. ", -".#++$$%@..... ", -".##++$$%.&*.=. ", -".-##++$$.;&.==. ", -".--##++$.:;.... ", -".>--##++.,:;&*. ", -".<>--##+.1,:;&. ", -".<<>--##.21,:;. ", -".3<<>--#.O21=:. ", -".45<<>--....... ", -".6453<>----. ", -"............ " -}; diff --git a/samples/sampler/redo.xpm b/samples/sampler/redo.xpm deleted file mode 100644 index d20afdcc..00000000 --- a/samples/sampler/redo.xpm +++ /dev/null @@ -1,58 +0,0 @@ -/* XPM */ -static const char *const redo_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 37 1", -"4 c #9BACC2", -"; c #4C7398", -"3 c #547B99", -"* c #547897", -"# c #5A89A6", -"8 c #3A749C", -"5 c #5A809C", -", c #7F99B4", -"& c #3F6F93", -"9 c #85A7BC", -"+ c #749BB4", -"> c #718BA7", -"e c #A5B3C8", -"w c #BECAD9", -": c #65839D", -"u c #E1E6EE", -"o c #236289", -"r c #ADBED2", -"= c #597B9A", -"2 c #8DA0B9", -" c None", -"% c #467291", -"1 c #7393AB", -"i c #4C809F", -"- c #A0BACB", -"O c #6591AE", -"X c #407598", -"6 c #6F90A6", -"t c #D2D9E0", -"7 c #ADBACE", -"@ c #326A8F", -"0 c #467A9C", -". c #ACC4D3", -"< c #7F97B0", -"y c #B3BFD1", -"q c #A2B3C5", -"$ c #8FB0C3", -/* pixels */ -" .XoooO ", -" +o@@@@@o# +", -" $@%%&@&%%&@ +o", -" X*=@+-+@*=;@#&@", -" @:=+ @=:=*:@", -" &>:$ @:>>>@", -" &,,,,&", -" +123 @<2222&", -" X44X #@56<44X", -" O1748 .9#&o", -" 0qwe8 ", -" 8rty8 ", -" 8wu+ ", -" i## ", -" " -}; diff --git a/samples/sampler/undo.xpm b/samples/sampler/undo.xpm deleted file mode 100644 index 3f6eaddd..00000000 --- a/samples/sampler/undo.xpm +++ /dev/null @@ -1,58 +0,0 @@ -/* XPM */ -static const char *const undo_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 37 1", -"4 c #9BACC2", -"* c #4C7398", -"2 c #547B99", -"- c #547897", -"@ c #5A89A6", -"8 c #3A749C", -"6 c #5A809C", -", c #7F99B4", -"$ c #3F6F93", -"7 c #85A7BC", -"+ c #749BB4", -"> c #718BA7", -"0 c #A5B3C8", -"q c #BECAD9", -": c #65839D", -"u c #E1E6EE", -"X c #236289", -"y c #ADBED2", -"= c #597B9A", -"1 c #8DA0B9", -" c None", -"% c #467291", -"3 c #7393AB", -"i c #4C809F", -"; c #A0BACB", -". c #6591AE", -"o c #407598", -"5 c #6F90A6", -"t c #D2D9E0", -"9 c #ADBACE", -"# c #326A8F", -"e c #467A9C", -"O c #ACC4D3", -"< c #7F97B0", -"r c #B3BFD1", -"w c #A2B3C5", -"& c #8FB0C3", -/* pixels */ -" .XXXoO ", -"+ @X#####X+ ", -"X+ #$%%$#$%%#& ", -"#$@#*=-#+;+#=-o ", -"#:-=:=# +=:# ", -"#>>>:# &:>$ ", -"$,,,>o o<,$ ", -"$1111<# 213+ ", -"o44<56#@ o44o ", -"X$@7O 8493. ", -" 80qwe ", -" 8rty8 ", -" +uq8 ", -" @@i ", -" " -}; From 3f6b05e6112cf49bb5821b38eda5e2beea734a37 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Mon, 25 Mar 2024 15:13:48 +0100 Subject: [PATCH 10/10] fix scintilla sample --- samples/text/scintilla.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/text/scintilla.rb b/samples/text/scintilla.rb index 6916c794..38edaca9 100755 --- a/samples/text/scintilla.rb +++ b/samples/text/scintilla.rb @@ -176,7 +176,7 @@ def self.describe end def self.activate - frame = Scintilla::MyFrame.new("wxRuby Scintilla App",Point.new(50, 50), Size.new(450, 340)) + frame = Scintilla::MyFrame.new("wxRuby Scintilla App", [50, 50], [450, 340]) frame.show(true) frame end