wxruby3 0.9.8 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (158) hide show
  1. checksums.yaml +4 -4
  2. data/INSTALL.md +23 -1
  3. data/README.md +13 -27
  4. data/ext/mkrf_conf_ext.rb +11 -7
  5. data/lib/wx/core/app.rb +16 -0
  6. data/lib/wx/core/colour.rb +36 -28
  7. data/lib/wx/core/const.rb +19 -0
  8. data/lib/wx/core/enum.rb +17 -1
  9. data/lib/wx/core/geometry.rb +121 -0
  10. data/lib/wx/core/graphics_pen_info.rb +18 -0
  11. data/lib/wx/core/image.rb +49 -0
  12. data/lib/wx/core/menu_bar.rb +11 -0
  13. data/lib/wx/core/paintdc.rb +9 -3
  14. data/lib/wx/doc/app.rb +97 -41
  15. data/lib/wx/doc/bitmap.rb +4 -0
  16. data/lib/wx/doc/client_dc.rb +2 -2
  17. data/lib/wx/doc/clipboard.rb +1 -1
  18. data/lib/wx/doc/colour.rb +12 -0
  19. data/lib/wx/doc/const.rb +16 -0
  20. data/lib/wx/doc/cursor.rb +4 -0
  21. data/lib/wx/doc/dc_overlay.rb +34 -0
  22. data/lib/wx/doc/enum.rb +7 -1
  23. data/lib/wx/doc/event_blocker.rb +1 -1
  24. data/lib/wx/doc/evthandler.rb +25 -3
  25. data/lib/wx/doc/functions.rb +3 -6
  26. data/lib/wx/doc/gc_dc.rb +13 -4
  27. data/lib/wx/doc/geometry.rb +136 -0
  28. data/lib/wx/doc/graphics_context.rb +25 -7
  29. data/lib/wx/doc/icon.rb +4 -0
  30. data/lib/wx/doc/image.rb +56 -0
  31. data/lib/wx/doc/list_ctrl.rb +6 -6
  32. data/lib/wx/doc/memory_dc.rb +2 -11
  33. data/lib/wx/doc/mirror_dc.rb +1 -1
  34. data/lib/wx/doc/pen.rb +26 -0
  35. data/lib/wx/doc/persistence_manager.rb +1 -1
  36. data/lib/wx/doc/persistent_object.rb +1 -1
  37. data/lib/wx/doc/pg/property_grid_interface.rb +3 -3
  38. data/lib/wx/doc/prt/printer_dc.rb +2 -2
  39. data/lib/wx/doc/region_iterator.rb +1 -1
  40. data/lib/wx/doc/scaled_dc.rb +1 -1
  41. data/lib/wx/doc/screen_dc.rb +1 -1
  42. data/lib/wx/doc/svg_file_dc.rb +1 -1
  43. data/lib/wx/doc/textctrl.rb +1 -1
  44. data/lib/wx/doc/tree_ctrl.rb +2 -2
  45. data/lib/wx/doc/validator.rb +6 -6
  46. data/lib/wx/doc/variant.rb +2 -2
  47. data/lib/wx/doc/window.rb +5 -4
  48. data/lib/wx/grid/keyword_defs.rb +1 -1
  49. data/lib/wx/html/keyword_defs.rb +3 -3
  50. data/lib/wx/keyword_defs.rb +76 -71
  51. data/lib/wx/pg/keyword_defs.rb +2 -2
  52. data/lib/wx/pg/pg_property.rb +12 -0
  53. data/lib/wx/rbn/keyword_defs.rb +1 -1
  54. data/lib/wx/rtc/keyword_defs.rb +1 -1
  55. data/lib/wx/stc/keyword_defs.rb +1 -1
  56. data/lib/wx/version.rb +1 -1
  57. data/lib/wx/wxruby/cmd/setup.rb +3 -0
  58. data/rakelib/configure.rb +7 -0
  59. data/rakelib/gem.rake +3 -2
  60. data/rakelib/gem.rb +3 -2
  61. data/rakelib/lib/config/linux.rb +1 -1
  62. data/rakelib/lib/config/mingw.rb +4 -101
  63. data/rakelib/lib/config/pkgman/linux.rb +31 -8
  64. data/rakelib/lib/config/pkgman/mingw.rb +112 -0
  65. data/rakelib/lib/config/unixish.rb +6 -7
  66. data/rakelib/lib/config.rb +25 -4
  67. data/rakelib/lib/core/include/enum.inc +31 -1
  68. data/rakelib/lib/director/affine_matrix.rb +51 -0
  69. data/rakelib/lib/director/app.rb +29 -13
  70. data/rakelib/lib/director/art_provider.rb +4 -0
  71. data/rakelib/lib/director/cursor.rb +6 -2
  72. data/rakelib/lib/director/dc.rb +1 -6
  73. data/rakelib/lib/director/derived_dc.rb +88 -31
  74. data/rakelib/lib/director/dialog.rb +0 -8
  75. data/rakelib/lib/director/geometry.rb +142 -0
  76. data/rakelib/lib/director/graphics_context.rb +3 -2
  77. data/rakelib/lib/director/graphics_object.rb +18 -25
  78. data/rakelib/lib/director/image.rb +59 -0
  79. data/rakelib/lib/director/menu.rb +2 -3
  80. data/rakelib/lib/director/menu_bar.rb +0 -3
  81. data/rakelib/lib/director/pen.rb +1 -1
  82. data/rakelib/lib/director/richtext_ctrl.rb +1 -1
  83. data/rakelib/lib/director/system_settings.rb +1 -1
  84. data/rakelib/lib/director/window.rb +9 -3
  85. data/rakelib/lib/extractor/function.rb +1 -1
  86. data/rakelib/lib/generate/doc/animation_ctrl.yaml +10 -0
  87. data/rakelib/lib/generate/doc/banner_window.yaml +35 -0
  88. data/rakelib/lib/generate/doc/graphics_context.yaml +12 -0
  89. data/rakelib/lib/generate/doc/graphics_object.yaml +12 -0
  90. data/rakelib/lib/generate/doc/grid_ctrl.yaml +25 -0
  91. data/rakelib/lib/generate/doc/header_ctrl.yaml +91 -0
  92. data/rakelib/lib/generate/doc/icon.yaml +10 -0
  93. data/rakelib/lib/generate/doc/info_bar.yaml +27 -0
  94. data/rakelib/lib/generate/doc/log.yaml +1 -1
  95. data/rakelib/lib/generate/doc/media_ctrl.yaml +27 -0
  96. data/rakelib/lib/generate/doc/persistent_window.yaml +22 -0
  97. data/rakelib/lib/generate/doc/pg_editor.yaml +1 -1
  98. data/rakelib/lib/generate/doc/pg_property.yaml +4 -4
  99. data/rakelib/lib/generate/doc/rearrange_list.yaml +14 -0
  100. data/rakelib/lib/generate/doc/ribbon_panel.yaml +15 -0
  101. data/rakelib/lib/generate/doc/rich_text_formatting_dialog.yaml +26 -0
  102. data/rakelib/lib/generate/doc/text_ctrl.yaml +1 -1
  103. data/rakelib/lib/generate/doc/wizard.yaml +27 -0
  104. data/rakelib/lib/generate/doc.rb +4 -4
  105. data/rakelib/lib/generate/interface.rb +1 -1
  106. data/rakelib/lib/specs/interfaces.rb +3 -0
  107. data/rakelib/lib/swig_runner.rb +24 -3
  108. data/rakelib/lib/typemap/points_list.rb +8 -2
  109. data/rakelib/lib/typemap/richtext.rb +17 -0
  110. data/rakelib/yard/templates/default/fulldoc/html/setup.rb +3 -3
  111. data/samples/dialogs/wizard.rb +20 -19
  112. data/samples/drawing/art/drawing/image.bmp +0 -0
  113. data/samples/drawing/art/drawing/mask.bmp +0 -0
  114. data/samples/drawing/art/drawing/pat35.bmp +0 -0
  115. data/samples/drawing/art/drawing/pat36.bmp +0 -0
  116. data/samples/drawing/art/drawing/pat4.bmp +0 -0
  117. data/samples/drawing/art/drawing/smile.xpm +42 -0
  118. data/samples/drawing/drawing.rb +2276 -0
  119. data/samples/drawing/tn_drawing.png +0 -0
  120. data/samples/html/html.rb +1 -1
  121. data/samples/propgrid/propgrid.rb +1 -1
  122. data/samples/propgrid/propgrid_minimal.rb +1 -1
  123. data/samples/propgrid/sample_props.rb +1 -1
  124. data/samples/sampler/editor.rb +13 -11
  125. data/samples/sampler.rb +14 -10
  126. data/samples/text/richtext.rb +53 -0
  127. data/samples/text/scintilla.rb +1 -1
  128. data/samples/text/unicode.rb +4 -4
  129. data/tests/test_ext_controls.rb +12 -5
  130. data/tests/test_gdi_object.rb +2 -2
  131. data/tests/test_std_controls.rb +12 -12
  132. metadata +33 -32
  133. data/lib/wx/doc/extra/00_starting.md +0 -154
  134. data/lib/wx/doc/extra/01_packages.md +0 -180
  135. data/lib/wx/doc/extra/02_lifecycles.md +0 -166
  136. data/lib/wx/doc/extra/03_dialogs.md +0 -57
  137. data/lib/wx/doc/extra/04_enums.md +0 -143
  138. data/lib/wx/doc/extra/05_event-handling.md +0 -191
  139. data/lib/wx/doc/extra/06_geometry.md +0 -62
  140. data/lib/wx/doc/extra/07_colour_and_font.md +0 -52
  141. data/lib/wx/doc/extra/08_extensions.md +0 -144
  142. data/lib/wx/doc/extra/09_exceptions.md +0 -54
  143. data/lib/wx/doc/extra/10_art.md +0 -111
  144. data/lib/wx/doc/extra/11_drawing_and_dc.md +0 -62
  145. data/lib/wx/doc/extra/12_client_data.md +0 -89
  146. data/lib/wx/doc/extra/13_validators.md +0 -139
  147. data/lib/wx/doc/extra/14_config.md +0 -101
  148. data/lib/wx/doc/extra/15_persistence.md +0 -148
  149. data/samples/sampler/back.xpm +0 -21
  150. data/samples/sampler/copy.xpm +0 -44
  151. data/samples/sampler/cut.xpm +0 -46
  152. data/samples/sampler/filesave.xpm +0 -42
  153. data/samples/sampler/find.xpm +0 -62
  154. data/samples/sampler/findrepl.xpm +0 -63
  155. data/samples/sampler/forward.xpm +0 -21
  156. data/samples/sampler/paste.xpm +0 -46
  157. data/samples/sampler/redo.xpm +0 -58
  158. data/samples/sampler/undo.xpm +0 -58
