fxruby 1.6.44-x86-mingw32 → 1.6.46-x86-mingw32

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 (335) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/binary.yml +89 -0
  3. data/.github/workflows/ci.yml +68 -0
  4. data/History.md +11 -0
  5. data/{README.rdoc → README.md} +18 -14
  6. data/Rakefile +27 -8
  7. data/appveyor.yml +8 -14
  8. data/doap.rdf +2 -2
  9. data/docs/Fox/Canvas/CanvasError.html +3 -3
  10. data/docs/Fox/Canvas/CircleShape.html +3 -3
  11. data/docs/Fox/Canvas/ImageShape.html +3 -3
  12. data/docs/Fox/Canvas/LineShape.html +3 -3
  13. data/docs/Fox/Canvas/PolygonShape.html +3 -3
  14. data/docs/Fox/Canvas/RectangleShape.html +3 -3
  15. data/docs/Fox/Canvas/SelectionPolicy.html +3 -3
  16. data/docs/Fox/Canvas/Shape.html +5 -5
  17. data/docs/Fox/Canvas/ShapeCanvas.html +6 -6
  18. data/docs/Fox/Canvas/ShapeGroup.html +3 -3
  19. data/docs/Fox/Canvas/SingleSelectionPolicy.html +3 -3
  20. data/docs/Fox/Canvas/TextShape.html +3 -3
  21. data/docs/Fox/Canvas.html +6 -6
  22. data/docs/Fox/FTNonModal.html +3 -3
  23. data/docs/Fox/FX4Splitter.html +3 -3
  24. data/docs/Fox/FX7Segment.html +3 -3
  25. data/docs/Fox/FXAccelTable.html +7 -7
  26. data/docs/Fox/FXApp.html +24 -24
  27. data/docs/Fox/FXArc.html +7 -7
  28. data/docs/Fox/FXArrowButton.html +3 -3
  29. data/docs/Fox/FXBMPIcon.html +3 -3
  30. data/docs/Fox/FXBMPImage.html +3 -3
  31. data/docs/Fox/FXBitmap.html +3 -3
  32. data/docs/Fox/FXBitmapFrame.html +3 -3
  33. data/docs/Fox/FXBitmapView.html +3 -3
  34. data/docs/Fox/FXButton.html +3 -3
  35. data/docs/Fox/FXCURCursor.html +3 -3
  36. data/docs/Fox/FXCalendar.html +3 -3
  37. data/docs/Fox/FXCanvas.html +3 -3
  38. data/docs/Fox/FXCheckButton.html +3 -3
  39. data/docs/Fox/FXChoiceBox.html +4 -4
  40. data/docs/Fox/FXColor.html +3 -3
  41. data/docs/Fox/FXColorBar.html +3 -3
  42. data/docs/Fox/FXColorDialog.html +4 -4
  43. data/docs/Fox/FXColorItem.html +3 -3
  44. data/docs/Fox/FXColorList.html +3 -3
  45. data/docs/Fox/FXColorRing.html +3 -3
  46. data/docs/Fox/FXColorSelector.html +3 -3
  47. data/docs/Fox/FXColorWell.html +5 -5
  48. data/docs/Fox/FXColorWheel.html +3 -3
  49. data/docs/Fox/FXComboBox.html +6 -6
  50. data/docs/Fox/FXComboTableItem.html +3 -3
  51. data/docs/Fox/FXCommand.html +4 -4
  52. data/docs/Fox/FXComposite.html +5 -5
  53. data/docs/Fox/FXCursor.html +3 -3
  54. data/docs/Fox/FXDC.html +9 -9
  55. data/docs/Fox/FXDCPrint.html +3 -3
  56. data/docs/Fox/FXDCWindow.html +3 -3
  57. data/docs/Fox/FXDataTarget.html +10 -10
  58. data/docs/Fox/FXDebugTarget.html +3 -3
  59. data/docs/Fox/FXDelegator.html +3 -3
  60. data/docs/Fox/FXDial.html +8 -8
  61. data/docs/Fox/FXDialogBox.html +4 -4
  62. data/docs/Fox/FXDict.html +3 -3
  63. data/docs/Fox/FXDirBox.html +3 -3
  64. data/docs/Fox/FXDirDialog.html +5 -5
  65. data/docs/Fox/FXDirItem.html +3 -3
  66. data/docs/Fox/FXDirList.html +7 -7
  67. data/docs/Fox/FXDirSelector.html +5 -5
  68. data/docs/Fox/FXDockBar.html +6 -6
  69. data/docs/Fox/FXDockHandler.html +3 -3
  70. data/docs/Fox/FXDockSite.html +6 -6
  71. data/docs/Fox/FXDockTitle.html +3 -3
  72. data/docs/Fox/FXDocument.html +3 -3
  73. data/docs/Fox/FXDragCorner.html +3 -3
  74. data/docs/Fox/FXDrawable.html +3 -3
  75. data/docs/Fox/FXDriveBox.html +3 -3
  76. data/docs/Fox/FXEvent.html +3 -3
  77. data/docs/Fox/FXExtentd.html +5 -5
  78. data/docs/Fox/FXExtentf.html +5 -5
  79. data/docs/Fox/FXFileAssoc.html +3 -3
  80. data/docs/Fox/FXFileDialog.html +8 -8
  81. data/docs/Fox/FXFileDict.html +3 -3
  82. data/docs/Fox/FXFileItem.html +3 -3
  83. data/docs/Fox/FXFileList.html +7 -7
  84. data/docs/Fox/FXFileSelector.html +11 -11
  85. data/docs/Fox/FXFileStream.html +3 -3
  86. data/docs/Fox/FXFoldingItem.html +5 -5
  87. data/docs/Fox/FXFoldingList.html +38 -38
  88. data/docs/Fox/FXFont.html +4 -4
  89. data/docs/Fox/FXFontDesc.html +3 -3
  90. data/docs/Fox/FXFontDialog.html +3 -3
  91. data/docs/Fox/FXFontSelector.html +3 -3
  92. data/docs/Fox/FXFrame.html +3 -3
  93. data/docs/Fox/FXGIFCursor.html +3 -3
  94. data/docs/Fox/FXGIFIcon.html +3 -3
  95. data/docs/Fox/FXGIFImage.html +3 -3
  96. data/docs/Fox/FXGLCanvas.html +5 -5
  97. data/docs/Fox/FXGLCone.html +3 -3
  98. data/docs/Fox/FXGLContext.html +3 -3
  99. data/docs/Fox/FXGLCube.html +3 -3
  100. data/docs/Fox/FXGLCylinder.html +3 -3
  101. data/docs/Fox/FXGLGroup.html +3 -3
  102. data/docs/Fox/FXGLLine.html +3 -3
  103. data/docs/Fox/FXGLObject.html +10 -10
  104. data/docs/Fox/FXGLPoint.html +3 -3
  105. data/docs/Fox/FXGLShape.html +3 -3
  106. data/docs/Fox/FXGLSphere.html +3 -3
  107. data/docs/Fox/FXGLViewer.html +3 -3
  108. data/docs/Fox/FXGLVisual.html +3 -3
  109. data/docs/Fox/FXGradient.html +3 -3
  110. data/docs/Fox/FXGradientBar.html +17 -17
  111. data/docs/Fox/FXGroupBox.html +5 -5
  112. data/docs/Fox/FXHeader.html +17 -17
  113. data/docs/Fox/FXHeaderItem.html +15 -15
  114. data/docs/Fox/FXHiliteStyle.html +3 -3
  115. data/docs/Fox/FXHorizontalFrame.html +4 -4
  116. data/docs/Fox/FXHorizontalSeparator.html +3 -3
  117. data/docs/Fox/FXICOIcon.html +3 -3
  118. data/docs/Fox/FXICOImage.html +3 -3
  119. data/docs/Fox/FXIcon.html +3 -3
  120. data/docs/Fox/FXIconDict.html +3 -3
  121. data/docs/Fox/FXIconItem.html +5 -5
  122. data/docs/Fox/FXIconList.html +19 -19
  123. data/docs/Fox/FXIconSource.html +7 -7
  124. data/docs/Fox/FXId.html +3 -3
  125. data/docs/Fox/FXImage.html +6 -6
  126. data/docs/Fox/FXImageFrame.html +3 -3
  127. data/docs/Fox/FXImageView.html +3 -3
  128. data/docs/Fox/FXInputDialog.html +5 -5
  129. data/docs/Fox/FXIrb.html +6 -6
  130. data/docs/Fox/FXJPGIcon.html +3 -3
  131. data/docs/Fox/FXJPGImage.html +3 -3
  132. data/docs/Fox/FXKnob.html +7 -7
  133. data/docs/Fox/FXLabel.html +5 -5
  134. data/docs/Fox/FXLight.html +3 -3
  135. data/docs/Fox/FXList.html +24 -24
  136. data/docs/Fox/FXListBox.html +7 -7
  137. data/docs/Fox/FXListItem.html +5 -5
  138. data/docs/Fox/FXMDIChild.html +6 -6
  139. data/docs/Fox/FXMDIClient.html +4 -4
  140. data/docs/Fox/FXMDIDeleteButton.html +3 -3
  141. data/docs/Fox/FXMDIMaximizeButton.html +3 -3
  142. data/docs/Fox/FXMDIMenu.html +3 -3
  143. data/docs/Fox/FXMDIMinimizeButton.html +3 -3
  144. data/docs/Fox/FXMDIRestoreButton.html +3 -3
  145. data/docs/Fox/FXMDIWindowButton.html +3 -3
  146. data/docs/Fox/FXMainWindow.html +3 -3
  147. data/docs/Fox/FXMaterial.html +3 -3
  148. data/docs/Fox/FXMatrix.html +3 -3
  149. data/docs/Fox/FXMemoryBuffer.html +3 -3
  150. data/docs/Fox/FXMemoryStream.html +3 -3
  151. data/docs/Fox/FXMenuBar.html +3 -3
  152. data/docs/Fox/FXMenuButton.html +6 -6
  153. data/docs/Fox/FXMenuCaption.html +5 -5
  154. data/docs/Fox/FXMenuCascade.html +3 -3
  155. data/docs/Fox/FXMenuCheck.html +3 -3
  156. data/docs/Fox/FXMenuCommand.html +3 -3
  157. data/docs/Fox/FXMenuPane.html +3 -3
  158. data/docs/Fox/FXMenuRadio.html +3 -3
  159. data/docs/Fox/FXMenuSeparator.html +3 -3
  160. data/docs/Fox/FXMenuTitle.html +3 -3
  161. data/docs/Fox/FXMessageBox.html +5 -5
  162. data/docs/Fox/FXObject.html +4 -4
  163. data/docs/Fox/FXOption.html +3 -3
  164. data/docs/Fox/FXOptionMenu.html +3 -3
  165. data/docs/Fox/FXPCXIcon.html +3 -3
  166. data/docs/Fox/FXPCXImage.html +3 -3
  167. data/docs/Fox/FXPNGIcon.html +3 -3
  168. data/docs/Fox/FXPNGImage.html +3 -3
  169. data/docs/Fox/FXPPMIcon.html +3 -3
  170. data/docs/Fox/FXPPMImage.html +3 -3
  171. data/docs/Fox/FXPSBounds.html +3 -3
  172. data/docs/Fox/FXPacker.html +3 -3
  173. data/docs/Fox/FXPicker.html +3 -3
  174. data/docs/Fox/FXPopup.html +3 -3
  175. data/docs/Fox/FXPrintDialog.html +3 -3
  176. data/docs/Fox/FXPrinter.html +3 -3
  177. data/docs/Fox/FXProgressBar.html +3 -3
  178. data/docs/Fox/FXProgressDialog.html +3 -3
  179. data/docs/Fox/FXPseudoKeyboard.html +3 -3
  180. data/docs/Fox/FXPseudoMouse.html +3 -3
  181. data/docs/Fox/FXPseudoTarget.html +3 -3
  182. data/docs/Fox/FXQuatd.html +3 -3
  183. data/docs/Fox/FXQuatf.html +3 -3
  184. data/docs/Fox/FXRGBIcon.html +3 -3
  185. data/docs/Fox/FXRGBImage.html +3 -3
  186. data/docs/Fox/FXRadioButton.html +3 -3
  187. data/docs/Fox/FXRanged.html +3 -3
  188. data/docs/Fox/FXRangef.html +3 -3
  189. data/docs/Fox/FXRealSlider.html +3 -3
  190. data/docs/Fox/FXRealSpinner.html +16 -16
  191. data/docs/Fox/FXRecentFiles.html +3 -3
  192. data/docs/Fox/FXRectangle.html +11 -11
  193. data/docs/Fox/FXRegion.html +3 -3
  194. data/docs/Fox/FXRegistry.html +5 -5
  195. data/docs/Fox/FXReplaceDialog.html +3 -3
  196. data/docs/Fox/FXRootWindow.html +3 -3
  197. data/docs/Fox/FXRuler.html +3 -3
  198. data/docs/Fox/FXRulerView.html +26 -26
  199. data/docs/Fox/FXScintilla.html +21 -21
  200. data/docs/Fox/FXScrollArea.html +5 -5
  201. data/docs/Fox/FXScrollBar.html +3 -3
  202. data/docs/Fox/FXScrollCorner.html +3 -3
  203. data/docs/Fox/FXScrollPane.html +3 -3
  204. data/docs/Fox/FXScrollWindow.html +4 -4
  205. data/docs/Fox/FXSearchDialog.html +3 -3
  206. data/docs/Fox/FXSegment.html +3 -3
  207. data/docs/Fox/FXSeparator.html +4 -4
  208. data/docs/Fox/FXSettings.html +3 -3
  209. data/docs/Fox/FXShell.html +3 -3
  210. data/docs/Fox/FXShutter.html +4 -4
  211. data/docs/Fox/FXShutterItem.html +3 -3
  212. data/docs/Fox/FXSize.html +3 -3
  213. data/docs/Fox/FXSlider.html +3 -3
  214. data/docs/Fox/FXSphered.html +3 -3
  215. data/docs/Fox/FXSpheref.html +3 -3
  216. data/docs/Fox/FXSpinner.html +16 -16
  217. data/docs/Fox/FXSplashScreen.html +3 -3
  218. data/docs/Fox/FXSplashWindow.html +5 -5
  219. data/docs/Fox/FXSplitter.html +3 -3
  220. data/docs/Fox/FXSpring.html +3 -3
  221. data/docs/Fox/FXStatusBar.html +3 -3
  222. data/docs/Fox/FXStatusLine.html +4 -4
  223. data/docs/Fox/FXStream.html +4 -4
  224. data/docs/Fox/FXStreamAllocError.html +3 -3
  225. data/docs/Fox/FXStreamEndError.html +3 -3
  226. data/docs/Fox/FXStreamError.html +3 -3
  227. data/docs/Fox/FXStreamFailureError.html +3 -3
  228. data/docs/Fox/FXStreamFormatError.html +3 -3
  229. data/docs/Fox/FXStreamFullError.html +4 -4
  230. data/docs/Fox/FXStreamNoReadError.html +3 -3
  231. data/docs/Fox/FXStreamNoWriteError.html +3 -3
  232. data/docs/Fox/FXStreamUnknownError.html +3 -3
  233. data/docs/Fox/FXStringDict.html +4 -4
  234. data/docs/Fox/FXSwitcher.html +8 -8
  235. data/docs/Fox/FXTGAIcon.html +3 -3
  236. data/docs/Fox/FXTGAImage.html +3 -3
  237. data/docs/Fox/FXTIFIcon.html +3 -3
  238. data/docs/Fox/FXTIFImage.html +3 -3
  239. data/docs/Fox/FXTabBar.html +8 -8
  240. data/docs/Fox/FXTabBook.html +4 -4
  241. data/docs/Fox/FXTabItem.html +3 -3
  242. data/docs/Fox/FXTable.html +27 -27
  243. data/docs/Fox/FXTableItem.html +5 -5
  244. data/docs/Fox/FXTablePos.html +3 -3
  245. data/docs/Fox/FXTableRange.html +3 -3
  246. data/docs/Fox/FXText.html +25 -25
  247. data/docs/Fox/FXTextChange.html +3 -3
  248. data/docs/Fox/FXTextField.html +5 -5
  249. data/docs/Fox/FXToggleButton.html +7 -7
  250. data/docs/Fox/FXToolBar.html +3 -3
  251. data/docs/Fox/FXToolBarGrip.html +3 -3
  252. data/docs/Fox/FXToolBarShell.html +3 -3
  253. data/docs/Fox/FXToolBarTab.html +5 -5
  254. data/docs/Fox/FXToolTip.html +5 -5
  255. data/docs/Fox/FXTopWindow.html +4 -4
  256. data/docs/Fox/FXTranslator.html +3 -3
  257. data/docs/Fox/FXTreeItem.html +19 -19
  258. data/docs/Fox/FXTreeList.html +40 -40
  259. data/docs/Fox/FXTreeListBox.html +27 -27
  260. data/docs/Fox/FXTriStateButton.html +9 -9
  261. data/docs/Fox/FXUndoList.html +8 -8
  262. data/docs/Fox/FXVec2d.html +7 -7
  263. data/docs/Fox/FXVec2f.html +7 -7
  264. data/docs/Fox/FXVec3d.html +7 -7
  265. data/docs/Fox/FXVec3f.html +7 -7
  266. data/docs/Fox/FXVec4d.html +7 -7
  267. data/docs/Fox/FXVec4f.html +7 -7
  268. data/docs/Fox/FXVerticalFrame.html +4 -4
  269. data/docs/Fox/FXVerticalSeparator.html +3 -3
  270. data/docs/Fox/FXViewport.html +3 -3
  271. data/docs/Fox/FXVisual.html +3 -3
  272. data/docs/Fox/FXWindow.html +36 -36
  273. data/docs/Fox/FXWizard.html +3 -3
  274. data/docs/Fox/FXXBMIcon.html +3 -3
  275. data/docs/Fox/FXXBMImage.html +3 -3
  276. data/docs/Fox/FXXPMIcon.html +3 -3
  277. data/docs/Fox/FXXPMImage.html +3 -3
  278. data/docs/Fox/NotifyHeader.html +3 -3
  279. data/docs/Fox/SCNotification.html +3 -3
  280. data/docs/Fox/TextRange.html +3 -3
  281. data/docs/Fox.html +7 -7
  282. data/docs/IRB.html +3 -3
  283. data/docs/Responder.html +4 -4
  284. data/docs/Responder2.html +3 -3
  285. data/docs/_index.html +3 -3
  286. data/docs/css/style.css +1 -0
  287. data/docs/file.History.html +66 -52
  288. data/docs/file.README.html +7 -7
  289. data/docs/index.html +13 -7
  290. data/docs/top-level-namespace.html +3 -3
  291. data/ext/fox16_c/core_wrap.cpp +5 -3
  292. data/ext/fox16_c/dc_wrap.cpp +5 -3
  293. data/ext/fox16_c/dialogs_wrap.cpp +5 -3
  294. data/ext/fox16_c/extconf.rb +10 -10
  295. data/ext/fox16_c/frames_wrap.cpp +5 -3
  296. data/ext/fox16_c/fx3d_wrap.cpp +5 -3
  297. data/ext/fox16_c/iconlist_wrap.cpp +5 -3
  298. data/ext/fox16_c/icons_wrap.cpp +5 -3
  299. data/ext/fox16_c/image_wrap.cpp +5 -3
  300. data/ext/fox16_c/label_wrap.cpp +5 -3
  301. data/ext/fox16_c/layout_wrap.cpp +5 -3
  302. data/ext/fox16_c/list_wrap.cpp +5 -3
  303. data/ext/fox16_c/mdi_wrap.cpp +5 -3
  304. data/ext/fox16_c/menu_wrap.cpp +5 -3
  305. data/ext/fox16_c/scintilla_wrap.cpp +5 -3
  306. data/ext/fox16_c/swigruby.h +4 -2
  307. data/ext/fox16_c/table_wrap.cpp +5 -3
  308. data/ext/fox16_c/text_wrap.cpp +5 -3
  309. data/ext/fox16_c/treelist_wrap.cpp +5 -3
  310. data/ext/fox16_c/ui_wrap.cpp +5 -3
  311. data/fxruby.gemspec +9 -1
  312. data/lib/2.5/fox16_c.so +0 -0
  313. data/lib/2.6/fox16_c.so +0 -0
  314. data/lib/2.7/fox16_c.so +0 -0
  315. data/lib/3.0/fox16_c.so +0 -0
  316. data/lib/3.1/fox16_c.so +0 -0
  317. data/lib/3.2/fox16_c.so +0 -0
  318. data/lib/fox16/kwargs.rb +891 -891
  319. data/lib/fox16/version.rb +1 -1
  320. data/lib/fox16.rb +2 -4
  321. data/ports/{i686-w64-mingw32 → x86-mingw32}/bin/libFOX-1.6-0.dll +0 -0
  322. data/ports/{i686-w64-mingw32 → x86-mingw32}/bin/libfxscintilla-20.dll +0 -0
  323. data/ports/{i686-w64-mingw32 → x86-mingw32}/bin/libgcc_s_sjlj-1.dll +0 -0
  324. data/ports/{i686-w64-mingw32 → x86-mingw32}/bin/libjpeg-62.dll +0 -0
  325. data/ports/{i686-w64-mingw32 → x86-mingw32}/bin/libpng16-16.dll +0 -0
  326. data/ports/{i686-w64-mingw32 → x86-mingw32}/bin/libstdc++-6.dll +0 -0
  327. data/ports/x86-mingw32/bin/libtiff-6.dll +0 -0
  328. data/ports/{i686-w64-mingw32 → x86-mingw32}/bin/libwinpthread-1.dll +0 -0
  329. data/ports/x86-mingw32/bin/zlib1.dll +0 -0
  330. data/test/TC_FXDCPrint.rb +1 -1
  331. metadata +257 -20
  332. data/lib/2.3/fox16_c.so +0 -0
  333. data/lib/2.4/fox16_c.so +0 -0
  334. data/ports/i686-w64-mingw32/bin/libtiff-5.dll +0 -0
  335. data/ports/i686-w64-mingw32/bin/zlib1.dll +0 -0