data/lib/wx/doc/image.rb CHANGED
@@ -51,8 +51,62 @@ module Wx
51
51
  # @return [Hash] hash object extended with {Wx::Image::Histogram}
52
52
  def compute_histogram; end
53
53
 
54
+ # Converts a color in HSV colour space to RGB colour space.
55
+ # @param [Wx::Image::HSVValue,Array(Float,Float,Float)] arg HSV colour
56
+ def self.hsv_to_rgb(arg) end
57
+
58
+ # Converts a color in RGB colour space to HSV colour space.
59
+ # @param [Wx::Image::RGBValue,Array(Float,Float,Float)] arg RGB colour
60
+ def self.rgb_to_hsv(arg) end
61
+
62
+ class HSVValue
63
+
64
+ # Constructor for HSVValue, an object that contains values for hue, saturation and value which represent the value of a color.
65
+ # It is used by {Wx::Image.hsv_to_rgb} and {Wx::Image.rgb_to_hsv}, which convert between HSV color space and RGB color space.
66
+ # @param [Float] hue
67
+ # @param [Float] saturation
68
+ # @param [Float] value
69
+ # @return [Wx::Image::HSVValue]
70
+ def initialize(hue, saturation, value)end
71
+
72
+ attr :hue, :saturation, :value
73
+
74
+ # Make HSVValue usable for parallel assignments like `hue, saturation, value = hsv`
75
+ # @return [Array(Float,Float,Float)]
76
+ def to_ary; end
77
+
78
+ # Convert to {Wx::Image::RGBValue}
79
+ # @return [Wx::Image::RGBValue]
80
+ def to_rgb; end
81
+
82
+ end
83
+
84
+ class RGBValue
85
+
86
+ # Constructor for RGBValue, an object that contains values for red, green and blue which represent the value of a color.
87
+ # It is used by {Wx::Image.hsv_to_rgb} and {Wx::Image.rgb_to_hsv}, which convert between RGB color space and HSV color space.
88
+ # @param [Float] red
89
+ # @param [Float] green
90
+ # @param [Float] blue
91
+ # @return [Wx::Image::RGBValue]
92
+ def initialize(red, green, blue)end
93
+
94
+ attr :red, :green, :blue
95
+
96
+ # Make RGBValue usable for parallel assignments like `red, green, blue = rgb`
97
+ # @return [Array(Float,Float,Float)]
98
+ def to_ary; end
99
+
100
+ # Convert to {Wx::Image::HSVValue}
101
+ # @return [Wx::Image::HSVValue]
102
+ def to_hsv; end
103
+
104
+ end
105
+
54
106
  end
55
107
 
108
+ # @!group Art creation methods
109
+
56
110
  # Searches for an art file with basename 'name' and creates an Image if found.
57
111
  # Raises an ArgumentError if not found.
58
112
  # Wx::ArtLocator::find_art is used to look up the art file using ::Kernel#caller_locations to
@@ -68,4 +122,6 @@ module Wx
68
122
  # @see Wx::ArtLocator::find_art
69
123
  def self.Image(name, bmp_type = nil, index=-1, art_path: nil, art_section: nil); end
70
124
 
125
+ # @!endgroup
126
+
71
127
  end
@@ -13,13 +13,13 @@ module Wx
13
13
 
14
14
  # Iterates all items in the list control passing each item (id) to the given block.
15
15
  # @yieldparam [Integer] item
16
- # @return [Object] result of last block iteration
16
+ # @return [::Object] result of last block iteration
17
17
  def each(&block) end
18
18
 
19
19
  # Iterates all selected items in the list control (like #get_next_item(item, Wx::LIST_NEXT_ALL, Wx::LIST_STATE_SELECTED))
20
20
  # passing each item (id) to the given block.
21
21
  # @yieldparam [Integer] item
22
- # @return [Object] result of last block iteration
22
+ # @return [::Object] result of last block iteration
23
23
  def each_selected(&block) end