data/lib/fox16/kwargs.rb CHANGED
@@ -236,39 +236,61 @@ module Fox
236
236
  end
237
237
  end
238
238
 
239
- class FXMenuTitle
239
+ class FX7Segment
240
240
  alias old_initialize initialize
241
- def initialize(parent, text, *args, &blk)
242
- argument_names = %w{icon popupMenu opts}
243
- default_params = { :icon => nil, :popupMenu => nil, :opts => 0 }
241
+ def initialize(p, text, *args, &blk)
242
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
243
+ default_params = { :opts => SEVENSEGMENT_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
244
244
  params = {}
245
245
  params = args.pop if args.last.is_a? Hash
246
246
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
247
+ if params.key? :padding
248
+ value = params.delete(:padding)
249
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
250
+ end
247
251
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
248
252
  params = default_params.merge(params)
249
- old_initialize(parent, text, params[:icon], params[:popupMenu], params[:opts], &blk)
253
+ old_initialize(p, text, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
250
254
  end
251
255
  end
252
256
 
253
- class FXRGBImage
257
+ class FXApp
254
258
  alias old_initialize initialize
255
- def initialize(a, *args, &blk)
256
- argument_names = %w{pix opts width height}
257
- default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
259
+ def initialize(*args, &blk)
260
+ argument_names = %w{appName vendorName}
261
+ default_params = { :appName => "Application", :vendorName => "FoxDefault" }
258
262
  params = {}
259
263
  params = args.pop if args.last.is_a? Hash
260
264
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
261
265
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
262
266
  params = default_params.merge(params)
263
- old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
267
+ old_initialize(params[:appName], params[:vendorName], &blk)
264
268
  end
265
269
  end
266
270
 
267
- class FXGIFIcon
271
+ class FXArrowButton
272
+ alias old_initialize initialize
273
+ def initialize(parent, *args, &blk)
274
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
275
+ default_params = { :target => nil, :selector => 0, :opts => ARROW_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
276
+ params = {}
277
+ params = args.pop if args.last.is_a? Hash
278
+ args.each_with_index { |e, i| params[argument_names[i].intern] = e }
279
+ if params.key? :padding
280
+ value = params.delete(:padding)
281
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
282
+ end
283
+ params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
284
+ params = default_params.merge(params)
285
+ old_initialize(parent, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
286
+ end
287
+ end
288
+
289
+ class FXBMPIcon
268
290
  alias old_initialize initialize
269
291
  def initialize(a, *args, &blk)
270
292
  argument_names = %w{pix clr opts width height}
271
- default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
293
+ default_params = { :pix => nil, :clr => Fox.FXRGB(192,192,192), :opts => 0, :width => 1, :height => 1 }
272
294
  params = {}
273
295
  params = args.pop if args.last.is_a? Hash
274
296
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -278,7 +300,7 @@ module Fox
278
300
  end
279
301
  end
280
302
 
281
- class FXICOImage
303
+ class FXBMPImage
282
304
  alias old_initialize initialize
283
305
  def initialize(a, *args, &blk)
284
306
  argument_names = %w{pix opts width height}
@@ -292,39 +314,57 @@ module Fox
292
314
  end
293
315
  end
294
316
 
295
- class FXFontDialog
317
+ class FXBitmap
296
318
  alias old_initialize initialize
297
- def initialize(owner, name, *args, &blk)
298
- argument_names = %w{opts x y width height}
299
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 600, :height => 380 }
319
+ def initialize(app, *args, &blk)
320
+ argument_names = %w{pixels opts width height}
321
+ default_params = { :pixels => nil, :opts => 0, :width => 1, :height => 1 }
300
322
  params = {}
301
323
  params = args.pop if args.last.is_a? Hash
302
324
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
303
325
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
304
326
  params = default_params.merge(params)
305
- old_initialize(owner, name, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
327
+ old_initialize(app, params[:pixels], params[:opts], params[:width], params[:height], &blk)
306
328
  end
307
329
  end
308
330
 
309
- class FXPPMIcon
331
+ class FXBitmapFrame
310
332
  alias old_initialize initialize
311
- def initialize(a, *args, &blk)
312
- argument_names = %w{pix clr opts width height}
313
- default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
333
+ def initialize(p, bmp, *args, &blk)
334
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
335
+ default_params = { :opts => FRAME_SUNKEN|FRAME_THICK, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0 }
314
336
  params = {}
315
337
  params = args.pop if args.last.is_a? Hash
316
338
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
339
+ if params.key? :padding
340
+ value = params.delete(:padding)
341
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
342
+ end
317
343
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
318
344
  params = default_params.merge(params)
319
- old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
345
+ old_initialize(p, bmp, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
320
346
  end
321
347
  end
322
348
 
323
- class FXDirBox
349
+ class FXBitmapView
324
350
  alias old_initialize initialize
325
351
  def initialize(p, *args, &blk)
326
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
327
- default_params = { :target => nil, :selector => 0, :opts => FRAME_SUNKEN|FRAME_THICK|TREELISTBOX_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
352
+ argument_names = %w{bmp target selector opts x y width height}
353
+ default_params = { :bmp => nil, :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
354
+ params = {}
355
+ params = args.pop if args.last.is_a? Hash
356
+ args.each_with_index { |e, i| params[argument_names[i].intern] = e }
357
+ params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
358
+ params = default_params.merge(params)
359
+ old_initialize(p, params[:bmp], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
360
+ end
361
+ end
362
+
363
+ class FXButton
364
+ alias old_initialize initialize
365
+ def initialize(parent, text, *args, &blk)
366
+ argument_names = %w{icon target selector opts x y width height padLeft padRight padTop padBottom}
367
+ default_params = { :icon => nil, :target => nil, :selector => 0, :opts => BUTTON_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
328
368
  params = {}
329
369
  params = args.pop if args.last.is_a? Hash
330
370
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -334,29 +374,29 @@ module Fox
334
374
  end
335
375
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
336
376
  params = default_params.merge(params)
337
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
377
+ old_initialize(parent, text, params[:icon], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
338
378
  end
339
379
  end
340
380
 
341
- class FXScrollArea
381
+ class FXCanvas
342
382
  alias old_initialize initialize
343
383
  def initialize(parent, *args, &blk)
344
- argument_names = %w{opts x y width height}
345
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
384
+ argument_names = %w{target selector opts x y width height}
385
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
346
386
  params = {}
347
387
  params = args.pop if args.last.is_a? Hash
348
388
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
349
389
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
350
390
  params = default_params.merge(params)
351
- old_initialize(parent, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
391
+ old_initialize(parent, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
352
392
  end
353
393
  end
354
394
 
355
- class FXTabBar
395
+ class FXCheckButton
356
396
  alias old_initialize initialize
357
- def initialize(p, *args, &blk)
397
+ def initialize(parent, text, *args, &blk)
358
398
  argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
359
- default_params = { :target => nil, :selector => 0, :opts => TABBOOK_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING }
399
+ default_params = { :target => nil, :selector => 0, :opts => CHECKBUTTON_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
360
400
  params = {}
361
401
  params = args.pop if args.last.is_a? Hash
362
402
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -366,33 +406,29 @@ module Fox
366
406
  end
367
407
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
368
408
  params = default_params.merge(params)
369
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
409
+ old_initialize(parent, text, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
370
410
  end
371
411
  end
372
412
 
373
- class FXSeparator
413
+ class FXChoiceBox
374
414
  alias old_initialize initialize
375
- def initialize(p, *args, &blk)
376
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
377
- default_params = { :opts => SEPARATOR_GROOVE|LAYOUT_FILL_X, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0 }
415
+ def initialize(owner, caption, text, icon, choices, *args, &blk)
416
+ argument_names = %w{opts x y width height}
417
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
378
418
  params = {}
379
419
  params = args.pop if args.last.is_a? Hash
380
420
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
381
- if params.key? :padding
382
- value = params.delete(:padding)
383
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
384
- end
385
421
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
386
422
  params = default_params.merge(params)
387
- old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
423
+ old_initialize(owner, caption, text, icon, choices, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
388
424
  end
389
425
  end
390
426
 
391
- class FXHorizontalSeparator
427
+ class FXColorBar
392
428
  alias old_initialize initialize
393
- def initialize(p, *args, &blk)
394
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
395
- default_params = { :opts => SEPARATOR_GROOVE|LAYOUT_FILL_X, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 1, :padRight => 1, :padTop => 0, :padBottom => 0 }
429
+ def initialize(parent, *args, &blk)
430
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
431
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
396
432
  params = {}
397
433
  params = args.pop if args.last.is_a? Hash
398
434
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -402,61 +438,57 @@ module Fox
402
438
  end
403
439
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
404
440
  params = default_params.merge(params)
405
- old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
441
+ old_initialize(parent, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
406
442
  end
407
443
  end
408
444
 
409
- class FXVerticalSeparator
445
+ class FXColorDialog
410
446
  alias old_initialize initialize
411
- def initialize(p, *args, &blk)
412
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
413
- default_params = { :opts => SEPARATOR_GROOVE|LAYOUT_FILL_Y, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 1, :padBottom => 1 }
447
+ def initialize(owner, title, *args, &blk)
448
+ argument_names = %w{opts x y width height}
449
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
414
450
  params = {}
415
451
  params = args.pop if args.last.is_a? Hash
416
452
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
417
- if params.key? :padding
418
- value = params.delete(:padding)
419
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
420
- end
421
453
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
422
454
  params = default_params.merge(params)
423
- old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
455
+ old_initialize(owner, title, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
424
456
  end
425
457
  end
426
458
 
427
- class FXReplaceDialog
459
+ class FXColorItem
428
460
  alias old_initialize initialize
429
- def initialize(owner, caption, *args, &blk)
430
- argument_names = %w{ic opts x y width height}
431
- default_params = { :ic => nil, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
461
+ def initialize(text, clr, *args, &blk)
462
+ argument_names = %w{data}
463
+ default_params = { :data => nil }
432
464
  params = {}
433
465
  params = args.pop if args.last.is_a? Hash
434
466
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
435
467
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
436
468
  params = default_params.merge(params)
437
- old_initialize(owner, caption, params[:ic], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
469
+ old_initialize(text, clr, params[:data], &blk)
438
470
  end
439
471
  end
440
472
 
441
- class FXTableItem
473
+ class FXColorList
442
474
  alias old_initialize initialize
443
- def initialize(text, *args, &blk)
444
- argument_names = %w{icon data}
445
- default_params = { :icon => nil, :data => nil }
475
+ def initialize(p, *args, &blk)
476
+ argument_names = %w{target selector opts x y width height}
477
+ default_params = { :target => nil, :selector => 0, :opts => LIST_BROWSESELECT, :x => 0, :y => 0, :width => 0, :height => 0 }
446
478
  params = {}
447
479
  params = args.pop if args.last.is_a? Hash
448
480
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
449
481
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
450
482
  params = default_params.merge(params)
451
- old_initialize(text, params[:icon], params[:data], &blk)
483
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
452
484
  end
453
485
  end
454
486
 
455
- class FXTable
487
+ class FXColorRing
456
488
  alias old_initialize initialize
457
489
  def initialize(p, *args, &blk)
458
490
  argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
459
- default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_MARGIN, :padRight => DEFAULT_MARGIN, :padTop => DEFAULT_MARGIN, :padBottom => DEFAULT_MARGIN }
491
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
460
492
  params = {}
461
493
  params = args.pop if args.last.is_a? Hash
462
494
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -470,17 +502,17 @@ module Fox
470
502
  end
471
503
  end
472
504
 
473
- class FXPNGImage
505
+ class FXColorSelector
474
506
  alias old_initialize initialize
475
- def initialize(a, *args, &blk)
476
- argument_names = %w{pix opts width height}
477
- default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
507
+ def initialize(parent, *args, &blk)
508
+ argument_names = %w{target selector opts x y width height}
509
+ default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
478
510
  params = {}
479
511
  params = args.pop if args.last.is_a? Hash
480
512
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
481
513
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
482
514
  params = default_params.merge(params)
483
- old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
515
+ old_initialize(parent, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
484
516
  end
485
517
  end
486
518
 
@@ -502,39 +534,11 @@ module Fox
502
534
  end
503
535
  end
504
536
 
505
- class FXFileSelector
537
+ class FXColorWheel
506
538
  alias old_initialize initialize
507
539
  def initialize(p, *args, &blk)
508
- argument_names = %w{target selector opts x y width height}
509
- default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
510
- params = {}
511
- params = args.pop if args.last.is_a? Hash
512
- args.each_with_index { |e, i| params[argument_names[i].intern] = e }
513
- params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
514
- params = default_params.merge(params)
515
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
516
- end
517
- end
518
-
519
- class FXStream
520
- alias old_initialize initialize
521
- def initialize(*args, &blk)
522
- argument_names = %w{cont}
523
- default_params = { :cont => nil }
524
- params = {}
525
- params = args.pop if args.last.is_a? Hash
526
- args.each_with_index { |e, i| params[argument_names[i].intern] = e }
527
- params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
528
- params = default_params.merge(params)
529
- old_initialize(params[:cont], &blk)
530
- end
531
- end
532
-
533
- class FXTriStateButton
534
- alias old_initialize initialize
535
- def initialize(p, text1, text2, text3, *args, &blk)
536
- argument_names = %w{icon1 icon2 icon3 target selector opts x y width height padLeft padRight padTop padBottom}
537
- default_params = { :icon1 => nil, :icon2 => nil, :icon3 => nil, :target => nil, :selector => 0, :opts => TOGGLEBUTTON_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
540
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
541
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
538
542
  params = {}
539
543
  params = args.pop if args.last.is_a? Hash
540
544
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -544,21 +548,7 @@ module Fox
544
548
  end
545
549
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
546
550
  params = default_params.merge(params)
547
- old_initialize(p, text1, text2, text3, params[:icon1], params[:icon2], params[:icon3], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
548
- end
549
- end
550
-
551
- class FXMenuPane
552
- alias old_initialize initialize
553
- def initialize(owner, *args, &blk)
554
- argument_names = %w{opts}
555
- default_params = { :opts => 0 }
556
- params = {}
557
- params = args.pop if args.last.is_a? Hash
558
- args.each_with_index { |e, i| params[argument_names[i].intern] = e }
559
- params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
560
- params = default_params.merge(params)
561
- old_initialize(owner, params[:opts], &blk)
551
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
562
552
  end
563
553
  end
564
554
 
@@ -580,9 +570,9 @@ module Fox
580
570
  end
581
571
  end
582
572
 
583
- class FXPrintDialog
573
+ class FXComposite
584
574
  alias old_initialize initialize
585
- def initialize(owner, name, *args, &blk)
575
+ def initialize(parent, *args, &blk)
586
576
  argument_names = %w{opts x y width height}
587
577
  default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
588
578
  params = {}
@@ -590,43 +580,43 @@ module Fox
590
580
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
591
581
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
592
582
  params = default_params.merge(params)
593
- old_initialize(owner, name, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
583
+ old_initialize(parent, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
594
584
  end
595
585
  end
596
586
 
597
- class FXXBMImage
587
+ class FXDataTarget
598
588
  alias old_initialize initialize
599
- def initialize(a, *args, &blk)
600
- argument_names = %w{pixels mask opts width height}
601
- default_params = { :pixels => nil, :mask => nil, :opts => 0, :width => 1, :height => 1 }
589
+ def initialize(*args, &blk)
590
+ argument_names = %w{value target selector}
591
+ default_params = { :value => nil, :target => nil, :selector => 0 }
602
592
  params = {}
603
593
  params = args.pop if args.last.is_a? Hash
604
594
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
605
595
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
606
596
  params = default_params.merge(params)
607
- old_initialize(a, params[:pixels], params[:mask], params[:opts], params[:width], params[:height], &blk)
597
+ old_initialize(params[:value], params[:target], params[:selector], &blk)
608
598
  end
609
599
  end
610
600
 
611
- class FXMDIClient
601
+ class FXDelegator
612
602
  alias old_initialize initialize
613
- def initialize(p, *args, &blk)
614
- argument_names = %w{opts x y width height}
615
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
603
+ def initialize(*args, &blk)
604
+ argument_names = %w{delegate}
605
+ default_params = { :delegate => nil }
616
606
  params = {}
617
607
  params = args.pop if args.last.is_a? Hash
618
608
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
619
609
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
620
610
  params = default_params.merge(params)
621
- old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
611
+ old_initialize(params[:delegate], &blk)
622
612
  end
623
613
  end
624
614
 
625
- class FXPicker
615
+ class FXDial
626
616
  alias old_initialize initialize
627
- def initialize(p, text, *args, &blk)
628
- argument_names = %w{ic target selector opts x y width height padLeft padRight padTop padBottom}
629
- default_params = { :ic => nil, :target => nil, :selector => 0, :opts => BUTTON_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
617
+ def initialize(p, *args, &blk)
618
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
619
+ default_params = { :target => nil, :selector => 0, :opts => DIAL_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
630
620
  params = {}
631
621
  params = args.pop if args.last.is_a? Hash
632
622
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -636,15 +626,15 @@ module Fox
636
626
  end
637
627
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
638
628
  params = default_params.merge(params)
639
- old_initialize(p, text, params[:ic], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
629
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
640
630
  end
641
631
  end
642
632
 
643
- class FXMenuButton
633
+ class FXDialogBox
644
634
  alias old_initialize initialize
645
- def initialize(parent, text, *args, &blk)
646
- argument_names = %w{icon popupMenu opts x y width height padLeft padRight padTop padBottom}
647
- default_params = { :icon => nil, :popupMenu => nil, :opts => JUSTIFY_NORMAL|ICON_BEFORE_TEXT|MENUBUTTON_DOWN, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING }
635
+ def initialize(owner, title, *args, &blk)
636
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
637
+ default_params = { :opts => DECOR_TITLE|DECOR_BORDER, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 10, :padRight => 10, :padTop => 10, :padBottom => 10, :hSpacing => 4, :vSpacing => 4 }
648
638
  params = {}
649
639
  params = args.pop if args.last.is_a? Hash
650
640
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -654,15 +644,15 @@ module Fox
654
644
  end
655
645
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
656
646
  params = default_params.merge(params)
657
- old_initialize(parent, text, params[:icon], params[:popupMenu], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
647
+ old_initialize(owner, title, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
658
648
  end
659
649
  end
660
650
 
661
- class FXProgressBar
651
+ class FXDirBox
662
652
  alias old_initialize initialize
663
653
  def initialize(p, *args, &blk)
664
654
  argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
665
- default_params = { :target => nil, :selector => 0, :opts => PROGRESSBAR_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
655
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_SUNKEN|FRAME_THICK|TREELISTBOX_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
666
656
  params = {}
667
657
  params = args.pop if args.last.is_a? Hash
668
658
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -676,39 +666,35 @@ module Fox
676
666
  end
677
667
  end
678
668
 
679
- class FXMenuCheck
669
+ class FXDirDialog
680
670
  alias old_initialize initialize
681
- def initialize(p, text, *args, &blk)
682
- argument_names = %w{target selector opts}
683
- default_params = { :target => nil, :selector => 0, :opts => 0 }
671
+ def initialize(owner, name, *args, &blk)
672
+ argument_names = %w{opts x y width height}
673
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 500, :height => 300 }
684
674
  params = {}
685
675
  params = args.pop if args.last.is_a? Hash
686
676
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
687
677
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
688
678
  params = default_params.merge(params)
689
- old_initialize(p, text, params[:target], params[:selector], params[:opts], &blk)
679
+ old_initialize(owner, name, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
690
680
  end
691
681
  end
692
682
 
693
- class FXTabBook
683
+ class FXDirItem
694
684
  alias old_initialize initialize
695
- def initialize(p, *args, &blk)
696
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
697
- default_params = { :target => nil, :selector => 0, :opts => TABBOOK_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING }
685
+ def initialize(text, *args, &blk)
686
+ argument_names = %w{oi ci data}
687
+ default_params = { :oi => nil, :ci => nil, :data => nil }
698
688
  params = {}
699
689
  params = args.pop if args.last.is_a? Hash
700
690
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
701
- if params.key? :padding
702
- value = params.delete(:padding)
703
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
704
- end
705
691
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
706
692
  params = default_params.merge(params)
707
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
693
+ old_initialize(text, params[:oi], params[:ci], params[:data], &blk)
708
694
  end
709
695
  end
710
696
 
711
- class FXRulerView
697
+ class FXDirList
712
698
  alias old_initialize initialize
713
699
  def initialize(p, *args, &blk)
714
700
  argument_names = %w{target selector opts x y width height}
@@ -722,209 +708,205 @@ module Fox
722
708
  end
723
709
  end
724
710
 
725
- class FXApp
711
+ class FXDirSelector
726
712
  alias old_initialize initialize
727
- def initialize(*args, &blk)
728
- argument_names = %w{appName vendorName}
729
- default_params = { :appName => "Application", :vendorName => "FoxDefault" }
713
+ def initialize(p, *args, &blk)
714
+ argument_names = %w{target selector opts x y width height}
715
+ default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
730
716
  params = {}
731
717
  params = args.pop if args.last.is_a? Hash
732
718
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
733
719
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
734
720
  params = default_params.merge(params)
735
- old_initialize(params[:appName], params[:vendorName], &blk)
721
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
736
722
  end
737
723
  end
738
724
 
739
- class FXVisual
725
+ class FXDockSite
740
726
  alias old_initialize initialize
741
- def initialize(a, flgs, *args, &blk)
742
- argument_names = %w{d}
743
- default_params = { :d => 32 }
727
+ def initialize(p, *args, &blk)
728
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
729
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0, :hSpacing => 0, :vSpacing => 0 }
744
730
  params = {}
745
731
  params = args.pop if args.last.is_a? Hash
746
732
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
733
+ if params.key? :padding
734
+ value = params.delete(:padding)
735
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
736
+ end
747
737
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
748
738
  params = default_params.merge(params)
749
- old_initialize(a, flgs, params[:d], &blk)
739
+ old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
750
740
  end
751
741
  end
752
742
 
753
- class FXStatusLine
743
+ class FXDockTitle
754
744
  alias old_initialize initialize
755
- def initialize(p, *args, &blk)
756
- argument_names = %w{target selector}
757
- default_params = { :target => nil, :selector => 0 }
745
+ def initialize(p, text, *args, &blk)
746
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
747
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_NORMAL|JUSTIFY_CENTER_X|JUSTIFY_CENTER_Y, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0 }
758
748
  params = {}
759
749
  params = args.pop if args.last.is_a? Hash
760
750
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
751
+ if params.key? :padding
752
+ value = params.delete(:padding)
753
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
754
+ end
761
755
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
762
756
  params = default_params.merge(params)
763
- old_initialize(p, params[:target], params[:selector], &blk)
757
+ old_initialize(p, text, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
764
758
  end
765
759
  end
766
760
 
767
- class FXDelegator
761
+ class FXDriveBox
768
762
  alias old_initialize initialize
769
- def initialize(*args, &blk)
770
- argument_names = %w{delegate}
771
- default_params = { :delegate => nil }
763
+ def initialize(p, *args, &blk)
764
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
765
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_SUNKEN|FRAME_THICK|LISTBOX_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
772
766
  params = {}
773
767
  params = args.pop if args.last.is_a? Hash
774
768
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
769
+ if params.key? :padding
770
+ value = params.delete(:padding)
771
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
772
+ end
775
773
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
776
774
  params = default_params.merge(params)
777
- old_initialize(params[:delegate], &blk)
775
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
778
776
  end
779
777
  end
780
778
 
781
- class FXFileItem
779
+ class FXFileDialog
782
780
  alias old_initialize initialize
783
- def initialize(text, *args, &blk)
784
- argument_names = %w{bi mi ptr}
785
- default_params = { :bi => nil, :mi => nil, :ptr => nil }
781
+ def initialize(owner, name, *args, &blk)
782
+ argument_names = %w{opts x y width height}
783
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 500, :height => 300 }
786
784
  params = {}
787
785
  params = args.pop if args.last.is_a? Hash
788
786
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
789
787
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
790
788
  params = default_params.merge(params)
791
- old_initialize(text, params[:bi], params[:mi], params[:ptr], &blk)
789
+ old_initialize(owner, name, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
792
790
  end
793
791
  end
794
792
 
795
- class FXFileList
793
+ class FXFileDict
796
794
  alias old_initialize initialize
797
- def initialize(p, *args, &blk)
798
- argument_names = %w{target selector opts x y width height}
799
- default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
795
+ def initialize(app, *args, &blk)
796
+ argument_names = %w{db}
797
+ default_params = { :db => nil }
800
798
  params = {}
801
799
  params = args.pop if args.last.is_a? Hash
802
800
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
803
801
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
804
802
  params = default_params.merge(params)
805
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
803
+ old_initialize(app, params[:db], &blk)
806
804
  end
807
805
  end
808
806
 
809
- class FXPacker
807
+ class FXFileItem
810
808
  alias old_initialize initialize
811
- def initialize(parent, *args, &blk)
812
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
813
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
809
+ def initialize(text, *args, &blk)
810
+ argument_names = %w{bi mi ptr}
811
+ default_params = { :bi => nil, :mi => nil, :ptr => nil }
814
812
  params = {}
815
813
  params = args.pop if args.last.is_a? Hash
816
814
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
817
- if params.key? :padding
818
- value = params.delete(:padding)
819
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
820
- end
821
815
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
822
816
  params = default_params.merge(params)
823
- old_initialize(parent, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
817
+ old_initialize(text, params[:bi], params[:mi], params[:ptr], &blk)
824
818
  end
825
819
  end
826
820
 
827
- class FXArrowButton
821
+ class FXFileList
828
822
  alias old_initialize initialize
829
- def initialize(parent, *args, &blk)
830
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
831
- default_params = { :target => nil, :selector => 0, :opts => ARROW_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
823
+ def initialize(p, *args, &blk)
824
+ argument_names = %w{target selector opts x y width height}
825
+ default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
832
826
  params = {}
833
827
  params = args.pop if args.last.is_a? Hash
834
828
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
835
- if params.key? :padding
836
- value = params.delete(:padding)
837
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
838
- end
839
829
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
840
830
  params = default_params.merge(params)
841
- old_initialize(parent, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
831
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
842
832
  end
843
833
  end
844
834
 
845
- class FXListBox
835
+ class FXFileSelector
846
836
  alias old_initialize initialize
847
837
  def initialize(p, *args, &blk)
848
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
849
- default_params = { :target => nil, :selector => 0, :opts => FRAME_SUNKEN|FRAME_THICK|LISTBOX_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
838
+ argument_names = %w{target selector opts x y width height}
839
+ default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
850
840
  params = {}
851
841
  params = args.pop if args.last.is_a? Hash
852
842
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
853
- if params.key? :padding
854
- value = params.delete(:padding)
855
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
856
- end
857
843
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
858
844
  params = default_params.merge(params)
859
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
845
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
860
846
  end
861
847
  end
862
848
 
863
- class FXXPMImage
849
+ class FXFileStream
864
850
  alias old_initialize initialize
865
- def initialize(a, *args, &blk)
866
- argument_names = %w{pix opts width height}
867
- default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
851
+ def initialize(*args, &blk)
852
+ argument_names = %w{cont}
853
+ default_params = { :cont => nil }
868
854
  params = {}
869
855
  params = args.pop if args.last.is_a? Hash
870
856
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
871
857
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
872
858
  params = default_params.merge(params)
873
- old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
859
+ old_initialize(params[:cont], &blk)
874
860
  end
875
861
  end
876
862
 
877
- class FXButton
863
+ class FXFoldingItem
878
864
  alias old_initialize initialize
879
- def initialize(parent, text, *args, &blk)
880
- argument_names = %w{icon target selector opts x y width height padLeft padRight padTop padBottom}
881
- default_params = { :icon => nil, :target => nil, :selector => 0, :opts => BUTTON_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
865
+ def initialize(text, *args, &blk)
866
+ argument_names = %w{openIcon closedIcon data}
867
+ default_params = { :openIcon => nil, :closedIcon => nil, :data => nil }
882
868
  params = {}
883
869
  params = args.pop if args.last.is_a? Hash
884
870
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
885
- if params.key? :padding
886
- value = params.delete(:padding)
887
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
888
- end
889
871
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
890
872
  params = default_params.merge(params)
891
- old_initialize(parent, text, params[:icon], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
873
+ old_initialize(text, params[:openIcon], params[:closedIcon], params[:data], &blk)
892
874
  end
893
875
  end
894
876
 
895
- class FXColorDialog
877
+ class FXFoldingList
896
878
  alias old_initialize initialize
897
- def initialize(owner, title, *args, &blk)
898
- argument_names = %w{opts x y width height}
899
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
879
+ def initialize(p, *args, &blk)
880
+ argument_names = %w{target selector opts x y width height}
881
+ default_params = { :target => nil, :selector => 0, :opts => TREELIST_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
900
882
  params = {}
901
883
  params = args.pop if args.last.is_a? Hash
902
884
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
903
885
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
904
886
  params = default_params.merge(params)
905
- old_initialize(owner, title, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
887
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
906
888
  end
907
889
  end
908
890
 
909
- class FXMenuCommand
891
+ class FXFontDialog
910
892
  alias old_initialize initialize
911
- def initialize(p, text, *args, &blk)
912
- argument_names = %w{ic target selector opts}
913
- default_params = { :ic => nil, :target => nil, :selector => 0, :opts => 0 }
893
+ def initialize(owner, name, *args, &blk)
894
+ argument_names = %w{opts x y width height}
895
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 600, :height => 380 }
914
896
  params = {}
915
897
  params = args.pop if args.last.is_a? Hash
916
898
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
917
899
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
918
900
  params = default_params.merge(params)
919
- old_initialize(p, text, params[:ic], params[:target], params[:selector], params[:opts], &blk)
901
+ old_initialize(owner, name, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
920
902
  end
921
903
  end
922
904
 
923
- class FXToolBarGrip
905
+ class FXFontSelector
924
906
  alias old_initialize initialize
925
907
  def initialize(p, *args, &blk)
926
908
  argument_names = %w{target selector opts x y width height}
927
- default_params = { :target => nil, :selector => 0, :opts => TOOLBARGRIP_SINGLE, :x => 0, :y => 0, :width => 0, :height => 0 }
909
+ default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
928
910
  params = {}
929
911
  params = args.pop if args.last.is_a? Hash
930
912
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -934,11 +916,11 @@ module Fox
934
916
  end
935
917
  end
936
918
 
937
- class FXRadioButton
919
+ class FXFrame
938
920
  alias old_initialize initialize
939
- def initialize(parent, text, *args, &blk)
940
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
941
- default_params = { :target => nil, :selector => 0, :opts => RADIOBUTTON_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
921
+ def initialize(parent, *args, &blk)
922
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
923
+ default_params = { :opts => FRAME_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
942
924
  params = {}
943
925
  params = args.pop if args.last.is_a? Hash
944
926
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -948,209 +930,227 @@ module Fox
948
930
  end
949
931
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
950
932
  params = default_params.merge(params)
951
- old_initialize(parent, text, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
933
+ old_initialize(parent, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
952
934
  end
953
935
  end
954
936
 
955
- class FXCanvas
937
+ class FXGIFCursor
956
938
  alias old_initialize initialize
957
- def initialize(parent, *args, &blk)
958
- argument_names = %w{target selector opts x y width height}
959
- default_params = { :target => nil, :selector => 0, :opts => FRAME_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
939
+ def initialize(a, pix, *args, &blk)
940
+ argument_names = %w{hx hy}
941
+ default_params = { :hx => -1, :hy => -1 }
960
942
  params = {}
961
943
  params = args.pop if args.last.is_a? Hash
962
944
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
963
945
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
964
946
  params = default_params.merge(params)
965
- old_initialize(parent, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
947
+ old_initialize(a, pix, params[:hx], params[:hy], &blk)
966
948
  end
967
949
  end
968
950
 
969
- class FXDirDialog
951
+ class FXGIFIcon
970
952
  alias old_initialize initialize
971
- def initialize(owner, name, *args, &blk)
972
- argument_names = %w{opts x y width height}
973
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 500, :height => 300 }
953
+ def initialize(a, *args, &blk)
954
+ argument_names = %w{pix clr opts width height}
955
+ default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
974
956
  params = {}
975
957
  params = args.pop if args.last.is_a? Hash
976
958
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
977
959
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
978
960
  params = default_params.merge(params)
979
- old_initialize(owner, name, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
961
+ old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
980
962
  end
981
963
  end
982
964
 
983
- class FXSpinner
965
+ class FXGIFImage
984
966
  alias old_initialize initialize
985
- def initialize(p, cols, *args, &blk)
986
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
987
- default_params = { :target => nil, :selector => 0, :opts => SPIN_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
967
+ def initialize(a, *args, &blk)
968
+ argument_names = %w{pix opts width height}
969
+ default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
988
970
  params = {}
989
971
  params = args.pop if args.last.is_a? Hash
990
972
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
991
- if params.key? :padding
992
- value = params.delete(:padding)
993
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
994
- end
995
973
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
996
974
  params = default_params.merge(params)
997
- old_initialize(p, cols, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
975
+ old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
998
976
  end
999
977
  end
1000
978
 
1001
- class FXScrollPane
979
+ class FXGLContext
1002
980
  alias old_initialize initialize
1003
- def initialize(owner, nvis, *args, &blk)
1004
- argument_names = %w{opts}
1005
- default_params = { :opts => 0 }
981
+ def initialize(app, visual, *args, &blk)
982
+ argument_names = %w{other}
983
+ default_params = { :other => nil }
1006
984
  params = {}
1007
985
  params = args.pop if args.last.is_a? Hash
1008
986
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1009
987
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1010
988
  params = default_params.merge(params)
1011
- old_initialize(owner, nvis, params[:opts], &blk)
989
+ old_initialize(app, visual, params[:other], &blk)
1012
990
  end
1013
991
  end
1014
992
 
1015
- class FXTIFImage
993
+ class FXGradientBar
1016
994
  alias old_initialize initialize
1017
- def initialize(a, *args, &blk)
1018
- argument_names = %w{pix opts width height}
1019
- default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
995
+ def initialize(p, *args, &blk)
996
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
997
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1020
998
  params = {}
1021
999
  params = args.pop if args.last.is_a? Hash
1022
1000
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1001
+ if params.key? :padding
1002
+ value = params.delete(:padding)
1003
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1004
+ end
1023
1005
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1024
1006
  params = default_params.merge(params)
1025
- old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
1007
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1026
1008
  end
1027
1009
  end
1028
1010
 
1029
- class FXFontSelector
1011
+ class FXGroupBox
1030
1012
  alias old_initialize initialize
1031
- def initialize(p, *args, &blk)
1032
- argument_names = %w{target selector opts x y width height}
1033
- default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1013
+ def initialize(parent, text, *args, &blk)
1014
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
1015
+ default_params = { :opts => GROUPBOX_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
1034
1016
  params = {}
1035
1017
  params = args.pop if args.last.is_a? Hash
1036
1018
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1019
+ if params.key? :padding
1020
+ value = params.delete(:padding)
1021
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1022
+ end
1037
1023
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1038
1024
  params = default_params.merge(params)
1039
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1025
+ old_initialize(parent, text, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
1040
1026
  end
1041
1027
  end
1042
1028
 
1043
- class FXDirItem
1029
+ class FXHeaderItem
1044
1030
  alias old_initialize initialize
1045
1031
  def initialize(text, *args, &blk)
1046
- argument_names = %w{oi ci data}
1047
- default_params = { :oi => nil, :ci => nil, :data => nil }
1032
+ argument_names = %w{ic s ptr}
1033
+ default_params = { :ic => nil, :s => 0, :ptr => nil }
1048
1034
  params = {}
1049
1035
  params = args.pop if args.last.is_a? Hash
1050
1036
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1051
1037
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1052
1038
  params = default_params.merge(params)
1053
- old_initialize(text, params[:oi], params[:ci], params[:data], &blk)
1039
+ old_initialize(text, params[:ic], params[:s], params[:ptr], &blk)
1054
1040
  end
1055
1041
  end
1056
1042
 
1057
- class FXDirList
1043
+ class FXHeader
1058
1044
  alias old_initialize initialize
1059
1045
  def initialize(p, *args, &blk)
1060
- argument_names = %w{target selector opts x y width height}
1061
- default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1046
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1047
+ default_params = { :target => nil, :selector => 0, :opts => HEADER_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1062
1048
  params = {}
1063
1049
  params = args.pop if args.last.is_a? Hash
1064
1050
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1051
+ if params.key? :padding
1052
+ value = params.delete(:padding)
1053
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1054
+ end
1065
1055
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1066
1056
  params = default_params.merge(params)
1067
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1057
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1068
1058
  end
1069
1059
  end
1070
1060
 
1071
- class FXFileStream
1061
+ class FXHorizontalFrame
1072
1062
  alias old_initialize initialize
1073
- def initialize(*args, &blk)
1074
- argument_names = %w{cont}
1075
- default_params = { :cont => nil }
1063
+ def initialize(p, *args, &blk)
1064
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
1065
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
1076
1066
  params = {}
1077
1067
  params = args.pop if args.last.is_a? Hash
1078
1068
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1069
+ if params.key? :padding
1070
+ value = params.delete(:padding)
1071
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1072
+ end
1079
1073
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1080
1074
  params = default_params.merge(params)
1081
- old_initialize(params[:cont], &blk)
1075
+ old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
1082
1076
  end
1083
1077
  end
1084
1078
 
1085
- class FXHeaderItem
1079
+ class FXICOIcon
1086
1080
  alias old_initialize initialize
1087
- def initialize(text, *args, &blk)
1088
- argument_names = %w{ic s ptr}
1089
- default_params = { :ic => nil, :s => 0, :ptr => nil }
1081
+ def initialize(a, *args, &blk)
1082
+ argument_names = %w{pix clr opts width height}
1083
+ default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
1090
1084
  params = {}
1091
1085
  params = args.pop if args.last.is_a? Hash
1092
1086
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1093
1087
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1094
1088
  params = default_params.merge(params)
1095
- old_initialize(text, params[:ic], params[:s], params[:ptr], &blk)
1089
+ old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
1096
1090
  end
1097
1091
  end
1098
1092
 
1099
- class FXHeader
1093
+ class FXICOImage
1100
1094
  alias old_initialize initialize
1101
- def initialize(p, *args, &blk)
1102
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1103
- default_params = { :target => nil, :selector => 0, :opts => HEADER_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1095
+ def initialize(a, *args, &blk)
1096
+ argument_names = %w{pix opts width height}
1097
+ default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
1104
1098
  params = {}
1105
1099
  params = args.pop if args.last.is_a? Hash
1106
1100
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1107
- if params.key? :padding
1108
- value = params.delete(:padding)
1109
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1110
- end
1111
1101
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1112
1102
  params = default_params.merge(params)
1113
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1103
+ old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
1114
1104
  end
1115
1105
  end
1116
1106
 
1117
- class FXJPGIcon
1107
+ class FXIcon
1118
1108
  alias old_initialize initialize
1119
- def initialize(a, *args, &blk)
1120
- argument_names = %w{pix clr opts width height quality}
1121
- default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1, :quality => 75 }
1109
+ def initialize(app, *args, &blk)
1110
+ argument_names = %w{pix clr opts width height}
1111
+ default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
1122
1112
  params = {}
1123
1113
  params = args.pop if args.last.is_a? Hash
1124
1114
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1125
1115
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1126
1116
  params = default_params.merge(params)
1127
- old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], params[:quality], &blk)
1117
+ old_initialize(app, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
1128
1118
  end
1129
1119
  end
1130
1120
 
1131
- class FXDial
1121
+ class FXIconDict
1132
1122
  alias old_initialize initialize
1133
- def initialize(p, *args, &blk)
1134
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1135
- default_params = { :target => nil, :selector => 0, :opts => DIAL_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1123
+ def initialize(app, *args, &blk)
1124
+ argument_names = %w{path}
1125
+ default_params = { :path => FXIconDict.defaultIconPath }
1136
1126
  params = {}
1137
1127
  params = args.pop if args.last.is_a? Hash
1138
1128
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1139
- if params.key? :padding
1140
- value = params.delete(:padding)
1141
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1142
- end
1143
1129
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1144
1130
  params = default_params.merge(params)
1145
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1131
+ old_initialize(app, params[:path], &blk)
1146
1132
  end
1147
1133
  end
1148
1134
 
1149
- class FXScintilla
1135
+ class FXIconItem
1136
+ alias old_initialize initialize
1137
+ def initialize(text, *args, &blk)
1138
+ argument_names = %w{bigIcon miniIcon data}
1139
+ default_params = { :bigIcon => nil, :miniIcon => nil, :data => nil }
1140
+ params = {}
1141
+ params = args.pop if args.last.is_a? Hash
1142
+ args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1143
+ params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1144
+ params = default_params.merge(params)
1145
+ old_initialize(text, params[:bigIcon], params[:miniIcon], params[:data], &blk)
1146
+ end
1147
+ end
1148
+
1149
+ class FXIconList
1150
1150
  alias old_initialize initialize
1151
1151
  def initialize(p, *args, &blk)
1152
1152
  argument_names = %w{target selector opts x y width height}
1153
- default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1153
+ default_params = { :target => nil, :selector => 0, :opts => ICONLIST_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
1154
1154
  params = {}
1155
1155
  params = args.pop if args.last.is_a? Hash
1156
1156
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -1160,103 +1160,99 @@ module Fox
1160
1160
  end
1161
1161
  end
1162
1162
 
1163
- class FXBMPImage
1163
+ class FXImage
1164
1164
  alias old_initialize initialize
1165
1165
  def initialize(a, *args, &blk)
1166
- argument_names = %w{pix opts width height}
1167
- default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
1166
+ argument_names = %w{pixels opts width height}
1167
+ default_params = { :pixels => nil, :opts => 0, :width => 1, :height => 1 }
1168
1168
  params = {}
1169
1169
  params = args.pop if args.last.is_a? Hash
1170
1170
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1171
1171
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1172
1172
  params = default_params.merge(params)
1173
- old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
1173
+ old_initialize(a, params[:pixels], params[:opts], params[:width], params[:height], &blk)
1174
1174
  end
1175
1175
  end
1176
1176
 
1177
- class FXRGBIcon
1177
+ class FXImageFrame
1178
1178
  alias old_initialize initialize
1179
- def initialize(a, *args, &blk)
1180
- argument_names = %w{pix clr opts width height}
1181
- default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
1179
+ def initialize(p, img, *args, &blk)
1180
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
1181
+ default_params = { :opts => FRAME_SUNKEN|FRAME_THICK, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0 }
1182
1182
  params = {}
1183
1183
  params = args.pop if args.last.is_a? Hash
1184
1184
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1185
+ if params.key? :padding
1186
+ value = params.delete(:padding)
1187
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1188
+ end
1185
1189
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1186
1190
  params = default_params.merge(params)
1187
- old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
1191
+ old_initialize(p, img, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1188
1192
  end
1189
1193
  end
1190
1194
 
1191
- class FXColorSelector
1195
+ class FXImageView
1192
1196
  alias old_initialize initialize
1193
- def initialize(parent, *args, &blk)
1194
- argument_names = %w{target selector opts x y width height}
1195
- default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1197
+ def initialize(p, *args, &blk)
1198
+ argument_names = %w{img target selector opts x y width height}
1199
+ default_params = { :img => nil, :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1196
1200
  params = {}
1197
1201
  params = args.pop if args.last.is_a? Hash
1198
1202
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1199
1203
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1200
1204
  params = default_params.merge(params)
1201
- old_initialize(parent, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1205
+ old_initialize(p, params[:img], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1202
1206
  end
1203
1207
  end
1204
1208
 
1205
- class FXSlider
1209
+ class FXInputDialog
1206
1210
  alias old_initialize initialize
1207
- def initialize(p, *args, &blk)
1208
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1209
- default_params = { :target => nil, :selector => 0, :opts => SLIDER_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0 }
1211
+ def initialize(owner, caption, label, *args, &blk)
1212
+ argument_names = %w{icon opts x y width height}
1213
+ default_params = { :icon => nil, :opts => INPUTDIALOG_STRING, :x => 0, :y => 0, :width => 0, :height => 0 }
1210
1214
  params = {}
1211
1215
  params = args.pop if args.last.is_a? Hash
1212
1216
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1213
- if params.key? :padding
1214
- value = params.delete(:padding)
1215
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1216
- end
1217
1217
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1218
1218
  params = default_params.merge(params)
1219
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1219
+ old_initialize(owner, caption, label, params[:icon], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1220
1220
  end
1221
1221
  end
1222
1222
 
1223
- class FXCheckButton
1223
+ class FXJPGIcon
1224
1224
  alias old_initialize initialize
1225
- def initialize(parent, text, *args, &blk)
1226
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1227
- default_params = { :target => nil, :selector => 0, :opts => CHECKBUTTON_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1225
+ def initialize(a, *args, &blk)
1226
+ argument_names = %w{pix clr opts width height quality}
1227
+ default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1, :quality => 75 }
1228
1228
  params = {}
1229
1229
  params = args.pop if args.last.is_a? Hash
1230
1230
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1231
- if params.key? :padding
1232
- value = params.delete(:padding)
1233
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1234
- end
1235
1231
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1236
1232
  params = default_params.merge(params)
1237
- old_initialize(parent, text, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1233
+ old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], params[:quality], &blk)
1238
1234
  end
1239
1235
  end
1240
1236
 
1241
- class FXDataTarget
1237
+ class FXJPGImage
1242
1238
  alias old_initialize initialize
1243
- def initialize(*args, &blk)
1244
- argument_names = %w{value target selector}
1245
- default_params = { :value => nil, :target => nil, :selector => 0 }
1239
+ def initialize(a, *args, &blk)
1240
+ argument_names = %w{pix opts width height quality}
1241
+ default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1, :quality => 75 }
1246
1242
  params = {}
1247
1243
  params = args.pop if args.last.is_a? Hash
1248
1244
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1249
1245
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1250
1246
  params = default_params.merge(params)
1251
- old_initialize(params[:value], params[:target], params[:selector], &blk)
1247
+ old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], params[:quality], &blk)
1252
1248
  end
1253
1249
  end
1254
1250
 
1255
- class FXTreeListBox
1251
+ class FXKnob
1256
1252
  alias old_initialize initialize
1257
1253
  def initialize(p, *args, &blk)
1258
1254
  argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1259
- default_params = { :target => nil, :selector => 0, :opts => FRAME_SUNKEN|FRAME_THICK|TREELISTBOX_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1255
+ default_params = { :target => nil, :selector => 0, :opts => KNOB_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1260
1256
  params = {}
1261
1257
  params = args.pop if args.last.is_a? Hash
1262
1258
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -1270,11 +1266,11 @@ module Fox
1270
1266
  end
1271
1267
  end
1272
1268
 
1273
- class FXKnob
1269
+ class FXLabel
1274
1270
  alias old_initialize initialize
1275
- def initialize(p, *args, &blk)
1276
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1277
- default_params = { :target => nil, :selector => 0, :opts => KNOB_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1271
+ def initialize(parent, text, *args, &blk)
1272
+ argument_names = %w{icon opts x y width height padLeft padRight padTop padBottom}
1273
+ default_params = { :icon => nil, :opts => LABEL_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1278
1274
  params = {}
1279
1275
  params = args.pop if args.last.is_a? Hash
1280
1276
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -1284,29 +1280,29 @@ module Fox
1284
1280
  end
1285
1281
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1286
1282
  params = default_params.merge(params)
1287
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1283
+ old_initialize(parent, text, params[:icon], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1288
1284
  end
1289
1285
  end
1290
1286
 
1291
- class FXSplashWindow
1287
+ class FXListItem
1292
1288
  alias old_initialize initialize
1293
- def initialize(owner, icon, *args, &blk)
1294
- argument_names = %w{opts ms}
1295
- default_params = { :opts => SPLASH_SIMPLE, :ms => 5000 }
1289
+ def initialize(text, *args, &blk)
1290
+ argument_names = %w{icon data}
1291
+ default_params = { :icon => nil, :data => nil }
1296
1292
  params = {}
1297
1293
  params = args.pop if args.last.is_a? Hash
1298
1294
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1299
1295
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1300
1296
  params = default_params.merge(params)
1301
- old_initialize(owner, icon, params[:opts], params[:ms], &blk)
1297
+ old_initialize(text, params[:icon], params[:data], &blk)
1302
1298
  end
1303
1299
  end
1304
1300
 
1305
- class FXScrollBar
1301
+ class FXList
1306
1302
  alias old_initialize initialize
1307
1303
  def initialize(p, *args, &blk)
1308
1304
  argument_names = %w{target selector opts x y width height}
1309
- default_params = { :target => nil, :selector => 0, :opts => SCROLLBAR_VERTICAL, :x => 0, :y => 0, :width => 0, :height => 0 }
1305
+ default_params = { :target => nil, :selector => 0, :opts => LIST_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
1310
1306
  params = {}
1311
1307
  params = args.pop if args.last.is_a? Hash
1312
1308
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -1316,11 +1312,11 @@ module Fox
1316
1312
  end
1317
1313
  end
1318
1314
 
1319
- class FXTabItem
1315
+ class FXListBox
1320
1316
  alias old_initialize initialize
1321
- def initialize(p, text, *args, &blk)
1322
- argument_names = %w{ic opts x y width height padLeft padRight padTop padBottom}
1323
- default_params = { :ic => nil, :opts => TAB_TOP_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1317
+ def initialize(p, *args, &blk)
1318
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1319
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_SUNKEN|FRAME_THICK|LISTBOX_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1324
1320
  params = {}
1325
1321
  params = args.pop if args.last.is_a? Hash
1326
1322
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -1330,360 +1326,339 @@ module Fox
1330
1326
  end
1331
1327
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1332
1328
  params = default_params.merge(params)
1333
- old_initialize(p, text, params[:ic], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1329
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1334
1330
  end
1335
1331
  end
1336
1332
 
1337
- class FXBitmapFrame
1333
+ class FXMDIDeleteButton
1338
1334
  alias old_initialize initialize
1339
- def initialize(p, bmp, *args, &blk)
1340
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
1341
- default_params = { :opts => FRAME_SUNKEN|FRAME_THICK, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0 }
1335
+ def initialize(p, *args, &blk)
1336
+ argument_names = %w{target selector opts x y width height}
1337
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_RAISED, :x => 0, :y => 0, :width => 0, :height => 0 }
1342
1338
  params = {}
1343
1339
  params = args.pop if args.last.is_a? Hash
1344
1340
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1345
- if params.key? :padding
1346
- value = params.delete(:padding)
1347
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1348
- end
1349
1341
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1350
1342
  params = default_params.merge(params)
1351
- old_initialize(p, bmp, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1343
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1352
1344
  end
1353
1345
  end
1354
1346
 
1355
- class FXSearchDialog
1347
+ class FXMDIRestoreButton
1356
1348
  alias old_initialize initialize
1357
- def initialize(owner, caption, *args, &blk)
1358
- argument_names = %w{ic opts x y width height}
1359
- default_params = { :ic => nil, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1349
+ def initialize(p, *args, &blk)
1350
+ argument_names = %w{target selector opts x y width height}
1351
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_RAISED, :x => 0, :y => 0, :width => 0, :height => 0 }
1360
1352
  params = {}
1361
1353
  params = args.pop if args.last.is_a? Hash
1362
1354
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1363
1355
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1364
1356
  params = default_params.merge(params)
1365
- old_initialize(owner, caption, params[:ic], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1357
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1366
1358
  end
1367
1359
  end
1368
1360
 
1369
- class FXRealSpinner
1361
+ class FXMDIMaximizeButton
1370
1362
  alias old_initialize initialize
1371
- def initialize(p, cols, *args, &blk)
1372
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1373
- default_params = { :target => nil, :selector => 0, :opts => REALSPIN_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1363
+ def initialize(p, *args, &blk)
1364
+ argument_names = %w{target selector opts x y width height}
1365
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_RAISED, :x => 0, :y => 0, :width => 0, :height => 0 }
1374
1366
  params = {}
1375
1367
  params = args.pop if args.last.is_a? Hash
1376
1368
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1377
- if params.key? :padding
1378
- value = params.delete(:padding)
1379
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1380
- end
1381
1369
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1382
1370
  params = default_params.merge(params)
1383
- old_initialize(p, cols, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1371
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1384
1372
  end
1385
1373
  end
1386
1374
 
1387
- class FXTextField
1375
+ class FXMDIMinimizeButton
1388
1376
  alias old_initialize initialize
1389
- def initialize(p, ncols, *args, &blk)
1390
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1391
- default_params = { :target => nil, :selector => 0, :opts => TEXTFIELD_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1377
+ def initialize(p, *args, &blk)
1378
+ argument_names = %w{target selector opts x y width height}
1379
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_RAISED, :x => 0, :y => 0, :width => 0, :height => 0 }
1392
1380
  params = {}
1393
1381
  params = args.pop if args.last.is_a? Hash
1394
1382
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1395
- if params.key? :padding
1396
- value = params.delete(:padding)
1397
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1398
- end
1399
1383
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1400
1384
  params = default_params.merge(params)
1401
- old_initialize(p, ncols, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1385
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1402
1386
  end
1403
1387
  end
1404
1388
 
1405
- class FXMenuRadio
1389
+ class FXMDIWindowButton
1406
1390
  alias old_initialize initialize
1407
- def initialize(p, text, *args, &blk)
1408
- argument_names = %w{target selector opts}
1409
- default_params = { :target => nil, :selector => 0, :opts => 0 }
1391
+ def initialize(p, pup, *args, &blk)
1392
+ argument_names = %w{target selector opts x y width height}
1393
+ default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1410
1394
  params = {}
1411
1395
  params = args.pop if args.last.is_a? Hash
1412
1396
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1413
1397
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1414
1398
  params = default_params.merge(params)
1415
- old_initialize(p, text, params[:target], params[:selector], params[:opts], &blk)
1399
+ old_initialize(p, pup, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1416
1400
  end
1417
1401
  end
1418
1402
 
1419
- class FXShutterItem
1403
+ class FXMDIMenu
1420
1404
  alias old_initialize initialize
1421
- def initialize(p, *args, &blk)
1422
- argument_names = %w{text icon opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
1423
- default_params = { :text => "", :icon => nil, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
1405
+ def initialize(owner, *args, &blk)
1406
+ argument_names = %w{target}
1407
+ default_params = { :target => nil }
1424
1408
  params = {}
1425
1409
  params = args.pop if args.last.is_a? Hash
1426
1410
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1427
- if params.key? :padding
1428
- value = params.delete(:padding)
1429
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1430
- end
1431
1411
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1432
1412
  params = default_params.merge(params)
1433
- old_initialize(p, params[:text], params[:icon], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
1413
+ old_initialize(owner, params[:target], &blk)
1434
1414
  end
1435
1415
  end
1436
1416
 
1437
- class FXShutter
1417
+ class FXMDIChild
1438
1418
  alias old_initialize initialize
1439
- def initialize(p, *args, &blk)
1440
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
1441
- default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
1419
+ def initialize(p, name, *args, &blk)
1420
+ argument_names = %w{ic pup opts x y width height}
1421
+ default_params = { :ic => nil, :pup => nil, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1442
1422
  params = {}
1443
1423
  params = args.pop if args.last.is_a? Hash
1444
1424
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1445
- if params.key? :padding
1446
- value = params.delete(:padding)
1447
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1448
- end
1449
1425
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1450
1426
  params = default_params.merge(params)
1451
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
1427
+ old_initialize(p, name, params[:ic], params[:pup], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1452
1428
  end
1453
1429
  end
1454
1430
 
1455
- class FXGLContext
1431
+ class FXMDIClient
1456
1432
  alias old_initialize initialize
1457
- def initialize(app, visual, *args, &blk)
1458
- argument_names = %w{other}
1459
- default_params = { :other => nil }
1433
+ def initialize(p, *args, &blk)
1434
+ argument_names = %w{opts x y width height}
1435
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1460
1436
  params = {}
1461
1437
  params = args.pop if args.last.is_a? Hash
1462
1438
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1463
1439
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1464
1440
  params = default_params.merge(params)
1465
- old_initialize(app, visual, params[:other], &blk)
1441
+ old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1466
1442
  end
1467
1443
  end
1468
1444
 
1469
- class FXGIFCursor
1445
+ class FXMainWindow
1470
1446
  alias old_initialize initialize
1471
- def initialize(a, pix, *args, &blk)
1472
- argument_names = %w{hx hy}
1473
- default_params = { :hx => -1, :hy => -1 }
1447
+ def initialize(app, title, *args, &blk)
1448
+ argument_names = %w{icon miniIcon opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
1449
+ default_params = { :icon => nil, :miniIcon => nil, :opts => DECOR_ALL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0, :hSpacing => 4, :vSpacing => 4 }
1474
1450
  params = {}
1475
1451
  params = args.pop if args.last.is_a? Hash
1476
1452
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1453
+ if params.key? :padding
1454
+ value = params.delete(:padding)
1455
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1456
+ end
1477
1457
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1478
1458
  params = default_params.merge(params)
1479
- old_initialize(a, pix, params[:hx], params[:hy], &blk)
1459
+ old_initialize(app, title, params[:icon], params[:miniIcon], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
1480
1460
  end
1481
1461
  end
1482
1462
 
1483
- class FXBMPIcon
1463
+ class FXMatrix
1484
1464
  alias old_initialize initialize
1485
- def initialize(a, *args, &blk)
1486
- argument_names = %w{pix clr opts width height}
1487
- default_params = { :pix => nil, :clr => Fox.FXRGB(192,192,192), :opts => 0, :width => 1, :height => 1 }
1465
+ def initialize(parent, *args, &blk)
1466
+ argument_names = %w{n opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
1467
+ default_params = { :n => 1, :opts => MATRIX_BY_ROWS, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
1488
1468
  params = {}
1489
1469
  params = args.pop if args.last.is_a? Hash
1490
1470
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1471
+ if params.key? :padding
1472
+ value = params.delete(:padding)
1473
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1474
+ end
1491
1475
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1492
1476
  params = default_params.merge(params)
1493
- old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
1477
+ old_initialize(parent, params[:n], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
1494
1478
  end
1495
1479
  end
1496
1480
 
1497
- class FXColorWheel
1481
+ class FXMemoryStream
1498
1482
  alias old_initialize initialize
1499
- def initialize(p, *args, &blk)
1500
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1501
- default_params = { :target => nil, :selector => 0, :opts => FRAME_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1483
+ def initialize(*args, &blk)
1484
+ argument_names = %w{cont}
1485
+ default_params = { :cont => nil }
1502
1486
  params = {}
1503
1487
  params = args.pop if args.last.is_a? Hash
1504
1488
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1505
- if params.key? :padding
1506
- value = params.delete(:padding)
1507
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1508
- end
1509
1489
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1510
1490
  params = default_params.merge(params)
1511
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1491
+ old_initialize(params[:cont], &blk)
1512
1492
  end
1513
1493
  end
1514
1494
 
1515
- class FXIconDict
1495
+ class FXMenuButton
1516
1496
  alias old_initialize initialize
1517
- def initialize(app, *args, &blk)
1518
- argument_names = %w{path}
1519
- default_params = { :path => FXIconDict.defaultIconPath }
1497
+ def initialize(parent, text, *args, &blk)
1498
+ argument_names = %w{icon popupMenu opts x y width height padLeft padRight padTop padBottom}
1499
+ default_params = { :icon => nil, :popupMenu => nil, :opts => JUSTIFY_NORMAL|ICON_BEFORE_TEXT|MENUBUTTON_DOWN, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING }
1520
1500
  params = {}
1521
1501
  params = args.pop if args.last.is_a? Hash
1522
1502
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1503
+ if params.key? :padding
1504
+ value = params.delete(:padding)
1505
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1506
+ end
1523
1507
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1524
1508
  params = default_params.merge(params)
1525
- old_initialize(app, params[:path], &blk)
1509
+ old_initialize(parent, text, params[:icon], params[:popupMenu], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1526
1510
  end
1527
1511
  end
1528
1512
 
1529
- class FXFrame
1513
+ class FXMenuCaption
1530
1514
  alias old_initialize initialize
1531
- def initialize(parent, *args, &blk)
1532
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
1533
- default_params = { :opts => FRAME_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1515
+ def initialize(parent, text, *args, &blk)
1516
+ argument_names = %w{icon opts}
1517
+ default_params = { :icon => nil, :opts => 0 }
1534
1518
  params = {}
1535
1519
  params = args.pop if args.last.is_a? Hash
1536
1520
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1537
- if params.key? :padding
1538
- value = params.delete(:padding)
1539
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1540
- end
1541
1521
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1542
1522
  params = default_params.merge(params)
1543
- old_initialize(parent, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1523
+ old_initialize(parent, text, params[:icon], params[:opts], &blk)
1544
1524
  end
1545
1525
  end
1546
1526
 
1547
- class FXText
1527
+ class FXMenuCascade
1548
1528
  alias old_initialize initialize
1549
- def initialize(p, *args, &blk)
1550
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1551
- default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 3, :padRight => 3, :padTop => 2, :padBottom => 2 }
1529
+ def initialize(parent, text, *args, &blk)
1530
+ argument_names = %w{icon popupMenu opts}
1531
+ default_params = { :icon => nil, :popupMenu => nil, :opts => 0 }
1552
1532
  params = {}
1553
1533
  params = args.pop if args.last.is_a? Hash
1554
1534
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1555
- if params.key? :padding
1556
- value = params.delete(:padding)
1557
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1558
- end
1559
1535
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1560
1536
  params = default_params.merge(params)
1561
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1537
+ old_initialize(parent, text, params[:icon], params[:popupMenu], params[:opts], &blk)
1562
1538
  end
1563
- alias old_findText findText
1564
- def findText(string, *args)
1565
- argument_names = %w{start flags}
1566
- default_params = { :start => 0, :flags => SEARCH_FORWARD|SEARCH_WRAP|SEARCH_EXACT }
1539
+ end
1540
+
1541
+ class FXMenuCheck
1542
+ alias old_initialize initialize
1543
+ def initialize(p, text, *args, &blk)
1544
+ argument_names = %w{target selector opts}
1545
+ default_params = { :target => nil, :selector => 0, :opts => 0 }
1567
1546
  params = {}
1568
1547
  params = args.pop if args.last.is_a? Hash
1569
1548
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1570
1549
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1571
1550
  params = default_params.merge(params)
1572
- old_findText(string, params[:start], params[:flags])
1551
+ old_initialize(p, text, params[:target], params[:selector], params[:opts], &blk)
1573
1552
  end
1574
1553
  end
1575
1554
 
1576
- class FXJPGImage
1555
+ class FXMenuCommand
1577
1556
  alias old_initialize initialize
1578
- def initialize(a, *args, &blk)
1579
- argument_names = %w{pix opts width height quality}
1580
- default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1, :quality => 75 }
1557
+ def initialize(p, text, *args, &blk)
1558
+ argument_names = %w{ic target selector opts}
1559
+ default_params = { :ic => nil, :target => nil, :selector => 0, :opts => 0 }
1581
1560
  params = {}
1582
1561
  params = args.pop if args.last.is_a? Hash
1583
1562
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1584
1563
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1585
1564
  params = default_params.merge(params)
1586
- old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], params[:quality], &blk)
1565
+ old_initialize(p, text, params[:ic], params[:target], params[:selector], params[:opts], &blk)
1587
1566
  end
1588
1567
  end
1589
1568
 
1590
- class FXProgressDialog
1569
+ class FXMenuPane
1591
1570
  alias old_initialize initialize
1592
- def initialize(owner, caption, label, *args, &blk)
1593
- argument_names = %w{opts x y width height}
1594
- default_params = { :opts => PROGRESSDIALOG_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
1571
+ def initialize(owner, *args, &blk)
1572
+ argument_names = %w{opts}
1573
+ default_params = { :opts => 0 }
1595
1574
  params = {}
1596
1575
  params = args.pop if args.last.is_a? Hash
1597
1576
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1598
1577
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1599
1578
  params = default_params.merge(params)
1600
- old_initialize(owner, caption, label, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1579
+ old_initialize(owner, params[:opts], &blk)
1601
1580
  end
1602
1581
  end
1603
1582
 
1604
- class FXRuler
1583
+ class FXMenuRadio
1605
1584
  alias old_initialize initialize
1606
- def initialize(p, *args, &blk)
1607
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1608
- default_params = { :target => nil, :selector => 0, :opts => RULER_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1585
+ def initialize(p, text, *args, &blk)
1586
+ argument_names = %w{target selector opts}
1587
+ default_params = { :target => nil, :selector => 0, :opts => 0 }
1609
1588
  params = {}
1610
1589
  params = args.pop if args.last.is_a? Hash
1611
1590
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1612
- if params.key? :padding
1613
- value = params.delete(:padding)
1614
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1615
- end
1616
1591
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1617
1592
  params = default_params.merge(params)
1618
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1593
+ old_initialize(p, text, params[:target], params[:selector], params[:opts], &blk)
1619
1594
  end
1620
1595
  end
1621
1596
 
1622
- class FXSpring
1597
+ class FXMenuSeparator
1623
1598
  alias old_initialize initialize
1624
- def initialize(p, *args, &blk)
1625
- argument_names = %w{opts relw relh x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
1626
- default_params = { :opts => 0, :relw => 0, :relh => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
1599
+ def initialize(parent, *args, &blk)
1600
+ argument_names = %w{opts}
1601
+ default_params = { :opts => 0 }
1627
1602
  params = {}
1628
1603
  params = args.pop if args.last.is_a? Hash
1629
1604
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1630
- if params.key? :padding
1631
- value = params.delete(:padding)
1632
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1633
- end
1634
1605
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1635
1606
  params = default_params.merge(params)
1636
- old_initialize(p, params[:opts], params[:relw], params[:relh], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
1607
+ old_initialize(parent, params[:opts], &blk)
1637
1608
  end
1638
1609
  end
1639
1610
 
1640
- class FXTGAImage
1611
+ class FXMenuTitle
1641
1612
  alias old_initialize initialize
1642
- def initialize(a, *args, &blk)
1643
- argument_names = %w{pix opts width height}
1644
- default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
1613
+ def initialize(parent, text, *args, &blk)
1614
+ argument_names = %w{icon popupMenu opts}
1615
+ default_params = { :icon => nil, :popupMenu => nil, :opts => 0 }
1645
1616
  params = {}
1646
1617
  params = args.pop if args.last.is_a? Hash
1647
1618
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1648
1619
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1649
1620
  params = default_params.merge(params)
1650
- old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
1621
+ old_initialize(parent, text, params[:icon], params[:popupMenu], params[:opts], &blk)
1651
1622
  end
1652
1623
  end
1653
1624
 
1654
- class FXPCXIcon
1625
+ class FXMessageBox
1655
1626
  alias old_initialize initialize
1656
- def initialize(a, *args, &blk)
1657
- argument_names = %w{pix clr opts width height}
1658
- default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
1627
+ def initialize(owner, caption, text, *args, &blk)
1628
+ argument_names = %w{ic opts x y}
1629
+ default_params = { :ic => nil, :opts => 0, :x => 0, :y => 0 }
1659
1630
  params = {}
1660
1631
  params = args.pop if args.last.is_a? Hash
1661
1632
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1662
1633
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1663
1634
  params = default_params.merge(params)
1664
- old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
1635
+ old_initialize(owner, caption, text, params[:ic], params[:opts], params[:x], params[:y], &blk)
1665
1636
  end
1666
1637
  end
1667
1638
 
1668
- class FXToolTip
1639
+ class FXOption
1669
1640
  alias old_initialize initialize
1670
- def initialize(app, *args, &blk)
1671
- argument_names = %w{opts x y width height}
1672
- default_params = { :opts => TOOLTIP_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
1641
+ def initialize(p, text, *args, &blk)
1642
+ argument_names = %w{ic target selector opts x y width height padLeft padRight padTop padBottom}
1643
+ default_params = { :ic => nil, :target => nil, :selector => 0, :opts => JUSTIFY_NORMAL|ICON_BEFORE_TEXT, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1673
1644
  params = {}
1674
1645
  params = args.pop if args.last.is_a? Hash
1675
1646
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1647
+ if params.key? :padding
1648
+ value = params.delete(:padding)
1649
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1650
+ end
1676
1651
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1677
1652
  params = default_params.merge(params)
1678
- old_initialize(app, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1653
+ old_initialize(p, text, params[:ic], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1679
1654
  end
1680
1655
  end
1681
1656
 
1682
- class FXImageFrame
1657
+ class FXOptionMenu
1683
1658
  alias old_initialize initialize
1684
- def initialize(p, img, *args, &blk)
1685
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
1686
- default_params = { :opts => FRAME_SUNKEN|FRAME_THICK, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0 }
1659
+ def initialize(p, *args, &blk)
1660
+ argument_names = %w{pup opts x y width height padLeft padRight padTop padBottom}
1661
+ default_params = { :pup => nil, :opts => JUSTIFY_NORMAL|ICON_BEFORE_TEXT, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1687
1662
  params = {}
1688
1663
  params = args.pop if args.last.is_a? Hash
1689
1664
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -1693,43 +1668,39 @@ module Fox
1693
1668
  end
1694
1669
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1695
1670
  params = default_params.merge(params)
1696
- old_initialize(p, img, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1671
+ old_initialize(p, params[:pup], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1697
1672
  end
1698
1673
  end
1699
1674
 
1700
- class FXPPMImage
1675
+ class FXPCXIcon
1701
1676
  alias old_initialize initialize
1702
1677
  def initialize(a, *args, &blk)
1703
- argument_names = %w{pix opts width height}
1704
- default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
1678
+ argument_names = %w{pix clr opts width height}
1679
+ default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
1705
1680
  params = {}
1706
1681
  params = args.pop if args.last.is_a? Hash
1707
1682
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1708
1683
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1709
1684
  params = default_params.merge(params)
1710
- old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
1685
+ old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
1711
1686
  end
1712
1687
  end
1713
1688
 
1714
- class FXWizard
1689
+ class FXPCXImage
1715
1690
  alias old_initialize initialize
1716
- def initialize(owner, name, image, *args, &blk)
1717
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
1718
- default_params = { :opts => DECOR_TITLE|DECOR_BORDER|DECOR_RESIZE, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 10, :padRight => 10, :padTop => 10, :padBottom => 10, :hSpacing => 10, :vSpacing => 10 }
1691
+ def initialize(a, *args, &blk)
1692
+ argument_names = %w{pix opts width height}
1693
+ default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
1719
1694
  params = {}
1720
1695
  params = args.pop if args.last.is_a? Hash
1721
1696
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1722
- if params.key? :padding
1723
- value = params.delete(:padding)
1724
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1725
- end
1726
1697
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1727
1698
  params = default_params.merge(params)
1728
- old_initialize(owner, name, image, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
1699
+ old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
1729
1700
  end
1730
1701
  end
1731
1702
 
1732
- class FXXPMIcon
1703
+ class FXPNGIcon
1733
1704
  alias old_initialize initialize
1734
1705
  def initialize(a, *args, &blk)
1735
1706
  argument_names = %w{pix clr opts width height}
@@ -1743,75 +1714,71 @@ module Fox
1743
1714
  end
1744
1715
  end
1745
1716
 
1746
- class FXDockTitle
1717
+ class FXPNGImage
1747
1718
  alias old_initialize initialize
1748
- def initialize(p, text, *args, &blk)
1749
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1750
- default_params = { :target => nil, :selector => 0, :opts => FRAME_NORMAL|JUSTIFY_CENTER_X|JUSTIFY_CENTER_Y, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0 }
1719
+ def initialize(a, *args, &blk)
1720
+ argument_names = %w{pix opts width height}
1721
+ default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
1751
1722
  params = {}
1752
1723
  params = args.pop if args.last.is_a? Hash
1753
1724
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1754
- if params.key? :padding
1755
- value = params.delete(:padding)
1756
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1757
- end
1758
1725
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1759
1726
  params = default_params.merge(params)
1760
- old_initialize(p, text, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1727
+ old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
1761
1728
  end
1762
1729
  end
1763
1730
 
1764
- class FXVerticalFrame
1731
+ class FXPPMIcon
1765
1732
  alias old_initialize initialize
1766
- def initialize(p, *args, &blk)
1767
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
1768
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
1733
+ def initialize(a, *args, &blk)
1734
+ argument_names = %w{pix clr opts width height}
1735
+ default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
1769
1736
  params = {}
1770
1737
  params = args.pop if args.last.is_a? Hash
1771
1738
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1772
- if params.key? :padding
1773
- value = params.delete(:padding)
1774
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1775
- end
1776
1739
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1777
1740
  params = default_params.merge(params)
1778
- old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
1741
+ old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
1779
1742
  end
1780
1743
  end
1781
1744
 
1782
- class FXFileDict
1745
+ class FXPPMImage
1783
1746
  alias old_initialize initialize
1784
- def initialize(app, *args, &blk)
1785
- argument_names = %w{db}
1786
- default_params = { :db => nil }
1747
+ def initialize(a, *args, &blk)
1748
+ argument_names = %w{pix opts width height}
1749
+ default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
1787
1750
  params = {}
1788
1751
  params = args.pop if args.last.is_a? Hash
1789
1752
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1790
1753
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1791
1754
  params = default_params.merge(params)
1792
- old_initialize(app, params[:db], &blk)
1755
+ old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
1793
1756
  end
1794
1757
  end
1795
1758
 
1796
- class FXScrollWindow
1759
+ class FXPacker
1797
1760
  alias old_initialize initialize
1798
- def initialize(p, *args, &blk)
1799
- argument_names = %w{opts x y width height}
1800
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1761
+ def initialize(parent, *args, &blk)
1762
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
1763
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
1801
1764
  params = {}
1802
1765
  params = args.pop if args.last.is_a? Hash
1803
1766
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1767
+ if params.key? :padding
1768
+ value = params.delete(:padding)
1769
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1770
+ end
1804
1771
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1805
1772
  params = default_params.merge(params)
1806
- old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1773
+ old_initialize(parent, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
1807
1774
  end
1808
1775
  end
1809
1776
 
1810
- class FXMainWindow
1777
+ class FXPicker
1811
1778
  alias old_initialize initialize
1812
- def initialize(app, title, *args, &blk)
1813
- argument_names = %w{icon miniIcon opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
1814
- default_params = { :icon => nil, :miniIcon => nil, :opts => DECOR_ALL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0, :hSpacing => 4, :vSpacing => 4 }
1779
+ def initialize(p, text, *args, &blk)
1780
+ argument_names = %w{ic target selector opts x y width height padLeft padRight padTop padBottom}
1781
+ default_params = { :ic => nil, :target => nil, :selector => 0, :opts => BUTTON_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1815
1782
  params = {}
1816
1783
  params = args.pop if args.last.is_a? Hash
1817
1784
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -1821,43 +1788,43 @@ module Fox
1821
1788
  end
1822
1789
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1823
1790
  params = default_params.merge(params)
1824
- old_initialize(app, title, params[:icon], params[:miniIcon], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
1791
+ old_initialize(p, text, params[:ic], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1825
1792
  end
1826
1793
  end
1827
1794
 
1828
- class FXToolBarTab
1795
+ class FXPopup
1829
1796
  alias old_initialize initialize
1830
- def initialize(p, *args, &blk)
1831
- argument_names = %w{target selector opts x y width height}
1832
- default_params = { :target => nil, :selector => 0, :opts => FRAME_RAISED, :x => 0, :y => 0, :width => 0, :height => 0 }
1797
+ def initialize(owner, *args, &blk)
1798
+ argument_names = %w{opts x y width height}
1799
+ default_params = { :opts => POPUP_VERTICAL|FRAME_RAISED|FRAME_THICK, :x => 0, :y => 0, :width => 0, :height => 0 }
1833
1800
  params = {}
1834
1801
  params = args.pop if args.last.is_a? Hash
1835
1802
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1836
1803
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1837
1804
  params = default_params.merge(params)
1838
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1805
+ old_initialize(owner, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1839
1806
  end
1840
1807
  end
1841
1808
 
1842
- class FXPopup
1809
+ class FXPrintDialog
1843
1810
  alias old_initialize initialize
1844
- def initialize(owner, *args, &blk)
1811
+ def initialize(owner, name, *args, &blk)
1845
1812
  argument_names = %w{opts x y width height}
1846
- default_params = { :opts => POPUP_VERTICAL|FRAME_RAISED|FRAME_THICK, :x => 0, :y => 0, :width => 0, :height => 0 }
1813
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1847
1814
  params = {}
1848
1815
  params = args.pop if args.last.is_a? Hash
1849
1816
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1850
1817
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1851
1818
  params = default_params.merge(params)
1852
- old_initialize(owner, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1819
+ old_initialize(owner, name, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1853
1820
  end
1854
1821
  end
1855
1822
 
1856
- class FXHorizontalFrame
1823
+ class FXProgressBar
1857
1824
  alias old_initialize initialize
1858
1825
  def initialize(p, *args, &blk)
1859
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
1860
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
1826
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1827
+ default_params = { :target => nil, :selector => 0, :opts => PROGRESSBAR_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1861
1828
  params = {}
1862
1829
  params = args.pop if args.last.is_a? Hash
1863
1830
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -1867,63 +1834,67 @@ module Fox
1867
1834
  end
1868
1835
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1869
1836
  params = default_params.merge(params)
1870
- old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
1837
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1871
1838
  end
1872
1839
  end
1873
1840
 
1874
- class FXICOIcon
1841
+ class FXProgressDialog
1875
1842
  alias old_initialize initialize
1876
- def initialize(a, *args, &blk)
1877
- argument_names = %w{pix clr opts width height}
1878
- default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
1843
+ def initialize(owner, caption, label, *args, &blk)
1844
+ argument_names = %w{opts x y width height}
1845
+ default_params = { :opts => PROGRESSDIALOG_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
1879
1846
  params = {}
1880
1847
  params = args.pop if args.last.is_a? Hash
1881
1848
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1882
1849
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1883
1850
  params = default_params.merge(params)
1884
- old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
1851
+ old_initialize(owner, caption, label, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1885
1852
  end
1886
1853
  end
1887
1854
 
1888
- class FXColorItem
1855
+ class FXRGBIcon
1889
1856
  alias old_initialize initialize
1890
- def initialize(text, clr, *args, &blk)
1891
- argument_names = %w{data}
1892
- default_params = { :data => nil }
1857
+ def initialize(a, *args, &blk)
1858
+ argument_names = %w{pix clr opts width height}
1859
+ default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
1893
1860
  params = {}
1894
1861
  params = args.pop if args.last.is_a? Hash
1895
1862
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1896
1863
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1897
1864
  params = default_params.merge(params)
1898
- old_initialize(text, clr, params[:data], &blk)
1865
+ old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
1899
1866
  end
1900
1867
  end
1901
1868
 
1902
- class FXColorList
1869
+ class FXRGBImage
1903
1870
  alias old_initialize initialize
1904
- def initialize(p, *args, &blk)
1905
- argument_names = %w{target selector opts x y width height}
1906
- default_params = { :target => nil, :selector => 0, :opts => LIST_BROWSESELECT, :x => 0, :y => 0, :width => 0, :height => 0 }
1871
+ def initialize(a, *args, &blk)
1872
+ argument_names = %w{pix opts width height}
1873
+ default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
1907
1874
  params = {}
1908
1875
  params = args.pop if args.last.is_a? Hash
1909
1876
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1910
1877
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1911
1878
  params = default_params.merge(params)
1912
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1879
+ old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
1913
1880
  end
1914
1881
  end
1915
1882
 
1916
- class FXTIFIcon
1883
+ class FXRadioButton
1917
1884
  alias old_initialize initialize
1918
- def initialize(a, *args, &blk)
1919
- argument_names = %w{pix clr opts width height}
1920
- default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
1885
+ def initialize(parent, text, *args, &blk)
1886
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1887
+ default_params = { :target => nil, :selector => 0, :opts => RADIOBUTTON_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1921
1888
  params = {}
1922
1889
  params = args.pop if args.last.is_a? Hash
1923
1890
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1891
+ if params.key? :padding
1892
+ value = params.delete(:padding)
1893
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1894
+ end
1924
1895
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1925
1896
  params = default_params.merge(params)
1926
- old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
1897
+ old_initialize(parent, text, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1927
1898
  end
1928
1899
  end
1929
1900
 
@@ -1945,187 +1916,191 @@ module Fox
1945
1916
  end
1946
1917
  end
1947
1918
 
1948
- class FXMessageBox
1919
+ class FXRealSpinner
1949
1920
  alias old_initialize initialize
1950
- def initialize(owner, caption, text, *args, &blk)
1951
- argument_names = %w{ic opts x y}
1952
- default_params = { :ic => nil, :opts => 0, :x => 0, :y => 0 }
1921
+ def initialize(p, cols, *args, &blk)
1922
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1923
+ default_params = { :target => nil, :selector => 0, :opts => REALSPIN_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1953
1924
  params = {}
1954
1925
  params = args.pop if args.last.is_a? Hash
1955
1926
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1927
+ if params.key? :padding
1928
+ value = params.delete(:padding)
1929
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1930
+ end
1956
1931
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1957
1932
  params = default_params.merge(params)
1958
- old_initialize(owner, caption, text, params[:ic], params[:opts], params[:x], params[:y], &blk)
1933
+ old_initialize(p, cols, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1959
1934
  end
1960
1935
  end
1961
1936
 
1962
- class FXToolBarShell
1937
+ class FXRegistry
1963
1938
  alias old_initialize initialize
1964
- def initialize(owner, *args, &blk)
1965
- argument_names = %w{opts x y width height hSpacing vSpacing}
1966
- default_params = { :opts => FRAME_RAISED|FRAME_THICK, :x => 0, :y => 0, :width => 0, :height => 0, :hSpacing => 4, :vSpacing => 4 }
1939
+ def initialize(*args, &blk)
1940
+ argument_names = %w{appKey vendorKey}
1941
+ default_params = { :appKey => "", :vendorKey => "" }
1967
1942
  params = {}
1968
1943
  params = args.pop if args.last.is_a? Hash
1969
1944
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1970
1945
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1971
1946
  params = default_params.merge(params)
1972
- old_initialize(owner, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:hSpacing], params[:vSpacing], &blk)
1947
+ old_initialize(params[:appKey], params[:vendorKey], &blk)
1973
1948
  end
1974
1949
  end
1975
1950
 
1976
- class FXImageView
1951
+ class FXReplaceDialog
1977
1952
  alias old_initialize initialize
1978
- def initialize(p, *args, &blk)
1979
- argument_names = %w{img target selector opts x y width height}
1980
- default_params = { :img => nil, :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1953
+ def initialize(owner, caption, *args, &blk)
1954
+ argument_names = %w{ic opts x y width height}
1955
+ default_params = { :ic => nil, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1981
1956
  params = {}
1982
1957
  params = args.pop if args.last.is_a? Hash
1983
1958
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1984
1959
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1985
1960
  params = default_params.merge(params)
1986
- old_initialize(p, params[:img], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1961
+ old_initialize(owner, caption, params[:ic], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1987
1962
  end
1988
1963
  end
1989
1964
 
1990
- class FXChoiceBox
1965
+ class FXRuler
1991
1966
  alias old_initialize initialize
1992
- def initialize(owner, caption, text, icon, choices, *args, &blk)
1993
- argument_names = %w{opts x y width height}
1994
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
1967
+ def initialize(p, *args, &blk)
1968
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
1969
+ default_params = { :target => nil, :selector => 0, :opts => RULER_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1995
1970
  params = {}
1996
1971
  params = args.pop if args.last.is_a? Hash
1997
1972
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
1973
+ if params.key? :padding
1974
+ value = params.delete(:padding)
1975
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
1976
+ end
1998
1977
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
1999
1978
  params = default_params.merge(params)
2000
- old_initialize(owner, caption, text, icon, choices, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
1979
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2001
1980
  end
2002
1981
  end
2003
1982
 
2004
- class FXOption
1983
+ class FXRulerView
2005
1984
  alias old_initialize initialize
2006
- def initialize(p, text, *args, &blk)
2007
- argument_names = %w{ic target selector opts x y width height padLeft padRight padTop padBottom}
2008
- default_params = { :ic => nil, :target => nil, :selector => 0, :opts => JUSTIFY_NORMAL|ICON_BEFORE_TEXT, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
1985
+ def initialize(p, *args, &blk)
1986
+ argument_names = %w{target selector opts x y width height}
1987
+ default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
2009
1988
  params = {}
2010
1989
  params = args.pop if args.last.is_a? Hash
2011
1990
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2012
- if params.key? :padding
2013
- value = params.delete(:padding)
2014
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2015
- end
2016
1991
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2017
1992
  params = default_params.merge(params)
2018
- old_initialize(p, text, params[:ic], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
1993
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2019
1994
  end
2020
1995
  end
2021
1996
 
2022
- class FXOptionMenu
1997
+ class FXScintilla
2023
1998
  alias old_initialize initialize
2024
1999
  def initialize(p, *args, &blk)
2025
- argument_names = %w{pup opts x y width height padLeft padRight padTop padBottom}
2026
- default_params = { :pup => nil, :opts => JUSTIFY_NORMAL|ICON_BEFORE_TEXT, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2000
+ argument_names = %w{target selector opts x y width height}
2001
+ default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
2027
2002
  params = {}
2028
2003
  params = args.pop if args.last.is_a? Hash
2029
2004
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2030
- if params.key? :padding
2031
- value = params.delete(:padding)
2032
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2033
- end
2034
2005
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2035
2006
  params = default_params.merge(params)
2036
- old_initialize(p, params[:pup], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2007
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2037
2008
  end
2038
2009
  end
2039
2010
 
2040
- class FXBitmap
2011
+ class FXScrollArea
2041
2012
  alias old_initialize initialize
2042
- def initialize(app, *args, &blk)
2043
- argument_names = %w{pixels opts width height}
2044
- default_params = { :pixels => nil, :opts => 0, :width => 1, :height => 1 }
2013
+ def initialize(parent, *args, &blk)
2014
+ argument_names = %w{opts x y width height}
2015
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
2045
2016
  params = {}
2046
2017
  params = args.pop if args.last.is_a? Hash
2047
2018
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2048
2019
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2049
2020
  params = default_params.merge(params)
2050
- old_initialize(app, params[:pixels], params[:opts], params[:width], params[:height], &blk)
2021
+ old_initialize(parent, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2051
2022
  end
2052
2023
  end
2053
2024
 
2054
- class FXMDIChild
2025
+ class FXScrollBar
2055
2026
  alias old_initialize initialize
2056
- def initialize(p, name, *args, &blk)
2057
- argument_names = %w{ic pup opts x y width height}
2058
- default_params = { :ic => nil, :pup => nil, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
2027
+ def initialize(p, *args, &blk)
2028
+ argument_names = %w{target selector opts x y width height}
2029
+ default_params = { :target => nil, :selector => 0, :opts => SCROLLBAR_VERTICAL, :x => 0, :y => 0, :width => 0, :height => 0 }
2059
2030
  params = {}
2060
2031
  params = args.pop if args.last.is_a? Hash
2061
2032
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2062
2033
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2063
2034
  params = default_params.merge(params)
2064
- old_initialize(p, name, params[:ic], params[:pup], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2035
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2065
2036
  end
2066
2037
  end
2067
2038
 
2068
- class FXListItem
2039
+ class FXScrollPane
2069
2040
  alias old_initialize initialize
2070
- def initialize(text, *args, &blk)
2071
- argument_names = %w{icon data}
2072
- default_params = { :icon => nil, :data => nil }
2041
+ def initialize(owner, nvis, *args, &blk)
2042
+ argument_names = %w{opts}
2043
+ default_params = { :opts => 0 }
2073
2044
  params = {}
2074
2045
  params = args.pop if args.last.is_a? Hash
2075
2046
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2076
2047
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2077
2048
  params = default_params.merge(params)
2078
- old_initialize(text, params[:icon], params[:data], &blk)
2049
+ old_initialize(owner, nvis, params[:opts], &blk)
2079
2050
  end
2080
2051
  end
2081
2052
 
2082
- class FXList
2053
+ class FXScrollWindow
2083
2054
  alias old_initialize initialize
2084
2055
  def initialize(p, *args, &blk)
2085
- argument_names = %w{target selector opts x y width height}
2086
- default_params = { :target => nil, :selector => 0, :opts => LIST_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
2056
+ argument_names = %w{opts x y width height}
2057
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
2087
2058
  params = {}
2088
2059
  params = args.pop if args.last.is_a? Hash
2089
2060
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2090
2061
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2091
2062
  params = default_params.merge(params)
2092
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2063
+ old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2093
2064
  end
2094
2065
  end
2095
2066
 
2096
- class FXIconItem
2067
+ class FXSearchDialog
2097
2068
  alias old_initialize initialize
2098
- def initialize(text, *args, &blk)
2099
- argument_names = %w{bigIcon miniIcon data}
2100
- default_params = { :bigIcon => nil, :miniIcon => nil, :data => nil }
2069
+ def initialize(owner, caption, *args, &blk)
2070
+ argument_names = %w{ic opts x y width height}
2071
+ default_params = { :ic => nil, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
2101
2072
  params = {}
2102
2073
  params = args.pop if args.last.is_a? Hash
2103
2074
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2104
2075
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2105
2076
  params = default_params.merge(params)
2106
- old_initialize(text, params[:bigIcon], params[:miniIcon], params[:data], &blk)
2077
+ old_initialize(owner, caption, params[:ic], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2107
2078
  end
2108
2079
  end
2109
2080
 
2110
- class FXIconList
2081
+ class FXSeparator
2111
2082
  alias old_initialize initialize
2112
2083
  def initialize(p, *args, &blk)
2113
- argument_names = %w{target selector opts x y width height}
2114
- default_params = { :target => nil, :selector => 0, :opts => ICONLIST_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
2084
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
2085
+ default_params = { :opts => SEPARATOR_GROOVE|LAYOUT_FILL_X, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0 }
2115
2086
  params = {}
2116
2087
  params = args.pop if args.last.is_a? Hash
2117
2088
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2089
+ if params.key? :padding
2090
+ value = params.delete(:padding)
2091
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2092
+ end
2118
2093
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2119
2094
  params = default_params.merge(params)
2120
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2095
+ old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2121
2096
  end
2122
2097
  end
2123
2098
 
2124
- class FX7Segment
2099
+ class FXHorizontalSeparator
2125
2100
  alias old_initialize initialize
2126
- def initialize(p, text, *args, &blk)
2101
+ def initialize(p, *args, &blk)
2127
2102
  argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
2128
- default_params = { :opts => SEVENSEGMENT_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2103
+ default_params = { :opts => SEPARATOR_GROOVE|LAYOUT_FILL_X, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 1, :padRight => 1, :padTop => 0, :padBottom => 0 }
2129
2104
  params = {}
2130
2105
  params = args.pop if args.last.is_a? Hash
2131
2106
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -2135,57 +2110,69 @@ module Fox
2135
2110
  end
2136
2111
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2137
2112
  params = default_params.merge(params)
2138
- old_initialize(p, text, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2113
+ old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2139
2114
  end
2140
2115
  end
2141
2116
 
2142
- class FXXBMIcon
2117
+ class FXVerticalSeparator
2143
2118
  alias old_initialize initialize
2144
- def initialize(a, *args, &blk)
2145
- argument_names = %w{pixels mask clr opts width height}
2146
- default_params = { :pixels => nil, :mask => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
2119
+ def initialize(p, *args, &blk)
2120
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
2121
+ default_params = { :opts => SEPARATOR_GROOVE|LAYOUT_FILL_Y, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 1, :padBottom => 1 }
2147
2122
  params = {}
2148
2123
  params = args.pop if args.last.is_a? Hash
2149
2124
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2125
+ if params.key? :padding
2126
+ value = params.delete(:padding)
2127
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2128
+ end
2150
2129
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2151
2130
  params = default_params.merge(params)
2152
- old_initialize(a, params[:pixels], params[:mask], params[:clr], params[:opts], params[:width], params[:height], &blk)
2131
+ old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2153
2132
  end
2154
2133
  end
2155
2134
 
2156
- class FXInputDialog
2135
+ class FXShutterItem
2157
2136
  alias old_initialize initialize
2158
- def initialize(owner, caption, label, *args, &blk)
2159
- argument_names = %w{icon opts x y width height}
2160
- default_params = { :icon => nil, :opts => INPUTDIALOG_STRING, :x => 0, :y => 0, :width => 0, :height => 0 }
2137
+ def initialize(p, *args, &blk)
2138
+ argument_names = %w{text icon opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
2139
+ default_params = { :text => "", :icon => nil, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
2161
2140
  params = {}
2162
2141
  params = args.pop if args.last.is_a? Hash
2163
2142
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2143
+ if params.key? :padding
2144
+ value = params.delete(:padding)
2145
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2146
+ end
2164
2147
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2165
2148
  params = default_params.merge(params)
2166
- old_initialize(owner, caption, label, params[:icon], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2149
+ old_initialize(p, params[:text], params[:icon], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
2167
2150
  end
2168
2151
  end
2169
2152
 
2170
- class FXMenuSeparator
2153
+ class FXShutter
2171
2154
  alias old_initialize initialize
2172
- def initialize(parent, *args, &blk)
2173
- argument_names = %w{opts}
2174
- default_params = { :opts => 0 }
2155
+ def initialize(p, *args, &blk)
2156
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
2157
+ default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
2175
2158
  params = {}
2176
2159
  params = args.pop if args.last.is_a? Hash
2177
2160
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2161
+ if params.key? :padding
2162
+ value = params.delete(:padding)
2163
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2164
+ end
2178
2165
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2179
2166
  params = default_params.merge(params)
2180
- old_initialize(parent, params[:opts], &blk)
2167
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
2181
2168
  end
2182
2169
  end
2183
2170
 
2184
- class FXDialogBox
2171
+ class FXSlider
2185
2172
  alias old_initialize initialize
2186
- def initialize(owner, title, *args, &blk)
2187
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
2188
- default_params = { :opts => DECOR_TITLE|DECOR_BORDER, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 10, :padRight => 10, :padTop => 10, :padBottom => 10, :hSpacing => 4, :vSpacing => 4 }
2173
+ def initialize(p, *args, &blk)
2174
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
2175
+ default_params = { :target => nil, :selector => 0, :opts => SLIDER_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0 }
2189
2176
  params = {}
2190
2177
  params = args.pop if args.last.is_a? Hash
2191
2178
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -2195,43 +2182,47 @@ module Fox
2195
2182
  end
2196
2183
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2197
2184
  params = default_params.merge(params)
2198
- old_initialize(owner, title, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
2185
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2199
2186
  end
2200
2187
  end
2201
2188
 
2202
- class FXPCXImage
2189
+ class FXSpinner
2203
2190
  alias old_initialize initialize
2204
- def initialize(a, *args, &blk)
2205
- argument_names = %w{pix opts width height}
2206
- default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
2191
+ def initialize(p, cols, *args, &blk)
2192
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
2193
+ default_params = { :target => nil, :selector => 0, :opts => SPIN_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2207
2194
  params = {}
2208
2195
  params = args.pop if args.last.is_a? Hash
2209
2196
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2197
+ if params.key? :padding
2198
+ value = params.delete(:padding)
2199
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2200
+ end
2210
2201
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2211
2202
  params = default_params.merge(params)
2212
- old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
2203
+ old_initialize(p, cols, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2213
2204
  end
2214
2205
  end
2215
2206
 
2216
- class FXMenuCaption
2207
+ class FXSplashWindow
2217
2208
  alias old_initialize initialize
2218
- def initialize(parent, text, *args, &blk)
2219
- argument_names = %w{icon opts}
2220
- default_params = { :icon => nil, :opts => 0 }
2209
+ def initialize(owner, icon, *args, &blk)
2210
+ argument_names = %w{opts ms}
2211
+ default_params = { :opts => SPLASH_SIMPLE, :ms => 5000 }
2221
2212
  params = {}
2222
2213
  params = args.pop if args.last.is_a? Hash
2223
2214
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2224
2215
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2225
2216
  params = default_params.merge(params)
2226
- old_initialize(parent, text, params[:icon], params[:opts], &blk)
2217
+ old_initialize(owner, icon, params[:opts], params[:ms], &blk)
2227
2218
  end
2228
2219
  end
2229
2220
 
2230
- class FXGradientBar
2221
+ class FXSpring
2231
2222
  alias old_initialize initialize
2232
2223
  def initialize(p, *args, &blk)
2233
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
2234
- default_params = { :target => nil, :selector => 0, :opts => FRAME_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2224
+ argument_names = %w{opts relw relh x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
2225
+ default_params = { :opts => 0, :relw => 0, :relh => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
2235
2226
  params = {}
2236
2227
  params = args.pop if args.last.is_a? Hash
2237
2228
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -2241,127 +2232,135 @@ module Fox
2241
2232
  end
2242
2233
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2243
2234
  params = default_params.merge(params)
2244
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2235
+ old_initialize(p, params[:opts], params[:relw], params[:relh], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
2245
2236
  end
2246
2237
  end
2247
2238
 
2248
- class FXMDIDeleteButton
2239
+ class FXStatusBar
2249
2240
  alias old_initialize initialize
2250
2241
  def initialize(p, *args, &blk)
2251
- argument_names = %w{target selector opts x y width height}
2252
- default_params = { :target => nil, :selector => 0, :opts => FRAME_RAISED, :x => 0, :y => 0, :width => 0, :height => 0 }
2242
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
2243
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 3, :padRight => 3, :padTop => 2, :padBottom => 2, :hSpacing => 4, :vSpacing => 0 }
2253
2244
  params = {}
2254
2245
  params = args.pop if args.last.is_a? Hash
2255
2246
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2247
+ if params.key? :padding
2248
+ value = params.delete(:padding)
2249
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2250
+ end
2256
2251
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2257
2252
  params = default_params.merge(params)
2258
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2253
+ old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
2259
2254
  end
2260
2255
  end
2261
2256
 
2262
- class FXMDIRestoreButton
2257
+ class FXStatusLine
2263
2258
  alias old_initialize initialize
2264
2259
  def initialize(p, *args, &blk)
2265
- argument_names = %w{target selector opts x y width height}
2266
- default_params = { :target => nil, :selector => 0, :opts => FRAME_RAISED, :x => 0, :y => 0, :width => 0, :height => 0 }
2260
+ argument_names = %w{target selector}
2261
+ default_params = { :target => nil, :selector => 0 }
2267
2262
  params = {}
2268
2263
  params = args.pop if args.last.is_a? Hash
2269
2264
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2270
2265
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2271
2266
  params = default_params.merge(params)
2272
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2267
+ old_initialize(p, params[:target], params[:selector], &blk)
2273
2268
  end
2274
2269
  end
2275
2270
 
2276
- class FXMDIMaximizeButton
2271
+ class FXStream
2277
2272
  alias old_initialize initialize
2278
- def initialize(p, *args, &blk)
2279
- argument_names = %w{target selector opts x y width height}
2280
- default_params = { :target => nil, :selector => 0, :opts => FRAME_RAISED, :x => 0, :y => 0, :width => 0, :height => 0 }
2273
+ def initialize(*args, &blk)
2274
+ argument_names = %w{cont}
2275
+ default_params = { :cont => nil }
2281
2276
  params = {}
2282
2277
  params = args.pop if args.last.is_a? Hash
2283
2278
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2284
2279
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2285
2280
  params = default_params.merge(params)
2286
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2281
+ old_initialize(params[:cont], &blk)
2287
2282
  end
2288
2283
  end
2289
2284
 
2290
- class FXMDIMinimizeButton
2285
+ class FXSwitcher
2291
2286
  alias old_initialize initialize
2292
2287
  def initialize(p, *args, &blk)
2293
- argument_names = %w{target selector opts x y width height}
2294
- default_params = { :target => nil, :selector => 0, :opts => FRAME_RAISED, :x => 0, :y => 0, :width => 0, :height => 0 }
2288
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
2289
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING }
2295
2290
  params = {}
2296
2291
  params = args.pop if args.last.is_a? Hash
2297
2292
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2293
+ if params.key? :padding
2294
+ value = params.delete(:padding)
2295
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2296
+ end
2298
2297
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2299
2298
  params = default_params.merge(params)
2300
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2299
+ old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2301
2300
  end
2302
2301
  end
2303
2302
 
2304
- class FXMDIWindowButton
2303
+ class FXTGAIcon
2305
2304
  alias old_initialize initialize
2306
- def initialize(p, pup, *args, &blk)
2307
- argument_names = %w{target selector opts x y width height}
2308
- default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
2305
+ def initialize(a, *args, &blk)
2306
+ argument_names = %w{pix clr opts width height}
2307
+ default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
2309
2308
  params = {}
2310
2309
  params = args.pop if args.last.is_a? Hash
2311
2310
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2312
2311
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2313
2312
  params = default_params.merge(params)
2314
- old_initialize(p, pup, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2313
+ old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
2315
2314
  end
2316
2315
  end
2317
2316
 
2318
- class FXMDIMenu
2317
+ class FXTGAImage
2319
2318
  alias old_initialize initialize
2320
- def initialize(owner, *args, &blk)
2321
- argument_names = %w{target}
2322
- default_params = { :target => nil }
2319
+ def initialize(a, *args, &blk)
2320
+ argument_names = %w{pix opts width height}
2321
+ default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
2323
2322
  params = {}
2324
2323
  params = args.pop if args.last.is_a? Hash
2325
2324
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2326
2325
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2327
2326
  params = default_params.merge(params)
2328
- old_initialize(owner, params[:target], &blk)
2327
+ old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
2329
2328
  end
2330
2329
  end
2331
2330
 
2332
- class FXFileDialog
2331
+ class FXTIFIcon
2333
2332
  alias old_initialize initialize
2334
- def initialize(owner, name, *args, &blk)
2335
- argument_names = %w{opts x y width height}
2336
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 500, :height => 300 }
2333
+ def initialize(a, *args, &blk)
2334
+ argument_names = %w{pix clr opts width height}
2335
+ default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
2337
2336
  params = {}
2338
2337
  params = args.pop if args.last.is_a? Hash
2339
2338
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2340
2339
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2341
2340
  params = default_params.merge(params)
2342
- old_initialize(owner, name, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2341
+ old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
2343
2342
  end
2344
2343
  end
2345
2344
 
2346
- class FXPNGIcon
2345
+ class FXTIFImage
2347
2346
  alias old_initialize initialize
2348
2347
  def initialize(a, *args, &blk)
2349
- argument_names = %w{pix clr opts width height}
2350
- default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
2348
+ argument_names = %w{pix opts width height}
2349
+ default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
2351
2350
  params = {}
2352
2351
  params = args.pop if args.last.is_a? Hash
2353
2352
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2354
2353
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2355
2354
  params = default_params.merge(params)
2356
- old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
2355
+ old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
2357
2356
  end
2358
2357
  end
2359
2358
 
2360
- class FXGroupBox
2359
+ class FXTabBar
2361
2360
  alias old_initialize initialize
2362
- def initialize(parent, text, *args, &blk)
2363
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
2364
- default_params = { :opts => GROUPBOX_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
2361
+ def initialize(p, *args, &blk)
2362
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
2363
+ default_params = { :target => nil, :selector => 0, :opts => TABBOOK_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING }
2365
2364
  params = {}
2366
2365
  params = args.pop if args.last.is_a? Hash
2367
2366
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -2371,57 +2370,65 @@ module Fox
2371
2370
  end
2372
2371
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2373
2372
  params = default_params.merge(params)
2374
- old_initialize(parent, text, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
2373
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2375
2374
  end
2376
2375
  end
2377
2376
 
2378
- class FXIcon
2377
+ class FXTabBook
2379
2378
  alias old_initialize initialize
2380
- def initialize(app, *args, &blk)
2381
- argument_names = %w{pix clr opts width height}
2382
- default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
2379
+ def initialize(p, *args, &blk)
2380
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
2381
+ default_params = { :target => nil, :selector => 0, :opts => TABBOOK_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING }
2383
2382
  params = {}
2384
2383
  params = args.pop if args.last.is_a? Hash
2385
2384
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2385
+ if params.key? :padding
2386
+ value = params.delete(:padding)
2387
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2388
+ end
2386
2389
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2387
2390
  params = default_params.merge(params)
2388
- old_initialize(app, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
2391
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2389
2392
  end
2390
2393
  end
2391
2394
 
2392
- class FXFoldingItem
2395
+ class FXTabItem
2393
2396
  alias old_initialize initialize
2394
- def initialize(text, *args, &blk)
2395
- argument_names = %w{openIcon closedIcon data}
2396
- default_params = { :openIcon => nil, :closedIcon => nil, :data => nil }
2397
+ def initialize(p, text, *args, &blk)
2398
+ argument_names = %w{ic opts x y width height padLeft padRight padTop padBottom}
2399
+ default_params = { :ic => nil, :opts => TAB_TOP_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2397
2400
  params = {}
2398
2401
  params = args.pop if args.last.is_a? Hash
2399
2402
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2403
+ if params.key? :padding
2404
+ value = params.delete(:padding)
2405
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2406
+ end
2400
2407
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2401
2408
  params = default_params.merge(params)
2402
- old_initialize(text, params[:openIcon], params[:closedIcon], params[:data], &blk)
2409
+ old_initialize(p, text, params[:ic], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2403
2410
  end
2404
2411
  end
2405
2412
 
2406
- class FXFoldingList
2413
+ class FXTableItem
2407
2414
  alias old_initialize initialize
2408
- def initialize(p, *args, &blk)
2409
- argument_names = %w{target selector opts x y width height}
2410
- default_params = { :target => nil, :selector => 0, :opts => TREELIST_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
2415
+ def initialize(text, *args, &blk)
2416
+ argument_names = %w{icon data}
2417
+ default_params = { :icon => nil, :data => nil }
2411
2418
  params = {}
2412
2419
  params = args.pop if args.last.is_a? Hash
2413
2420
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2414
2421
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2415
2422
  params = default_params.merge(params)
2416
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2423
+ old_initialize(text, params[:icon], params[:data], &blk)
2417
2424
  end
2418
2425
  end
2419
2426
 
2420
- class FXColorRing
2427
+ class FXTable
2421
2428
  alias old_initialize initialize
2422
2429
  def initialize(p, *args, &blk)
2423
2430
  argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
2424
- default_params = { :target => nil, :selector => 0, :opts => FRAME_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2431
+ default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_MARGIN, :padRight => DEFAULT_MARGIN, :padTop => DEFAULT_MARGIN, :padBottom => DEFAULT_MARGIN }
2425
2432
  params = {}
2426
2433
  params = args.pop if args.last.is_a? Hash
2427
2434
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -2435,163 +2442,160 @@ module Fox
2435
2442
  end
2436
2443
  end
2437
2444
 
2438
- class FXMenuCascade
2445
+ class FXText
2439
2446
  alias old_initialize initialize
2440
- def initialize(parent, text, *args, &blk)
2441
- argument_names = %w{icon popupMenu opts}
2442
- default_params = { :icon => nil, :popupMenu => nil, :opts => 0 }
2447
+ def initialize(p, *args, &blk)
2448
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
2449
+ default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 3, :padRight => 3, :padTop => 2, :padBottom => 2 }
2443
2450
  params = {}
2444
2451
  params = args.pop if args.last.is_a? Hash
2445
2452
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2453
+ if params.key? :padding
2454
+ value = params.delete(:padding)
2455
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2456
+ end
2446
2457
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2447
2458
  params = default_params.merge(params)
2448
- old_initialize(parent, text, params[:icon], params[:popupMenu], params[:opts], &blk)
2459
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2449
2460
  end
2450
- end
2451
-
2452
- class FXBitmapView
2453
- alias old_initialize initialize
2454
- def initialize(p, *args, &blk)
2455
- argument_names = %w{bmp target selector opts x y width height}
2456
- default_params = { :bmp => nil, :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
2461
+ alias old_findText findText
2462
+ def findText(string, *args)
2463
+ argument_names = %w{start flags}
2464
+ default_params = { :start => 0, :flags => SEARCH_FORWARD|SEARCH_WRAP|SEARCH_EXACT }
2457
2465
  params = {}
2458
2466
  params = args.pop if args.last.is_a? Hash
2459
2467
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2460
2468
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2461
2469
  params = default_params.merge(params)
2462
- old_initialize(p, params[:bmp], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2470
+ old_findText(string, params[:start], params[:flags])
2463
2471
  end
2464
2472
  end
2465
2473
 
2466
- class FXComposite
2474
+ class FXTextField
2467
2475
  alias old_initialize initialize
2468
- def initialize(parent, *args, &blk)
2469
- argument_names = %w{opts x y width height}
2470
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
2476
+ def initialize(p, ncols, *args, &blk)
2477
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
2478
+ default_params = { :target => nil, :selector => 0, :opts => TEXTFIELD_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2471
2479
  params = {}
2472
2480
  params = args.pop if args.last.is_a? Hash
2473
2481
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2482
+ if params.key? :padding
2483
+ value = params.delete(:padding)
2484
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2485
+ end
2474
2486
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2475
2487
  params = default_params.merge(params)
2476
- old_initialize(parent, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2488
+ old_initialize(p, ncols, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2477
2489
  end
2478
2490
  end
2479
2491
 
2480
- class FXImage
2492
+ class FXToggleButton
2481
2493
  alias old_initialize initialize
2482
- def initialize(a, *args, &blk)
2483
- argument_names = %w{pixels opts width height}
2484
- default_params = { :pixels => nil, :opts => 0, :width => 1, :height => 1 }
2494
+ def initialize(p, text1, text2, *args, &blk)
2495
+ argument_names = %w{icon1 icon2 target selector opts x y width height padLeft padRight padTop padBottom}
2496
+ default_params = { :icon1 => nil, :icon2 => nil, :target => nil, :selector => 0, :opts => TOGGLEBUTTON_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2485
2497
  params = {}
2486
2498
  params = args.pop if args.last.is_a? Hash
2487
2499
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2500
+ if params.key? :padding
2501
+ value = params.delete(:padding)
2502
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2503
+ end
2488
2504
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2489
2505
  params = default_params.merge(params)
2490
- old_initialize(a, params[:pixels], params[:opts], params[:width], params[:height], &blk)
2506
+ old_initialize(p, text1, text2, params[:icon1], params[:icon2], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2491
2507
  end
2492
2508
  end
2493
2509
 
2494
- class FXStatusBar
2510
+ class FXToolBarGrip
2495
2511
  alias old_initialize initialize
2496
2512
  def initialize(p, *args, &blk)
2497
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
2498
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 3, :padRight => 3, :padTop => 2, :padBottom => 2, :hSpacing => 4, :vSpacing => 0 }
2513
+ argument_names = %w{target selector opts x y width height}
2514
+ default_params = { :target => nil, :selector => 0, :opts => TOOLBARGRIP_SINGLE, :x => 0, :y => 0, :width => 0, :height => 0 }
2499
2515
  params = {}
2500
2516
  params = args.pop if args.last.is_a? Hash
2501
2517
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2502
- if params.key? :padding
2503
- value = params.delete(:padding)
2504
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2505
- end
2506
2518
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2507
2519
  params = default_params.merge(params)
2508
- old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
2520
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2509
2521
  end
2510
2522
  end
2511
2523
 
2512
- class FXRegistry
2524
+ class FXToolBarShell
2513
2525
  alias old_initialize initialize
2514
- def initialize(*args, &blk)
2515
- argument_names = %w{appKey vendorKey}
2516
- default_params = { :appKey => "", :vendorKey => "" }
2526
+ def initialize(owner, *args, &blk)
2527
+ argument_names = %w{opts x y width height hSpacing vSpacing}
2528
+ default_params = { :opts => FRAME_RAISED|FRAME_THICK, :x => 0, :y => 0, :width => 0, :height => 0, :hSpacing => 4, :vSpacing => 4 }
2517
2529
  params = {}
2518
2530
  params = args.pop if args.last.is_a? Hash
2519
2531
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2520
2532
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2521
2533
  params = default_params.merge(params)
2522
- old_initialize(params[:appKey], params[:vendorKey], &blk)
2534
+ old_initialize(owner, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:hSpacing], params[:vSpacing], &blk)
2523
2535
  end
2524
2536
  end
2525
2537
 
2526
- class FXGIFImage
2538
+ class FXToolBarTab
2527
2539
  alias old_initialize initialize
2528
- def initialize(a, *args, &blk)
2529
- argument_names = %w{pix opts width height}
2530
- default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
2540
+ def initialize(p, *args, &blk)
2541
+ argument_names = %w{target selector opts x y width height}
2542
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_RAISED, :x => 0, :y => 0, :width => 0, :height => 0 }
2531
2543
  params = {}
2532
2544
  params = args.pop if args.last.is_a? Hash
2533
2545
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2534
2546
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2535
2547
  params = default_params.merge(params)
2536
- old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
2548
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2537
2549
  end
2538
2550
  end
2539
2551
 
2540
- class FXDriveBox
2552
+ class FXToolTip
2541
2553
  alias old_initialize initialize
2542
- def initialize(p, *args, &blk)
2543
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
2544
- default_params = { :target => nil, :selector => 0, :opts => FRAME_SUNKEN|FRAME_THICK|LISTBOX_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2554
+ def initialize(app, *args, &blk)
2555
+ argument_names = %w{opts x y width height}
2556
+ default_params = { :opts => TOOLTIP_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
2545
2557
  params = {}
2546
2558
  params = args.pop if args.last.is_a? Hash
2547
2559
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2548
- if params.key? :padding
2549
- value = params.delete(:padding)
2550
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2551
- end
2552
2560
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2553
2561
  params = default_params.merge(params)
2554
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2562
+ old_initialize(app, params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2555
2563
  end
2556
2564
  end
2557
2565
 
2558
- class FXSwitcher
2566
+ class FXTreeItem
2559
2567
  alias old_initialize initialize
2560
- def initialize(p, *args, &blk)
2561
- argument_names = %w{opts x y width height padLeft padRight padTop padBottom}
2562
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING }
2568
+ def initialize(text, *args, &blk)
2569
+ argument_names = %w{openIcon closedIcon data}
2570
+ default_params = { :openIcon => nil, :closedIcon => nil, :data => nil }
2563
2571
  params = {}
2564
2572
  params = args.pop if args.last.is_a? Hash
2565
2573
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2566
- if params.key? :padding
2567
- value = params.delete(:padding)
2568
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2569
- end
2570
2574
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2571
2575
  params = default_params.merge(params)
2572
- old_initialize(p, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2576
+ old_initialize(text, params[:openIcon], params[:closedIcon], params[:data], &blk)
2573
2577
  end
2574
2578
  end
2575
2579
 
2576
- class FXTGAIcon
2580
+ class FXTreeList
2577
2581
  alias old_initialize initialize
2578
- def initialize(a, *args, &blk)
2579
- argument_names = %w{pix clr opts width height}
2580
- default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
2582
+ def initialize(p, *args, &blk)
2583
+ argument_names = %w{target selector opts x y width height}
2584
+ default_params = { :target => nil, :selector => 0, :opts => TREELIST_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
2581
2585
  params = {}
2582
2586
  params = args.pop if args.last.is_a? Hash
2583
2587
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2584
2588
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2585
2589
  params = default_params.merge(params)
2586
- old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
2590
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2587
2591
  end
2588
2592
  end
2589
2593
 
2590
- class FXToggleButton
2594
+ class FXTreeListBox
2591
2595
  alias old_initialize initialize
2592
- def initialize(p, text1, text2, *args, &blk)
2593
- argument_names = %w{icon1 icon2 target selector opts x y width height padLeft padRight padTop padBottom}
2594
- default_params = { :icon1 => nil, :icon2 => nil, :target => nil, :selector => 0, :opts => TOGGLEBUTTON_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2596
+ def initialize(p, *args, &blk)
2597
+ argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
2598
+ default_params = { :target => nil, :selector => 0, :opts => FRAME_SUNKEN|FRAME_THICK|TREELISTBOX_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2595
2599
  params = {}
2596
2600
  params = args.pop if args.last.is_a? Hash
2597
2601
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -2601,15 +2605,15 @@ module Fox
2601
2605
  end
2602
2606
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2603
2607
  params = default_params.merge(params)
2604
- old_initialize(p, text1, text2, params[:icon1], params[:icon2], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2608
+ old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2605
2609
  end
2606
2610
  end
2607
2611
 
2608
- class FXColorBar
2612
+ class FXTriStateButton
2609
2613
  alias old_initialize initialize
2610
- def initialize(parent, *args, &blk)
2611
- argument_names = %w{target selector opts x y width height padLeft padRight padTop padBottom}
2612
- default_params = { :target => nil, :selector => 0, :opts => FRAME_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2614
+ def initialize(p, text1, text2, text3, *args, &blk)
2615
+ argument_names = %w{icon1 icon2 icon3 target selector opts x y width height padLeft padRight padTop padBottom}
2616
+ default_params = { :icon1 => nil, :icon2 => nil, :icon3 => nil, :target => nil, :selector => 0, :opts => TOGGLEBUTTON_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2613
2617
  params = {}
2614
2618
  params = args.pop if args.last.is_a? Hash
2615
2619
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -2619,15 +2623,15 @@ module Fox
2619
2623
  end
2620
2624
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2621
2625
  params = default_params.merge(params)
2622
- old_initialize(parent, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2626
+ old_initialize(p, text1, text2, text3, params[:icon1], params[:icon2], params[:icon3], params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2623
2627
  end
2624
2628
  end
2625
2629
 
2626
- class FXDockSite
2630
+ class FXVerticalFrame
2627
2631
  alias old_initialize initialize
2628
2632
  def initialize(p, *args, &blk)
2629
2633
  argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
2630
- default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 0, :padRight => 0, :padTop => 0, :padBottom => 0, :hSpacing => 0, :vSpacing => 0 }
2634
+ default_params = { :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
2631
2635
  params = {}
2632
2636
  params = args.pop if args.last.is_a? Hash
2633
2637
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -2641,95 +2645,91 @@ module Fox
2641
2645
  end
2642
2646
  end
2643
2647
 
2644
- class FXMemoryStream
2648
+ class FXVisual
2645
2649
  alias old_initialize initialize
2646
- def initialize(*args, &blk)
2647
- argument_names = %w{cont}
2648
- default_params = { :cont => nil }
2650
+ def initialize(a, flgs, *args, &blk)
2651
+ argument_names = %w{d}
2652
+ default_params = { :d => 32 }
2649
2653
  params = {}
2650
2654
  params = args.pop if args.last.is_a? Hash
2651
2655
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2652
2656
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2653
2657
  params = default_params.merge(params)
2654
- old_initialize(params[:cont], &blk)
2658
+ old_initialize(a, flgs, params[:d], &blk)
2655
2659
  end
2656
2660
  end
2657
2661
 
2658
- class FXTreeItem
2662
+ class FXWizard
2659
2663
  alias old_initialize initialize
2660
- def initialize(text, *args, &blk)
2661
- argument_names = %w{openIcon closedIcon data}
2662
- default_params = { :openIcon => nil, :closedIcon => nil, :data => nil }
2664
+ def initialize(owner, name, image, *args, &blk)
2665
+ argument_names = %w{opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
2666
+ default_params = { :opts => DECOR_TITLE|DECOR_BORDER|DECOR_RESIZE, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => 10, :padRight => 10, :padTop => 10, :padBottom => 10, :hSpacing => 10, :vSpacing => 10 }
2663
2667
  params = {}
2664
2668
  params = args.pop if args.last.is_a? Hash
2665
2669
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2670
+ if params.key? :padding
2671
+ value = params.delete(:padding)
2672
+ [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2673
+ end
2666
2674
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2667
2675
  params = default_params.merge(params)
2668
- old_initialize(text, params[:openIcon], params[:closedIcon], params[:data], &blk)
2676
+ old_initialize(owner, name, image, params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
2669
2677
  end
2670
2678
  end
2671
2679
 
2672
- class FXTreeList
2680
+ class FXXBMIcon
2673
2681
  alias old_initialize initialize
2674
- def initialize(p, *args, &blk)
2675
- argument_names = %w{target selector opts x y width height}
2676
- default_params = { :target => nil, :selector => 0, :opts => TREELIST_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0 }
2682
+ def initialize(a, *args, &blk)
2683
+ argument_names = %w{pixels mask clr opts width height}
2684
+ default_params = { :pixels => nil, :mask => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
2677
2685
  params = {}
2678
2686
  params = args.pop if args.last.is_a? Hash
2679
2687
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2680
2688
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2681
2689
  params = default_params.merge(params)
2682
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2690
+ old_initialize(a, params[:pixels], params[:mask], params[:clr], params[:opts], params[:width], params[:height], &blk)
2683
2691
  end
2684
2692
  end
2685
2693
 
2686
- class FXDirSelector
2694
+ class FXXBMImage
2687
2695
  alias old_initialize initialize
2688
- def initialize(p, *args, &blk)
2689
- argument_names = %w{target selector opts x y width height}
2690
- default_params = { :target => nil, :selector => 0, :opts => 0, :x => 0, :y => 0, :width => 0, :height => 0 }
2696
+ def initialize(a, *args, &blk)
2697
+ argument_names = %w{pixels mask opts width height}
2698
+ default_params = { :pixels => nil, :mask => nil, :opts => 0, :width => 1, :height => 1 }
2691
2699
  params = {}
2692
2700
  params = args.pop if args.last.is_a? Hash
2693
2701
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2694
2702
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2695
2703
  params = default_params.merge(params)
2696
- old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], &blk)
2704
+ old_initialize(a, params[:pixels], params[:mask], params[:opts], params[:width], params[:height], &blk)
2697
2705
  end
2698
2706
  end
2699
2707
 
2700
- class FXMatrix
2708
+ class FXXPMIcon
2701
2709
  alias old_initialize initialize
2702
- def initialize(parent, *args, &blk)
2703
- argument_names = %w{n opts x y width height padLeft padRight padTop padBottom hSpacing vSpacing}
2704
- default_params = { :n => 1, :opts => MATRIX_BY_ROWS, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_SPACING, :padRight => DEFAULT_SPACING, :padTop => DEFAULT_SPACING, :padBottom => DEFAULT_SPACING, :hSpacing => DEFAULT_SPACING, :vSpacing => DEFAULT_SPACING }
2710
+ def initialize(a, *args, &blk)
2711
+ argument_names = %w{pix clr opts width height}
2712
+ default_params = { :pix => nil, :clr => 0, :opts => 0, :width => 1, :height => 1 }
2705
2713
  params = {}
2706
2714
  params = args.pop if args.last.is_a? Hash
2707
2715
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2708
- if params.key? :padding
2709
- value = params.delete(:padding)
2710
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2711
- end
2712
2716
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2713
2717
  params = default_params.merge(params)
2714
- old_initialize(parent, params[:n], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], params[:hSpacing], params[:vSpacing], &blk)
2718
+ old_initialize(a, params[:pix], params[:clr], params[:opts], params[:width], params[:height], &blk)
2715
2719
  end
2716
2720
  end
2717
2721
 
2718
- class FXLabel
2722
+ class FXXPMImage
2719
2723
  alias old_initialize initialize
2720
- def initialize(parent, text, *args, &blk)
2721
- argument_names = %w{icon opts x y width height padLeft padRight padTop padBottom}
2722
- default_params = { :icon => nil, :opts => LABEL_NORMAL, :x => 0, :y => 0, :width => 0, :height => 0, :padLeft => DEFAULT_PAD, :padRight => DEFAULT_PAD, :padTop => DEFAULT_PAD, :padBottom => DEFAULT_PAD }
2724
+ def initialize(a, *args, &blk)
2725
+ argument_names = %w{pix opts width height}
2726
+ default_params = { :pix => nil, :opts => 0, :width => 1, :height => 1 }
2723
2727
  params = {}
2724
2728
  params = args.pop if args.last.is_a? Hash
2725
2729
  args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2726
- if params.key? :padding
2727
- value = params.delete(:padding)
2728
- [:padLeft, :padRight, :padTop, :padBottom].each { |s| params[s] ||= value }
2729
- end
2730
2730
  params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2731
2731
  params = default_params.merge(params)
2732
- old_initialize(parent, text, params[:icon], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
2732
+ old_initialize(a, params[:pix], params[:opts], params[:width], params[:height], &blk)
2733
2733
  end
2734
2734
  end
2735
2735