24
24
 
25
25
  # Returns array of selected items.
@@ -31,10 +31,10 @@ module Wx
31
31
  # passing the <b>item data</b> for each item as well as the `data` argument given to the #sort_items method.
32
32
  # The block should return 0 if the items are equal, negative value if the first item is less than the second
33
33
  # one and positive value if the first one is greater than the second one.
34
- # @param [Object] data user data to pass on to the sorting block
35
- # @yieldparam [Object] item_data1 data for first item
36
- # @yieldparam [Object] item_data2 data for second item
37
- # @yieldparam [Object] data propagated data argument
34
+ # @param [::Object] data user data to pass on to the sorting block
35
+ # @yieldparam [::Object] item_data1 data for first item
36
+ # @yieldparam [::Object] item_data2 data for second item
37
+ # @yieldparam [::Object] data propagated data argument
38
38
  def sort_items(data = nil, &block) end
39
39
 
40
40
  end
@@ -66,16 +66,7 @@ module Wx
66
66
 
67
67
  end
68
68
 
69
- class AutoBufferedPaintDC < Wx::BufferedPaintDC
70
-
71
- # Creates a Buffered DC and passes that to the given block to draw on.
72
- # Destroys the DC after the block returns.
73
- # Pass a pointer to the window on which you wish to paint.
74
- # @note In wxRuby this method mostly exists to be consistent with the other DC classes. It is however recommended to use Wx::Window#paint_buffered instead.
75
- # @param [Wx::Window] win The underlying window; everything drawn to this object will be flushed to this window when this object is destroyed.
76
- # @yieldparam [Wx::AutoBufferedPaintDC] dc
77
- def self.draw_on(win, &block) end
78
-
79
- end
69
+ # This constant is set to either Wx::PaintDC if the platform supports native double buffering or Wx::BufferedPaintDC otherwise.
70
+ AutoBufferedPaintDC = _
80
71
 
81
72
  end
@@ -14,7 +14,7 @@ module Wx
14
14
  # @param [Wx::DC] dc DC to duplicate the (mirrored) drawing on
15
15
  # @param [Boolean] mirror whether to mirror or not
16
16
  # @yieldparam [Wx::MirrorDC] dc the MirrorDC instance to paint on
17
- # @return [Object] result of the block
17
+ # @return [::Object] result of the block
18
18
  def self.draw_on(dc, mirror) end
19
19
 
20
20
  end
data/lib/wx/doc/pen.rb CHANGED
@@ -16,8 +16,34 @@ module Wx
16
16
  # @return [Wx::Pen]
17
17
  def self.find_or_create_pen(colour, width=1, style=Wx::PenStyle::PENSTYLE_SOLID) end
18
18
 
19
+ # Associates an array of dash values with the pen.
20
+ #
21
+ # @see Wx::Pen#get_dashes
22
+ # @param dashes [Array<Integer>]
23
+ # @return [void]
24
+ def set_dashes(dashes) end
25
+
26
+ # Gets an array of dashes.
27
+ #
28
+ # @see Wx::Pen#set_dashes
29
+ # @return [Array<Integer>]
30
+ def get_dashes; end
31
+ alias_method :dashes, :get_dashes
32
+
19
33
  end
20
34
 
21
35
  ThePenList = Wx::Pen
22
36
 
37
+ class PenInfo
38
+
39
+ # @param dashes [Array<Integer>]
40
+ # @return [Wx::PenInfo]
41
+ def dashes(dashes) end
42
+
43
+ # @return [Array<Integer>]
44
+ def get_dashes; end
45
+ alias_method :dashes, :get_dashes
46
+
47
+ end
48
+
23
49
  end
@@ -14,7 +14,7 @@ module Wx
14
14
  # instance for the object it is called for.
15
15
  # This method raises a NoImplementError if the object class does not support persistence.
16
16
  # @see Defining Custom Persistent Windows
17
- # @param obj [Object]
17
+ # @param obj [::Object]
18
18
  # @return [Wx::PersistentObject]
19
19
  def self.create_persistent_object(obj) end
20
20
 
@@ -11,7 +11,7 @@ module Wx
11
11
 
12
12
  # Save the specified value using the given name.
13
13
  # @param [String] name The name of the value in the configuration file.
14
- # @param [Object] value The value to save, currently must be a type supported by wxConfig.
14
+ # @param [::Object] value The value to save, currently must be a type supported by wxConfig.
15
15
  # @return [Boolean] true if the value was saved or false if an error occurred.
16
16
  def save_value(name, value); end
17
17
  protected :save_value
@@ -18,7 +18,7 @@ module Wx::PG
18
18
  # @param start [Integer,Wx::PG::Property] start position (either {Wx::Direction::TOP} or {Wx::Direction::BOTTOM} or the property to start at)
19
19
  # @param reverse [true,false] iterate properties in reverse
20
20
  # @yieldparam item [Wx::PG::PGProperty] property
21
- # @return [Object] result of last block execution
21
+ # @return [::Object] result of last block execution
22
22
  # @overload each_property(flags, start, reverse:)
23
23
  # @param flags [Integer] flags specifying iteration (see {Wx::PG::PG_ITERATOR_FLAGS})
24
24
  # @param start [Integer,Wx::PG::Property] start position (either {Wx::Direction::TOP} or {Wx::Direction::BOTTOM} or the property to start at)
@@ -35,7 +35,7 @@ module Wx::PG
35
35
  # @param start [Integer,Wx::PG::Property] start position (either {Wx::Direction::TOP} or {Wx::Direction::BOTTOM} or the property to start at)
36
36
  # @param reverse [true,false] iterate properties in reverse
37
37
  # @yieldparam item [Wx::PG::PGProperty] property
38
- # @return [Object] result of last block execution
38
+ # @return [::Object] result of last block execution
39
39
  # @overload reverse_each_property(flags, start)
40
40
  # @param flags [Integer] flags specifying iteration (see {Wx::PG::PG_ITERATOR_FLAGS})
41
41
  # @param start [Integer,Wx::PG::Property] start position (either {Wx::Direction::TOP} or {Wx::Direction::BOTTOM} or the property to start at)
@@ -50,7 +50,7 @@ module Wx::PG
50
50
  # @overload each_property_attribute(id , &block)
51
51
  # @param id [String,Wx::PG::PGProperty] (name of) property to iterate attributes of
52
52
  # @yieldparam item [Wx::Variant] attribute
53
- # @return [Object] result of last block execution
53
+ # @return [::Object] result of last block execution
54
54
  # @overload each_property_attribute(id)
55
55
  # @param id [String,Wx::PG::PGProperty] (name of) property to iterate attributes of
56
56
  # @return [Enumerator] an enumerator
@@ -13,7 +13,7 @@ module Wx::PRT
13
13
  # it's single argument.
14
14
  # @param [Wx::PRT::PrintData] print_data print_data defining the print settings
15
15
  # @yieldparam [Wx::PrinterDC] dc the PrinterDC instance to paint on
16
- # @return [Object] result of the block
16
+ # @return [::Object] result of the block
17
17
  def self.draw_on(print_data) end
18
18
 
19
19
  end
@@ -24,7 +24,7 @@ module Wx::PRT
24
24
  # it's single argument.
25
25
  # @param [Wx::PRT::PrintData] print_data print_data defining the print settings
26
26
  # @yieldparam [Wx::PostScriptDC] dc the PostScriptDC instance to paint on
27
- # @return [Object] result of the block
27
+ # @return [::Object] result of the block
28
28
  def self.draw_on(print_data) end
29
29
 
30
30
  end
@@ -31,7 +31,7 @@ module Wx
31
31
  # If no block is given an Enumerator is returned.
32
32
  # @overload each(&block)
33
33
  # @yieldparam [Wx::Rect] rect
34
- # @return [Object]
34
+ # @return [::Object]
35
35
  # @overload each()
36
36
  # @return [Enumerator]
37
37
  def each; end
@@ -16,7 +16,7 @@ module Wx
16
16
  # @param [Wx::DC] target DC to draw on (scaled)
17
17
  # @param [Float] scale scale factor
18
18
  # @yieldparam [Wx::ScaledDC] dc scaled dc to draw on
19
- # @return [Object] result from block
19
+ # @return [::Object] result from block
20
20
  def self.draw_on(target, scale) end
21
21
  end
22
22
 
@@ -12,7 +12,7 @@ module Wx
12
12
  # Executes the given block providing a temporary (screen) dc as
13
13
  # it's single argument.
14
14
  # @yieldparam [Wx::ScreenDC] dc the ScreenDC instance to paint on
15
- # @return [Object] result of the block
15
+ # @return [::Object] result of the block
16
16
  def self.draw_on; end
17
17
 
18
18
  end
@@ -18,7 +18,7 @@ module Wx
18
18
  # @param [Float] dpi resolution for SVG image
19
19
  # @param [String] title readable name for the SVG document
20
20
  # @yieldparam [Wx::SVGFileDC] dc the SVGFileDC instance to paint on
21
- # @return [Object] result of the block
21
+ # @return [::Object] result of the block
22
22
  def self.draw_on(filename, width=320, height=240, dpi=72, title='') end
23
23
 
24
24
  end
@@ -62,7 +62,7 @@ module Wx
62
62
 
63
63
  # Appends the string representation of `obj` to the text value of the control.
64
64
  # Calls #to_s to get the string representation of `obj`.
65
- # @param [Object] obj
65
+ # @param [::Object] obj
66
66
  # @return [self]
67
67
  def <<(obj) end
68
68
 
@@ -37,7 +37,7 @@ module Wx
37
37
  #
38
38
  # Returns an invalid tree item if there are no further children.
39
39
  # @param [Wx::TreeItemId] parent_id the id of the parent tree item for which to iterate children
40
- # @param [Object] cookie cookie value as returned from previous #get_first_cild or #get_next_child call.
40
+ # @param [::Object] cookie cookie value as returned from previous #get_first_cild or #get_next_child call.
41
41
  # @return [Array(Wx::TreeItemId, Object)] first child item id (if any) and cookie value
42
42
  def get_next_child(parent_id, cookie) end
43
43
 
@@ -74,7 +74,7 @@ module Wx
74
74
  # @param [Integer] pos child item's position to insert before
75
75
  # @param [Integer] image image index for unselected item
76
76
  # @param [Integer] selImage image index for selected item
77
- # @param data [Object]
77
+ # @param data [::Object]
78
78
  # @return [Wx::TreeItemId] id of inserted tree item
79
79
  def insert_item_before(parent, pos, text, image=-1, selImage=-1, data=nil) end
80
80
 
@@ -22,7 +22,7 @@ module Wx
22
22
  # Should retrieve and return the data from the associated window (#get_window).
23
23
  # By default returns nil (which indicates there is no custom data to transfer).
24
24
  # Overload for customized functionality.
25
- # @return [Object] retrieved data from window
25
+ # @return [::Object] retrieved data from window
26
26
  def do_transfer_from_window; end
27
27
  protected :do_transfer_from_window
28
28
 
@@ -30,7 +30,7 @@ module Wx
30
30
  # Should transfer the given data to the associated window and return true if successful.
31
31
  # By default does nothing and just returns true.
32
32
  # Overload for customized functionality.
33
- # @param [Object] data
33
+ # @param [::Object] data
34
34
  # @return [Boolean]
35
35
  def do_transfer_to_window(data) end
36
36
  protected :do_transfer_to_window
@@ -60,7 +60,7 @@ module Wx
60
60
  # win.set_validator(val)
61
61
  #
62
62
  # @param [String,Symbol,Method,Proc] meth (name of) method or event handling proc; to be supplied when no block is given
63
- # @yieldparam [Object] data the data retrieved from the window
63
+ # @yieldparam [::Object] data the data retrieved from the window
64
64
  def on_transfer_from_window(meth=nil, &block) end
65
65
 
66
66
  # Installs a callback handler to provide the data to transfer to the associated window.
@@ -85,13 +85,13 @@ module Wx
85
85
  # win.set_validator(val)
86
86
  #
87
87
  # @param [String,Symbol,Method,Proc] meth (name of) method or event handling proc; to be supplied when no block is given
88
- # @yieldreturn [Object] the data to transfer to the window
88
+ # @yieldreturn [::Object] the data to transfer to the window
89
89
  def on_transfer_to_window(meth=nil, &block) end
90
90
 
91
91
  # Method called with data transferred from window.
92
92
  # By default will call the on_transfer_from_window handler if defined.
93
93
  # Returns true if successful or none defined.
94
- # @param [Object] data
94
+ # @param [::Object] data
95
95
  # @return [Boolean]
96
96
  def do_on_transfer_from_window(data) end
97
97
  protected :do_on_transfer_from_window
@@ -100,7 +100,7 @@ module Wx
100
100
  # By default will call the on_transfer_to_window handler if defined.
101
101
  # Returns the handler's result if successful.
102
102
  # Otherwise returns nil.
103
- # @return [Object]
103
+ # @return [::Object]
104
104
  def do_on_transfer_to_window; end
105
105
  protected :do_on_transfer_to_window
106
106
 
@@ -16,7 +16,7 @@ module Wx
16
16
  # Returns an enumerator when no block is given.
17
17
  # @overload each(&block)
18
18
  # @yieldparam item [Wx::Variant] variant list item
19
- # @return [Object] result of last block execution
19
+ # @return [::Object] result of last block execution
20
20
  # @overload each
21
21
  # @return [Enumerator] an enumerator
22
22
  def each; end
@@ -52,7 +52,7 @@ module Wx
52
52
  # @return [self]
53
53
  # @overload assign(value)
54
54
  # Equality test operator.
55
- # @param value [Object]
55
+ # @param value [::Object]
56
56
  # @return [self]
57
57
  # @overload assign(value)
58
58
  # Equality test operator.
data/lib/wx/doc/window.rb CHANGED
@@ -44,13 +44,14 @@ module Wx
44
44
  # Creates a Wx::PaintDC when called from an evt_paint handler and a
45
45
  # Wx::ClientDC otherwise.
46
46
  # @yieldparam [Wx::PaintDC,Wx::ClientDC] dc dc to paint on
47
- # @return [Object] result from block
47
+ # @return [::Object] result from block
48
48
  def paint; end
49
49
 
50
- # Similar to #paint but this time creates a Wx::AutoBufferedPaintDC when called
50
+ # Similar to #paint but this time creates a buffered paint DC (which will be either a 'regular' Wx::PaintDC if
51
+ # the platform natively supports double buffering or a Wx::BufferedPaintDC otherwise) when called
51
52
  # from an evt_paint handler and a Wx::ClientDC otherwise.
52
- # @yieldparam [Wx::AutoBufferedPaintDC,Wx::ClientDC] dc dc to paint on
53
- # @return [Object] result from block
53
+ # @yieldparam [Wx::PaintDC,Wx::BufferedPaintDC,Wx::ClientDC] dc dc to paint on
54
+ # @return [::Object] result from block
54
55
  def paint_buffered; end
55
56
 
56
57
  # Yield each child window to the given block.
@@ -13,5 +13,5 @@
13
13
  # wxGrid A grid (table) window
14
14
  Wx::define_keyword_ctors(Wx::GRID::Grid) do
15
15
  wx_ctor_params :id, :pos, :size, :style => Wx::WANTS_CHARS
16
- wx_ctor_params :name => 'grid'
16
+ wx_ctor_params :name => Wx::GRID_NAME_STR
17
17
  end
@@ -13,16 +13,16 @@
13
13
  # wxHtmlWindow - Control for displaying HTML
14
14
  Wx::define_keyword_ctors(Wx::HTML::HtmlWindow) do
15
15
  wx_ctor_params :id, :pos, :size, :style => Wx::HTML::HW_DEFAULT_STYLE
16
- wx_ctor_params :name => 'htmlWindow'
16
+ wx_ctor_params :name => Wx::HTML_WINDOW_NAME_STR
17
17
  end
18
18
 
19
19
  # wxHtmlListBox A listbox showing HTML content
20
20
  Wx::define_keyword_ctors(Wx::HTML::HtmlListBox) do
21
- wx_ctor_params :id, :pos, :size, :style, :name => 'HtmlListBox'
21
+ wx_ctor_params :id, :pos, :size, :style, :name => Wx::HTML_LIST_BOX_NAME_STR
22
22
  end
23
23
 
24
24
  Wx::define_keyword_ctors(Wx::HTML::SimpleHtmlListBox) do
25
25
  wx_ctor_params :id, :pos, :size
26
26
  wx_ctor_params :choices => []
27
- wx_ctor_params :style, :validator, :name => 'SimpleHtmlListBox'
27
+ wx_ctor_params :style, :validator, :name => Wx::SIMPLE_HTML_LIST_BOX_NAME_STR
28
28
  end