fxruby 1.6.22.pre2 → 1.6.22.pre3
Sign up to get free protection for your applications and to get access to all the features.
- data/History.txt +1 -1
- data/README.txt +10 -10
- data/Rakefile +3 -2
- data/doap.rdf +2 -2
- data/examples/babelfish.rb +2 -2
- data/examples/bounce.rb +20 -20
- data/examples/charts.rb +2 -2
- data/examples/custom_table_item.rb +3 -3
- data/examples/datatarget.rb +2 -2
- data/examples/dctest.rb +51 -51
- data/examples/dialog.rb +14 -14
- data/examples/dilbert.rb +4 -4
- data/examples/dirlist.rb +6 -6
- data/examples/dragdrop.rb +7 -7
- data/examples/dragsource.rb +6 -6
- data/examples/dropsite.rb +5 -5
- data/examples/foursplit.rb +6 -6
- data/examples/gltest.rb +40 -40
- data/examples/glviewer.rb +16 -16
- data/examples/groupbox.rb +41 -41
- data/examples/header.rb +6 -6
- data/examples/hello2.rb +2 -2
- data/examples/iconlist.rb +10 -10
- data/examples/image.rb +26 -26
- data/examples/imageviewer.rb +31 -31
- data/examples/inputs.rb +2 -2
- data/examples/mditest.rb +12 -12
- data/examples/pig.rb +8 -8
- data/examples/raabrowser.rb +5 -5
- data/examples/ratio.rb +9 -9
- data/examples/rulerview.rb +2 -2
- data/examples/scintilla-test.rb +6 -6
- data/examples/scribble-orig.rb +3 -3
- data/examples/scribble.rb +3 -3
- data/examples/shutter.rb +6 -6
- data/examples/splitter.rb +15 -15
- data/examples/styledtext.rb +10 -10
- data/examples/tabbook.rb +14 -14
- data/examples/table.rb +21 -21
- data/examples/textedit/helpwindow.rb +6 -6
- data/examples/textedit/textedit.rb +72 -72
- data/ext/fox16/FXRuby.cpp +48 -5
- data/ext/fox16/core_wrap.cpp +1 -1
- data/ext/fox16/iconlist_wrap.cpp +1 -1
- data/ext/fox16/icons_wrap.cpp +1 -1
- data/ext/fox16/include/FXMemoryBuffer.h +3 -3
- data/ext/fox16/include/FXRbApp.h +1 -1
- data/ext/fox16/include/FXRbBitmap.h +1 -1
- data/ext/fox16/include/FXRbBitmapFrame.h +2 -2
- data/ext/fox16/include/FXRbBitmapVirtuals.h +2 -2
- data/ext/fox16/include/FXRbDCPrint.h +1 -1
- data/ext/fox16/include/FXRbDCVirtuals.h +24 -24
- data/ext/fox16/include/FXRbDCWindow.h +1 -1
- data/ext/fox16/include/FXRbDockBar.h +1 -1
- data/ext/fox16/include/FXRbFileDict.h +2 -2
- data/ext/fox16/include/FXRbFoldingList.h +1 -1
- data/ext/fox16/include/FXRbFontVirtuals.h +9 -9
- data/ext/fox16/include/FXRbGLViewerVirtuals.h +2 -2
- data/ext/fox16/include/FXRbIconItemVirtuals.h +8 -8
- data/ext/fox16/include/FXRbIconListVirtuals.h +7 -7
- data/ext/fox16/include/FXRbIconSourceVirtuals.h +1 -1
- data/ext/fox16/include/FXRbImageFrame.h +2 -2
- data/ext/fox16/include/FXRbImageVirtuals.h +1 -1
- data/ext/fox16/include/FXRbListVirtuals.h +4 -4
- data/ext/fox16/include/FXRbMenuBar.h +1 -1
- data/ext/fox16/include/FXRbPopupVirtuals.h +1 -1
- data/ext/fox16/include/FXRbRecentFiles.h +1 -1
- data/ext/fox16/include/FXRbRuler.h +3 -3
- data/ext/fox16/include/FXRbRulerView.h +3 -3
- data/ext/fox16/include/FXRbScintilla.h +1 -1
- data/ext/fox16/include/FXRbSeparator.h +2 -2
- data/ext/fox16/include/FXRbTableItemVirtuals.h +8 -8
- data/ext/fox16/include/FXRbTableVirtuals.h +13 -13
- data/ext/fox16/include/FXRbText.h +2 -2
- data/ext/fox16/include/FXRbTextVirtuals.h +3 -3
- data/ext/fox16/include/FXRbToolBar.h +1 -1
- data/ext/fox16/include/FXRbToolBarGrip.h +1 -1
- data/ext/fox16/include/FXRbToolBarTab.h +1 -1
- data/ext/fox16/include/FXRbTreeList.h +1 -1
- data/ext/fox16/include/FXRbTreeListVirtuals.h +4 -4
- data/ext/fox16/include/FXRbWindow.h +3 -3
- data/ext/fox16/include/FXRbWizard.h +2 -2
- data/ext/fox16/include/FXRuby.h +8 -4
- data/ext/fox16/librb.c +12 -12
- data/ext/fox16/list_wrap.cpp +1 -1
- data/ext/fox16/make_impl.rb +5 -5
- data/ext/fox16/markfuncs.cpp +228 -220
- data/ext/fox16/scintilla_wrap.cpp +1 -1
- data/ext/fox16/treelist_wrap.cpp +4 -4
- data/ext/fox16/ui_wrap.cpp +2 -2
- data/ext/fox16/unregisterOwnedObjects.cpp +3 -3
- data/lib/fox16/accel_table.rb +1 -1
- data/lib/fox16/aliases.rb +3 -3
- data/lib/fox16/calendar.rb +21 -21
- data/lib/fox16/chore.rb +2 -2
- data/lib/fox16/core.rb +70 -70
- data/lib/fox16/dict.rb +1 -1
- data/lib/fox16/execute_nonmodal.rb +1 -1
- data/lib/fox16/glgroup.rb +16 -16
- data/lib/fox16/glshapes.rb +26 -26
- data/lib/fox16/input.rb +4 -4
- data/lib/fox16/irb.rb +2 -2
- data/lib/fox16/iterators.rb +2 -2
- data/lib/fox16/keys.rb +34 -34
- data/lib/fox16/kwargs.rb +927 -927
- data/lib/fox16/pseudokeyboard.rb +1 -1
- data/lib/fox16/pseudomouse.rb +1 -1
- data/lib/fox16/responder2.rb +4 -4
- data/lib/fox16/scintilla.rb +2 -2
- data/lib/fox16/signal.rb +4 -4
- data/lib/fox16/splashscreen.rb +3 -3
- data/lib/fox16/timeout.rb +3 -3
- data/lib/fox16/undolist.rb +9 -9
- data/lib/fox16/version.rb +1 -1
- data/rdoc-sources/FX4Splitter.rb +9 -9
- data/rdoc-sources/FX7Segment.rb +9 -9
- data/rdoc-sources/FXAccelTable.rb +1 -1
- data/rdoc-sources/FXApp.rb +50 -50
- data/rdoc-sources/FXBMPIcon.rb +3 -3
- data/rdoc-sources/FXBMPImage.rb +2 -2
- data/rdoc-sources/FXBitmap.rb +11 -11
- data/rdoc-sources/FXBitmapFrame.rb +5 -5
- data/rdoc-sources/FXBitmapView.rb +2 -2
- data/rdoc-sources/FXButton.rb +2 -2
- data/rdoc-sources/FXCheckButton.rb +5 -5
- data/rdoc-sources/FXColorBar.rb +5 -5
- data/rdoc-sources/FXColorDialog.rb +2 -2
- data/rdoc-sources/FXColorList.rb +2 -2
- data/rdoc-sources/FXColorRing.rb +8 -8
- data/rdoc-sources/FXColorSelector.rb +4 -4
- data/rdoc-sources/FXColorWell.rb +4 -4
- data/rdoc-sources/FXColorWheel.rb +6 -6
- data/rdoc-sources/FXComboBox.rb +17 -17
- data/rdoc-sources/FXComposite.rb +2 -2
- data/rdoc-sources/FXCursor.rb +7 -7
- data/rdoc-sources/FXDC.rb +67 -67
- data/rdoc-sources/FXDCPrint.rb +22 -22
- data/rdoc-sources/FXDCWindow.rb +1 -1
- data/rdoc-sources/FXDataTarget.rb +2 -2
- data/rdoc-sources/FXDebugTarget.rb +1 -1
- data/rdoc-sources/FXDelegator.rb +1 -1
- data/rdoc-sources/FXDial.rb +8 -8
- data/rdoc-sources/FXDict.rb +7 -7
- data/rdoc-sources/FXDirBox.rb +3 -3
- data/rdoc-sources/FXDirDialog.rb +7 -7
- data/rdoc-sources/FXDirList.rb +21 -21
- data/rdoc-sources/FXDirSelector.rb +8 -8
- data/rdoc-sources/FXDockBar.rb +5 -5
- data/rdoc-sources/FXDockHandler.rb +3 -3
- data/rdoc-sources/FXDockSite.rb +2 -2
- data/rdoc-sources/FXDockTitle.rb +3 -3
- data/rdoc-sources/FXDocument.rb +3 -3
- data/rdoc-sources/FXDragCorner.rb +3 -3
- data/rdoc-sources/FXDrawable.rb +3 -3
- data/rdoc-sources/FXDriveBox.rb +4 -4
- data/rdoc-sources/FXExtentd.rb +2 -2
- data/rdoc-sources/FXExtentf.rb +2 -2
- data/rdoc-sources/FXFileDialog.rb +21 -21
- data/rdoc-sources/FXFileDict.rb +17 -17
- data/rdoc-sources/FXFileList.rb +32 -32
- data/rdoc-sources/FXFileSelector.rb +20 -20
- data/rdoc-sources/FXFileStream.rb +1 -1
- data/rdoc-sources/FXFoldingList.rb +53 -53
- data/rdoc-sources/FXFont.rb +38 -38
- data/rdoc-sources/FXFrame.rb +11 -11
- data/rdoc-sources/FXGIFCursor.rb +3 -3
- data/rdoc-sources/FXGLCanvas.rb +2 -2
- data/rdoc-sources/FXGLContext.rb +6 -6
- data/rdoc-sources/FXGLObject.rb +6 -6
- data/rdoc-sources/FXGLShape.rb +3 -3
- data/rdoc-sources/FXGLViewer.rb +54 -54
- data/rdoc-sources/FXGLVisual.rb +13 -13
- data/rdoc-sources/FXGradientBar.rb +15 -15
- data/rdoc-sources/FXGroupBox.rb +4 -4
- data/rdoc-sources/FXHeader.rb +44 -44
- data/rdoc-sources/FXICOIcon.rb +1 -1
- data/rdoc-sources/FXICOImage.rb +1 -1
- data/rdoc-sources/FXIconDict.rb +1 -1
- data/rdoc-sources/FXIconList.rb +69 -69
- data/rdoc-sources/FXIconSource.rb +2 -2
- data/rdoc-sources/FXId.rb +1 -1
- data/rdoc-sources/FXImage.rb +11 -11
- data/rdoc-sources/FXImageFrame.rb +3 -3
- data/rdoc-sources/FXImageView.rb +2 -2
- data/rdoc-sources/FXInputDialog.rb +6 -6
- data/rdoc-sources/FXJPGIcon.rb +3 -3
- data/rdoc-sources/FXJPGImage.rb +2 -2
- data/rdoc-sources/FXKnob.rb +9 -9
- data/rdoc-sources/FXLabel.rb +8 -8
- data/rdoc-sources/FXList.rb +28 -28
- data/rdoc-sources/FXListBox.rb +21 -21
- data/rdoc-sources/FXMDIChild.rb +11 -11
- data/rdoc-sources/FXMDIClient.rb +5 -5
- data/rdoc-sources/FXMatrix.rb +6 -6
- data/rdoc-sources/FXMemoryBuffer.rb +1 -1
- data/rdoc-sources/FXMemoryStream.rb +3 -3
- data/rdoc-sources/FXMenuBar.rb +1 -1
- data/rdoc-sources/FXMenuButton.rb +7 -7
- data/rdoc-sources/FXMenuCaption.rb +10 -10
- data/rdoc-sources/FXMenuCheck.rb +1 -1
- data/rdoc-sources/FXMenuRadio.rb +1 -1
- data/rdoc-sources/FXMenuSeparator.rb +1 -1
- data/rdoc-sources/FXMessageBox.rb +3 -3
- data/rdoc-sources/FXOptionMenu.rb +9 -9
- data/rdoc-sources/FXPCXIcon.rb +2 -2
- data/rdoc-sources/FXPCXImage.rb +1 -1
- data/rdoc-sources/FXPNGIcon.rb +3 -3
- data/rdoc-sources/FXPNGImage.rb +1 -1
- data/rdoc-sources/FXPPMIcon.rb +2 -2
- data/rdoc-sources/FXPPMImage.rb +1 -1
- data/rdoc-sources/FXPacker.rb +13 -13
- data/rdoc-sources/FXPopup.rb +11 -11
- data/rdoc-sources/FXProgressBar.rb +7 -7
- data/rdoc-sources/FXProgressDialog.rb +3 -3
- data/rdoc-sources/FXQuatd.rb +17 -17
- data/rdoc-sources/FXQuatf.rb +18 -18
- data/rdoc-sources/FXRGBIcon.rb +3 -3
- data/rdoc-sources/FXRGBImage.rb +1 -1
- data/rdoc-sources/FXRadioButton.rb +4 -4
- data/rdoc-sources/FXRanged.rb +1 -1
- data/rdoc-sources/FXRangef.rb +1 -1
- data/rdoc-sources/FXRealSlider.rb +7 -7
- data/rdoc-sources/FXRealSpinner.rb +11 -11
- data/rdoc-sources/FXRecentFiles.rb +8 -8
- data/rdoc-sources/FXRectangle.rb +12 -12
- data/rdoc-sources/FXRegion.rb +15 -15
- data/rdoc-sources/FXRegistry.rb +4 -4
- data/rdoc-sources/FXReplaceDialog.rb +3 -3
- data/rdoc-sources/FXRuler.rb +18 -18
- data/rdoc-sources/FXRulerView.rb +38 -38
- data/rdoc-sources/FXScintilla.rb +16 -16
- data/rdoc-sources/FXScrollArea.rb +9 -9
- data/rdoc-sources/FXScrollBar.rb +8 -8
- data/rdoc-sources/FXScrollPane.rb +1 -1
- data/rdoc-sources/FXScrollWindow.rb +5 -5
- data/rdoc-sources/FXSeparator.rb +1 -1
- data/rdoc-sources/FXSettings.rb +1 -1
- data/rdoc-sources/FXShutter.rb +3 -3
- data/rdoc-sources/FXSize.rb +4 -4
- data/rdoc-sources/FXSlider.rb +7 -7
- data/rdoc-sources/FXSphered.rb +21 -21
- data/rdoc-sources/FXSpheref.rb +20 -20
- data/rdoc-sources/FXSpinner.rb +12 -12
- data/rdoc-sources/FXSplashWindow.rb +1 -1
- data/rdoc-sources/FXSplitter.rb +6 -6
- data/rdoc-sources/FXSpring.rb +2 -2
- data/rdoc-sources/FXStatusBar.rb +4 -4
- data/rdoc-sources/FXStatusLine.rb +5 -5
- data/rdoc-sources/FXStream.rb +8 -8
- data/rdoc-sources/FXStringDict.rb +5 -5
- data/rdoc-sources/FXSwitcher.rb +2 -2
- data/rdoc-sources/FXTGAIcon.rb +3 -3
- data/rdoc-sources/FXTGAImage.rb +1 -1
- data/rdoc-sources/FXTIFIcon.rb +2 -2
- data/rdoc-sources/FXTIFImage.rb +2 -2
- data/rdoc-sources/FXTabBar.rb +2 -2
- data/rdoc-sources/FXTable.rb +131 -131
- data/rdoc-sources/FXText.rb +48 -48
- data/rdoc-sources/FXTextField.rb +9 -9
- data/rdoc-sources/FXToolBar.rb +1 -1
- data/rdoc-sources/FXToolBarGrip.rb +1 -1
- data/rdoc-sources/FXToolBarShell.rb +7 -7
- data/rdoc-sources/FXToolBarTab.rb +3 -3
- data/rdoc-sources/FXToolTip.rb +1 -1
- data/rdoc-sources/FXTopWindow.rb +17 -17
- data/rdoc-sources/FXTranslator.rb +5 -5
- data/rdoc-sources/FXTreeList.rb +50 -50
- data/rdoc-sources/FXTreeListBox.rb +16 -16
- data/rdoc-sources/FXVec2d.rb +5 -5
- data/rdoc-sources/FXVec2f.rb +5 -5
- data/rdoc-sources/FXVec3d.rb +8 -8
- data/rdoc-sources/FXVec3f.rb +8 -8
- data/rdoc-sources/FXVec4d.rb +8 -8
- data/rdoc-sources/FXVec4f.rb +8 -8
- data/rdoc-sources/FXVisual.rb +3 -3
- data/rdoc-sources/FXWindow.rb +99 -99
- data/rdoc-sources/FXWizard.rb +8 -8
- data/rdoc-sources/FXXBMIcon.rb +2 -2
- data/rdoc-sources/FXXBMImage.rb +1 -1
- data/rdoc-sources/FXXPMIcon.rb +2 -2
- data/rdoc-sources/FXXPMImage.rb +1 -1
- data/rdoc-sources/fxdefs.rb +17 -17
- data/scripts/generate_kwargs_lib.rb +22 -22
- data/scripts/iface.rb +1 -1
- data/swig-interfaces/FX4Splitter.i +5 -5
- data/swig-interfaces/FX7Segment.i +5 -5
- data/swig-interfaces/FXApp.i +10 -10
- data/swig-interfaces/FXBMPIcon.i +2 -2
- data/swig-interfaces/FXBitmap.i +3 -3
- data/swig-interfaces/FXBitmapFrame.i +1 -1
- data/swig-interfaces/FXBitmapView.i +1 -1
- data/swig-interfaces/FXCanvas.i +1 -1
- data/swig-interfaces/FXCheckButton.i +2 -2
- data/swig-interfaces/FXChoiceBox.i +2 -2
- data/swig-interfaces/FXColorBar.i +7 -7
- data/swig-interfaces/FXColorList.i +5 -5
- data/swig-interfaces/FXColorWell.i +1 -1
- data/swig-interfaces/FXColorWheel.i +6 -6
- data/swig-interfaces/FXComboBox.i +4 -4
- data/swig-interfaces/FXCursor.i +4 -4
- data/swig-interfaces/FXDC.i +23 -23
- data/swig-interfaces/FXDCPrint.i +5 -5
- data/swig-interfaces/FXDCWindow.i +8 -8
- data/swig-interfaces/FXDataTarget.i +5 -5
- data/swig-interfaces/FXDebugTarget.i +1 -1
- data/swig-interfaces/FXDelegator.i +3 -3
- data/swig-interfaces/FXDial.i +8 -8
- data/swig-interfaces/FXDialogBox.i +3 -3
- data/swig-interfaces/FXDict.i +14 -14
- data/swig-interfaces/FXDirBox.i +1 -1
- data/swig-interfaces/FXDirDialog.i +2 -2
- data/swig-interfaces/FXDirList.i +16 -16
- data/swig-interfaces/FXDirSelector.i +2 -2
- data/swig-interfaces/FXDockBar.i +1 -1
- data/swig-interfaces/FXDockHandler.i +1 -1
- data/swig-interfaces/FXDockSite.i +1 -1
- data/swig-interfaces/FXDockTitle.i +1 -1
- data/swig-interfaces/FXDocument.i +1 -1
- data/swig-interfaces/FXDragCorner.i +3 -3
- data/swig-interfaces/FXDriveBox.i +1 -1
- data/swig-interfaces/FXFileDialog.i +8 -8
- data/swig-interfaces/FXFileDict.i +2 -2
- data/swig-interfaces/FXFileList.i +11 -11
- data/swig-interfaces/FXFileSelector.i +4 -4
- data/swig-interfaces/FXFoldingList.i +7 -7
- data/swig-interfaces/FXFont.i +20 -20
- data/swig-interfaces/FXFrame.i +3 -3
- data/swig-interfaces/FXGLCanvas.i +3 -3
- data/swig-interfaces/FXGLContext.i +7 -7
- data/swig-interfaces/FXGLObject.i +1 -1
- data/swig-interfaces/FXGLShape.i +6 -6
- data/swig-interfaces/FXGLViewer.i +40 -40
- data/swig-interfaces/FXGLVisual.i +2 -2
- data/swig-interfaces/FXGradientBar.i +4 -4
- data/swig-interfaces/FXGroupBox.i +3 -3
- data/swig-interfaces/FXHeader.i +7 -7
- data/swig-interfaces/FXIcon.i +4 -4
- data/swig-interfaces/FXIconDict.i +1 -1
- data/swig-interfaces/FXIconList.i +46 -46
- data/swig-interfaces/FXImage.i +2 -2
- data/swig-interfaces/FXImageView.i +1 -1
- data/swig-interfaces/FXInputDialog.i +3 -3
- data/swig-interfaces/FXJPGIcon.i +3 -3
- data/swig-interfaces/FXJPGImage.i +2 -2
- data/swig-interfaces/FXKnob.i +2 -2
- data/swig-interfaces/FXLabel.i +2 -2
- data/swig-interfaces/FXList.i +35 -35
- data/swig-interfaces/FXListBox.i +5 -5
- data/swig-interfaces/FXMDIButton.i +5 -5
- data/swig-interfaces/FXMDIChild.i +12 -12
- data/swig-interfaces/FXMDIClient.i +2 -2
- data/swig-interfaces/FXMat4d.i +2 -2
- data/swig-interfaces/FXMat4f.i +5 -5
- data/swig-interfaces/FXMatrix.i +12 -12
- data/swig-interfaces/FXMemoryBuffer.i +4 -4
- data/swig-interfaces/FXMenuBar.i +3 -3
- data/swig-interfaces/FXMenuButton.i +7 -7
- data/swig-interfaces/FXMenuCaption.i +4 -4
- data/swig-interfaces/FXMenuCommand.i +1 -1
- data/swig-interfaces/FXMenuPane.i +1 -1
- data/swig-interfaces/FXMenuRadio.i +1 -1
- data/swig-interfaces/FXMenuSeparator.i +1 -1
- data/swig-interfaces/FXMessageBox.i +1 -1
- data/swig-interfaces/FXOptionMenu.i +6 -6
- data/swig-interfaces/FXPNGIcon.i +2 -2
- data/swig-interfaces/FXPPMIcon.i +2 -2
- data/swig-interfaces/FXPacker.i +6 -6
- data/swig-interfaces/FXPopup.i +13 -13
- data/swig-interfaces/FXProgressBar.i +12 -12
- data/swig-interfaces/FXProgressDialog.i +5 -5
- data/swig-interfaces/FXQuatd.i +7 -7
- data/swig-interfaces/FXQuatf.i +1 -1
- data/swig-interfaces/FXRadioButton.i +4 -4
- data/swig-interfaces/FXRanged.i +4 -4
- data/swig-interfaces/FXRangef.i +5 -5
- data/swig-interfaces/FXRealSlider.i +10 -10
- data/swig-interfaces/FXRealSpinner.i +17 -17
- data/swig-interfaces/FXRecentFiles.i +1 -1
- data/swig-interfaces/FXRegion.i +4 -4
- data/swig-interfaces/FXRegistry.i +3 -3
- data/swig-interfaces/FXReplaceDialog.i +1 -1
- data/swig-interfaces/FXScintilla.i +3 -3
- data/swig-interfaces/FXScrollArea.i +7 -7
- data/swig-interfaces/FXScrollBar.i +3 -3
- data/swig-interfaces/FXScrollWindow.i +6 -6
- data/swig-interfaces/FXSearchDialog.i +1 -1
- data/swig-interfaces/FXSeparator.i +3 -3
- data/swig-interfaces/FXSettings.i +3 -3
- data/swig-interfaces/FXShell.i +1 -1
- data/swig-interfaces/FXSlider.i +11 -11
- data/swig-interfaces/FXSphered.i +1 -1
- data/swig-interfaces/FXSpheref.i +1 -1
- data/swig-interfaces/FXSpinner.i +15 -15
- data/swig-interfaces/FXSplitter.i +6 -6
- data/swig-interfaces/FXStatusBar.i +4 -4
- data/swig-interfaces/FXStatusLine.i +5 -5
- data/swig-interfaces/FXStream.i +1 -1
- data/swig-interfaces/FXSwitcher.i +5 -5
- data/swig-interfaces/FXTabBar.i +2 -2
- data/swig-interfaces/FXTabBook.i +1 -1
- data/swig-interfaces/FXTabItem.i +4 -4
- data/swig-interfaces/FXTable.i +37 -37
- data/swig-interfaces/FXText.i +13 -13
- data/swig-interfaces/FXTextField.i +1 -1
- data/swig-interfaces/FXToggleButton.i +6 -6
- data/swig-interfaces/FXToolBar.i +4 -4
- data/swig-interfaces/FXToolBarGrip.i +3 -3
- data/swig-interfaces/FXToolBarShell.i +3 -3
- data/swig-interfaces/FXToolBarTab.i +5 -5
- data/swig-interfaces/FXToolTip.i +1 -1
- data/swig-interfaces/FXTopWindow.i +10 -10
- data/swig-interfaces/FXTreeList.i +28 -28
- data/swig-interfaces/FXTreeListBox.i +36 -36
- data/swig-interfaces/FXVec3d.i +2 -2
- data/swig-interfaces/FXVec3f.i +2 -2
- data/swig-interfaces/FXVec4d.i +1 -1
- data/swig-interfaces/FXVec4f.i +9 -9
- data/swig-interfaces/FXVerticalFrame.i +1 -1
- data/swig-interfaces/FXVisual.i +1 -1
- data/swig-interfaces/FXWindow.i +46 -46
- data/swig-interfaces/FXXPMIcon.i +1 -1
- data/swig-interfaces/FXXPMImage.i +1 -1
- data/swig-interfaces/exceptions.i +1 -1
- data/swig-interfaces/freefuncs.i +1 -1
- data/swig-interfaces/fxdefs.i +13 -13
- data/swig-interfaces/macros.i +79 -79
- data/test/TC_FXAccelTable.rb +3 -3
- data/test/TC_FXButton.rb +9 -9
- data/test/TC_FXCheckButton.rb +4 -4
- data/test/TC_FXComboBox.rb +1 -1
- data/test/TC_FXDC.rb +42 -42
- data/test/TC_FXDialogBox.rb +1 -1
- data/test/TC_FXExtentd.rb +2 -2
- data/test/TC_FXExtentf.rb +2 -2
- data/test/TC_FXFileAssoc.rb +5 -5
- data/test/TC_FXFileStream.rb +5 -5
- data/test/TC_FXFoldingList.rb +3 -3
- data/test/TC_FXFont.rb +3 -3
- data/test/TC_FXGLGroup.rb +1 -1
- data/test/TC_FXHeader.rb +3 -3
- data/test/TC_FXIconDict.rb +5 -5
- data/test/TC_FXIconList.rb +12 -12
- data/test/TC_FXImage.rb +16 -16
- data/test/TC_FXList.rb +5 -5
- data/test/TC_FXListBox.rb +1 -1
- data/test/TC_FXMainWindow.rb +2 -2
- data/test/TC_FXMat4f.rb +33 -33
- data/test/TC_FXMaterial.rb +5 -5
- data/test/TC_FXMemoryStream.rb +2 -2
- data/test/TC_FXMenuCheck.rb +5 -5
- data/test/TC_FXMessageBox.rb +3 -3
- data/test/TC_FXPoint.rb +1 -1
- data/test/TC_FXRadioButton.rb +4 -4
- data/test/TC_FXRanged.rb +3 -3
- data/test/TC_FXRangef.rb +3 -3
- data/test/TC_FXRegion.rb +1 -1
- data/test/TC_FXScrollArea.rb +1 -1
- data/test/TC_FXScrollWindow.rb +1 -1
- data/test/TC_FXSettings.rb +2 -2
- data/test/TC_FXShell.rb +2 -2
- data/test/TC_FXTopWindow.rb +2 -2
- data/test/TC_FXTreeList.rb +4 -4
- data/test/TC_FXTreeListBox.rb +3 -3
- data/test/TC_FXVec2d.rb +3 -3
- data/test/TC_FXVec2f.rb +3 -3
- data/test/TC_FXVec3d.rb +5 -5
- data/test/TC_FXVec3f.rb +5 -5
- data/test/TC_FXVec4f.rb +6 -6
- data/test/TC_Misc.rb +6 -2
- data/test/TS_All.rb +1 -17
- data/test/stress1.rb +5 -5
- data/test/stress2.rb +3 -3
- data/test/stress3.rb +12 -12
- data/test/testcase.rb +4 -4
- metadata +76 -76
data/ext/fox16/markfuncs.cpp
CHANGED
@@ -53,6 +53,11 @@ void FXRbObject::markfunc(FXObject* obj){
|
|
53
53
|
FXTRACE((100,"%s::markfunc(%p)\n",obj?obj->getClassName():"FXRbObject",obj));
|
54
54
|
}
|
55
55
|
|
56
|
+
static void FXRbSetInGCRecursive(FXWindow *window, bool enabled){
|
57
|
+
FXRbSetInGC( window, true );
|
58
|
+
if(window->getParent()) FXRbSetInGCRecursive( window->getParent(), enabled );
|
59
|
+
}
|
60
|
+
|
56
61
|
|
57
62
|
void FXRbObject::freefunc(FXObject* self){
|
58
63
|
if(self!=0){
|
@@ -66,6 +71,17 @@ void FXRbObject::freefunc(FXObject* self){
|
|
66
71
|
FXASSERT(classname!=0);
|
67
72
|
FXASSERT(strlen(classname)>3);
|
68
73
|
if(classname[0]=='F' && classname[1]=='X' && classname[2]=='R' && classname[3]=='b'){
|
74
|
+
// FXWindow destructor calls recalc() and changeFocus() of it's parent window.
|
75
|
+
// Since these methods are routed back to Ruby code, but calling Ruby code from
|
76
|
+
// GC isn't a good idea, we mark the parent window as "in_gc", so that it will
|
77
|
+
// ignore recalc() and changeFocus() calls completely.
|
78
|
+
// The parent window should also be scheduled to be free'd. In the other case,
|
79
|
+
// the child window would have been marked as used.
|
80
|
+
if(self->isMemberOf(FXMETACLASS(FXWindow))){
|
81
|
+
if(FXWindow *parent = dynamic_cast<FXWindow*>(self)->getParent()){
|
82
|
+
FXRbSetInGCRecursive( parent, true );
|
83
|
+
}
|
84
|
+
}
|
69
85
|
delete self;
|
70
86
|
}
|
71
87
|
else{
|
@@ -77,12 +93,12 @@ void FXRbObject::freefunc(FXObject* self){
|
|
77
93
|
void FXRbIconSource::markfunc(FXIconSource* iconSource){
|
78
94
|
FXRbObject::markfunc(iconSource);
|
79
95
|
}
|
80
|
-
|
96
|
+
|
81
97
|
void FXRbTranslator::markfunc(FXTranslator* translator){
|
82
98
|
FXRbObject::markfunc(translator);
|
83
99
|
if(translator){
|
84
|
-
FXRbGcMark(translator->getApp());
|
85
|
-
FXRbGcMark(translator->getTextCodec());
|
100
|
+
FXRbGcMark(translator->FXTranslator::getApp());
|
101
|
+
FXRbGcMark(translator->FXTranslator::getTextCodec());
|
86
102
|
}
|
87
103
|
}
|
88
104
|
|
@@ -124,8 +140,8 @@ void FXRbKnob::markfunc(FXKnob* self){
|
|
124
140
|
void FXRbLabel::markfunc(FXLabel* self){
|
125
141
|
FXRbFrame::markfunc(self);
|
126
142
|
if(self){
|
127
|
-
FXRbGcMark(self->getFont());
|
128
|
-
FXRbGcMark(self->getIcon());
|
143
|
+
FXRbGcMark(self->FXLabel::getFont());
|
144
|
+
FXRbGcMark(self->FXLabel::getIcon());
|
129
145
|
}
|
130
146
|
}
|
131
147
|
|
@@ -145,21 +161,22 @@ void FXRbDockHandler::markfunc(FXDockHandler *dockhandler){
|
|
145
161
|
void FXRbDockTitle::markfunc(FXDockTitle *self){
|
146
162
|
FXRbDockHandler::markfunc(self);
|
147
163
|
if(self){
|
148
|
-
FXRbGcMark(self->getFont());
|
164
|
+
FXRbGcMark(self->FXDockTitle::getFont());
|
149
165
|
}
|
150
166
|
}
|
151
167
|
|
152
168
|
void FXRbDrawable::markfunc(FXDrawable* drawable){
|
153
169
|
FXRbId::markfunc(drawable);
|
154
|
-
if(drawable) FXRbGcMark(drawable->getVisual());
|
170
|
+
if(drawable) FXRbGcMark(drawable->FXDrawable::getVisual());
|
155
171
|
}
|
156
172
|
|
157
173
|
|
158
174
|
void FXRbId::markfunc(FXId* self){
|
159
175
|
FXRbObject::markfunc(self);
|
160
176
|
if(self){
|
161
|
-
FXRbGcMark(self->getApp());
|
162
|
-
if(
|
177
|
+
FXRbGcMark(self->FXId::getApp());
|
178
|
+
if(void *d=self->FXId::getUserData())
|
179
|
+
MARK(d);
|
163
180
|
}
|
164
181
|
}
|
165
182
|
|
@@ -185,23 +202,23 @@ void FXRbChoiceBox::markfunc(FXChoiceBox* box){
|
|
185
202
|
void FXRbWindow::markfunc(FXWindow* self){
|
186
203
|
FXRbDrawable::markfunc(self);
|
187
204
|
if(self){
|
188
|
-
FXRbGcMark(self->getParent());
|
189
|
-
FXRbGcMark(self->getOwner());
|
190
|
-
FXRbGcMark(self->getShell());
|
191
|
-
FXRbGcMark(self->getRoot());
|
192
|
-
// FXRbGcMark(self->getNext());
|
193
|
-
// FXRbGcMark(self->getPrev());
|
194
|
-
FXRbGcMark(self->getFocus());
|
195
|
-
FXRbGcMark(self->getTarget());
|
196
|
-
FXRbGcMark(self->getAccelTable());
|
197
|
-
FXRbGcMark(self->getDefaultCursor());
|
198
|
-
FXRbGcMark(self->getDragCursor());
|
205
|
+
FXRbGcMark(self->FXWindow::getParent());
|
206
|
+
FXRbGcMark(self->FXWindow::getOwner());
|
207
|
+
FXRbGcMark(self->FXWindow::getShell());
|
208
|
+
FXRbGcMark(self->FXWindow::getRoot());
|
209
|
+
// FXRbGcMark(self->FXWindow::getNext());
|
210
|
+
// FXRbGcMark(self->FXWindow::getPrev());
|
211
|
+
FXRbGcMark(self->FXWindow::getFocus());
|
212
|
+
FXRbGcMark(self->FXWindow::getTarget());
|
213
|
+
FXRbGcMark(self->FXWindow::getAccelTable());
|
214
|
+
FXRbGcMark(self->FXWindow::getDefaultCursor());
|
215
|
+
FXRbGcMark(self->FXWindow::getDragCursor());
|
199
216
|
|
200
217
|
// Mark child windows
|
201
|
-
register FXWindow* child=self->getFirst();
|
218
|
+
register FXWindow* child=self->FXWindow::getFirst();
|
202
219
|
while(child!=NULL){
|
203
220
|
FXRbGcMark(child);
|
204
|
-
child=child->getNext();
|
221
|
+
child=child->FXWindow::getNext();
|
205
222
|
}
|
206
223
|
}
|
207
224
|
}
|
@@ -215,8 +232,8 @@ void FXRbDialogBox::markfunc(FXDialogBox* dlg){
|
|
215
232
|
void FXRbTopWindow::markfunc(FXTopWindow* top){
|
216
233
|
FXRbShell::markfunc(top);
|
217
234
|
if(top){
|
218
|
-
FXRbGcMark(top->getIcon());
|
219
|
-
FXRbGcMark(top->getMiniIcon());
|
235
|
+
FXRbGcMark(top->FXTopWindow::getIcon());
|
236
|
+
FXRbGcMark(top->FXTopWindow::getMiniIcon());
|
220
237
|
}
|
221
238
|
}
|
222
239
|
|
@@ -266,7 +283,7 @@ void FXRbVerticalFrame::markfunc(FXVerticalFrame* self){
|
|
266
283
|
void FXRbGroupBox::markfunc(FXGroupBox* self){
|
267
284
|
FXRbPacker::markfunc(self);
|
268
285
|
if(self){
|
269
|
-
FXRbGcMark(self->getFont());
|
286
|
+
FXRbGcMark(self->FXGroupBox::getFont());
|
270
287
|
}
|
271
288
|
}
|
272
289
|
|
@@ -279,10 +296,10 @@ void FXRbColorWell::markfunc(FXColorWell* cw){
|
|
279
296
|
void FXRbComboBox::markfunc(FXComboBox* self){
|
280
297
|
FXRbPacker::markfunc(self);
|
281
298
|
if(self){
|
282
|
-
FXRbGcMark(self->getFont());
|
299
|
+
FXRbGcMark(self->FXComboBox::getFont());
|
283
300
|
for(FXint i=0; i<self->getNumItems(); i++){
|
284
|
-
if(self->getItemData(i))
|
285
|
-
MARK(
|
301
|
+
if(void *d=self->FXComboBox::getItemData(i))
|
302
|
+
MARK(d);
|
286
303
|
}
|
287
304
|
}
|
288
305
|
}
|
@@ -302,43 +319,43 @@ void FXRbApp::markfunc(FXApp *self){
|
|
302
319
|
FXRbObject::markfunc(self);
|
303
320
|
if(self){
|
304
321
|
// Visuals
|
305
|
-
FXRbGcMark(self->getMonoVisual());
|
306
|
-
FXRbGcMark(self->getDefaultVisual());
|
322
|
+
FXRbGcMark(self->FXApp::getMonoVisual());
|
323
|
+
FXRbGcMark(self->FXApp::getDefaultVisual());
|
307
324
|
|
308
325
|
// Fonts
|
309
|
-
FXRbGcMark(self->getNormalFont());
|
326
|
+
FXRbGcMark(self->FXApp::getNormalFont());
|
310
327
|
|
311
328
|
// Cursors
|
312
|
-
FXRbGcMark(self->getWaitCursor());
|
313
|
-
FXRbGcMark(self->getDefaultCursor(DEF_ARROW_CURSOR));
|
314
|
-
FXRbGcMark(self->getDefaultCursor(DEF_RARROW_CURSOR));
|
315
|
-
FXRbGcMark(self->getDefaultCursor(DEF_TEXT_CURSOR));
|
316
|
-
FXRbGcMark(self->getDefaultCursor(DEF_HSPLIT_CURSOR));
|
317
|
-
FXRbGcMark(self->getDefaultCursor(DEF_VSPLIT_CURSOR));
|
318
|
-
FXRbGcMark(self->getDefaultCursor(DEF_XSPLIT_CURSOR));
|
319
|
-
FXRbGcMark(self->getDefaultCursor(DEF_SWATCH_CURSOR));
|
320
|
-
FXRbGcMark(self->getDefaultCursor(DEF_MOVE_CURSOR));
|
321
|
-
FXRbGcMark(self->getDefaultCursor(DEF_DRAGH_CURSOR));
|
322
|
-
FXRbGcMark(self->getDefaultCursor(DEF_DRAGV_CURSOR));
|
323
|
-
FXRbGcMark(self->getDefaultCursor(DEF_DRAGTL_CURSOR));
|
324
|
-
FXRbGcMark(self->getDefaultCursor(DEF_DRAGBR_CURSOR));
|
325
|
-
FXRbGcMark(self->getDefaultCursor(DEF_DRAGTR_CURSOR));
|
326
|
-
FXRbGcMark(self->getDefaultCursor(DEF_DRAGBL_CURSOR));
|
327
|
-
FXRbGcMark(self->getDefaultCursor(DEF_DNDSTOP_CURSOR));
|
328
|
-
FXRbGcMark(self->getDefaultCursor(DEF_DNDCOPY_CURSOR));
|
329
|
-
FXRbGcMark(self->getDefaultCursor(DEF_DNDMOVE_CURSOR));
|
330
|
-
FXRbGcMark(self->getDefaultCursor(DEF_DNDLINK_CURSOR));
|
331
|
-
FXRbGcMark(self->getDefaultCursor(DEF_CROSSHAIR_CURSOR));
|
332
|
-
FXRbGcMark(self->getDefaultCursor(DEF_CORNERNE_CURSOR));
|
333
|
-
FXRbGcMark(self->getDefaultCursor(DEF_CORNERNW_CURSOR));
|
334
|
-
FXRbGcMark(self->getDefaultCursor(DEF_CORNERSE_CURSOR));
|
335
|
-
FXRbGcMark(self->getDefaultCursor(DEF_CORNERSW_CURSOR));
|
336
|
-
FXRbGcMark(self->getDefaultCursor(DEF_ROTATE_CURSOR));
|
337
|
-
|
329
|
+
FXRbGcMark(self->FXApp::getWaitCursor());
|
330
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_ARROW_CURSOR));
|
331
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_RARROW_CURSOR));
|
332
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_TEXT_CURSOR));
|
333
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_HSPLIT_CURSOR));
|
334
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_VSPLIT_CURSOR));
|
335
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_XSPLIT_CURSOR));
|
336
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_SWATCH_CURSOR));
|
337
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_MOVE_CURSOR));
|
338
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_DRAGH_CURSOR));
|
339
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_DRAGV_CURSOR));
|
340
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_DRAGTL_CURSOR));
|
341
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_DRAGBR_CURSOR));
|
342
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_DRAGTR_CURSOR));
|
343
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_DRAGBL_CURSOR));
|
344
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_DNDSTOP_CURSOR));
|
345
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_DNDCOPY_CURSOR));
|
346
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_DNDMOVE_CURSOR));
|
347
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_DNDLINK_CURSOR));
|
348
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_CROSSHAIR_CURSOR));
|
349
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_CORNERNE_CURSOR));
|
350
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_CORNERNW_CURSOR));
|
351
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_CORNERSE_CURSOR));
|
352
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_CORNERSW_CURSOR));
|
353
|
+
FXRbGcMark(self->FXApp::getDefaultCursor(DEF_ROTATE_CURSOR));
|
354
|
+
|
338
355
|
// Other windows
|
339
|
-
FXRbGcMark(self->getFocusWindow());
|
340
|
-
FXRbGcMark(self->getCursorWindow());
|
341
|
-
|
356
|
+
FXRbGcMark(self->FXApp::getFocusWindow());
|
357
|
+
FXRbGcMark(self->FXApp::getCursorWindow());
|
358
|
+
|
342
359
|
/**
|
343
360
|
* Root window is a special case; popups (like FXTooltip) can be created
|
344
361
|
* without an "owner" by passing FXApp as the first argument to their
|
@@ -346,13 +363,13 @@ void FXRbApp::markfunc(FXApp *self){
|
|
346
363
|
* So unless we invoke FXRbRootWindow's mark function here, unowned windows
|
347
364
|
* like tooltips may get garbage-collected prematurely.
|
348
365
|
*/
|
349
|
-
if(self->getRootWindow()){
|
350
|
-
FXRbGcMark(self->getRootWindow());
|
351
|
-
FXRbRootWindow::markfunc(self->getRootWindow());
|
366
|
+
if(self->FXApp::getRootWindow()){
|
367
|
+
FXRbGcMark(self->FXApp::getRootWindow());
|
368
|
+
FXRbRootWindow::markfunc(self->FXApp::getRootWindow());
|
352
369
|
}
|
353
|
-
|
370
|
+
|
354
371
|
// Registry
|
355
|
-
FXRbGcMark(&(self->reg()));
|
372
|
+
FXRbGcMark(&(self->FXApp::reg()));
|
356
373
|
|
357
374
|
// Timers, chores and signals are recycled and should never be destroyed
|
358
375
|
}
|
@@ -377,19 +394,19 @@ void FXRbMainWindow::markfunc(FXMainWindow* obj){
|
|
377
394
|
void FXRbTreeItem::markfunc(FXTreeItem* self){
|
378
395
|
FXRbObject::markfunc(self);
|
379
396
|
if(self){
|
380
|
-
FXRbGcMark(self->getParent());
|
381
|
-
FXRbGcMark(self->getNext());
|
382
|
-
FXRbGcMark(self->getPrev());
|
383
|
-
for(FXTreeItem* item=self->getFirst(); item; item=item->getNext()){
|
397
|
+
FXRbGcMark(self->FXTreeItem::getParent());
|
398
|
+
FXRbGcMark(self->FXTreeItem::getNext());
|
399
|
+
FXRbGcMark(self->FXTreeItem::getPrev());
|
400
|
+
for(FXTreeItem* item=self->FXTreeItem::getFirst(); item; item=item->FXTreeItem::getNext()){
|
384
401
|
FXRbGcMark(item);
|
385
402
|
FXRbTreeItem::markfunc(item);
|
386
403
|
}
|
387
|
-
FXRbGcMark(self->getBelow());
|
388
|
-
FXRbGcMark(self->getAbove());
|
389
|
-
FXRbGcMark(self->getOpenIcon());
|
390
|
-
FXRbGcMark(self->getClosedIcon());
|
391
|
-
if(self->getData())
|
392
|
-
MARK(
|
404
|
+
FXRbGcMark(self->FXTreeItem::getBelow());
|
405
|
+
FXRbGcMark(self->FXTreeItem::getAbove());
|
406
|
+
FXRbGcMark(self->FXTreeItem::getOpenIcon());
|
407
|
+
FXRbGcMark(self->FXTreeItem::getClosedIcon());
|
408
|
+
if(void *d=self->FXTreeItem::getData())
|
409
|
+
MARK(d);
|
393
410
|
}
|
394
411
|
}
|
395
412
|
|
@@ -411,7 +428,7 @@ void FXRbTreeItem::freefunc(FXTreeItem* self){
|
|
411
428
|
treeListBox->removeItem(self);
|
412
429
|
}
|
413
430
|
}
|
414
|
-
|
431
|
+
}
|
415
432
|
}
|
416
433
|
FXRbUnregisterRubyObj(self);
|
417
434
|
}
|
@@ -421,11 +438,11 @@ void FXRbTreeItem::freefunc(FXTreeItem* self){
|
|
421
438
|
void FXRbTreeList::markfunc(FXTreeList* self){
|
422
439
|
FXRbScrollArea::markfunc(self);
|
423
440
|
if(self){
|
424
|
-
for(FXTreeItem* item=self->getFirstItem(); item; item=item->getNext()){
|
441
|
+
for(FXTreeItem* item=self->FXTreeList::getFirstItem(); item; item=item->FXTreeItem::getNext()){
|
425
442
|
FXRbGcMark(item);
|
426
443
|
FXRbTreeItem::markfunc(item);
|
427
444
|
}
|
428
|
-
FXRbGcMark(self->getFont());
|
445
|
+
FXRbGcMark(self->FXTreeList::getFont());
|
429
446
|
}
|
430
447
|
}
|
431
448
|
|
@@ -433,19 +450,19 @@ void FXRbTreeList::markfunc(FXTreeList* self){
|
|
433
450
|
void FXRbFoldingItem::markfunc(FXFoldingItem* self){
|
434
451
|
FXRbObject::markfunc(self);
|
435
452
|
if(self){
|
436
|
-
FXRbGcMark(self->getParent());
|
437
|
-
FXRbGcMark(self->getNext());
|
438
|
-
FXRbGcMark(self->getPrev());
|
439
|
-
for(FXFoldingItem* item=self->getFirst(); item; item=item->getNext()){
|
453
|
+
FXRbGcMark(self->FXFoldingItem::getParent());
|
454
|
+
FXRbGcMark(self->FXFoldingItem::getNext());
|
455
|
+
FXRbGcMark(self->FXFoldingItem::getPrev());
|
456
|
+
for(FXFoldingItem* item=self->FXFoldingItem::getFirst(); item; item=item->FXFoldingItem::getNext()){
|
440
457
|
FXRbGcMark(item);
|
441
458
|
FXRbFoldingItem::markfunc(item);
|
442
459
|
}
|
443
|
-
FXRbGcMark(self->getBelow());
|
444
|
-
FXRbGcMark(self->getAbove());
|
445
|
-
FXRbGcMark(self->getOpenIcon());
|
446
|
-
FXRbGcMark(self->getClosedIcon());
|
447
|
-
if(self->getData())
|
448
|
-
MARK(
|
460
|
+
FXRbGcMark(self->FXFoldingItem::getBelow());
|
461
|
+
FXRbGcMark(self->FXFoldingItem::getAbove());
|
462
|
+
FXRbGcMark(self->FXFoldingItem::getOpenIcon());
|
463
|
+
FXRbGcMark(self->FXFoldingItem::getClosedIcon());
|
464
|
+
if(void *d=self->FXFoldingItem::getData())
|
465
|
+
MARK(d);
|
449
466
|
}
|
450
467
|
}
|
451
468
|
|
@@ -458,11 +475,11 @@ void FXRbFoldingItem::freefunc(FXFoldingItem* self){
|
|
458
475
|
void FXRbFoldingList::markfunc(FXFoldingList* self){
|
459
476
|
FXRbScrollArea::markfunc(self);
|
460
477
|
if(self){
|
461
|
-
for(FXFoldingItem* item=self->getFirstItem(); item; item=item->getNext()){
|
478
|
+
for(FXFoldingItem* item=self->FXFoldingList::getFirstItem(); item; item=item->FXFoldingItem::getNext()){
|
462
479
|
FXRbGcMark(item);
|
463
480
|
FXRbFoldingItem::markfunc(item);
|
464
481
|
}
|
465
|
-
FXRbGcMark(self->getFont());
|
482
|
+
FXRbGcMark(self->FXFoldingList::getFont());
|
466
483
|
}
|
467
484
|
}
|
468
485
|
|
@@ -470,9 +487,9 @@ void FXRbFoldingList::markfunc(FXFoldingList* self){
|
|
470
487
|
void FXRbListItem::markfunc(FXListItem* self){
|
471
488
|
FXRbObject::markfunc(self);
|
472
489
|
if(self){
|
473
|
-
FXRbGcMark(self->getIcon());
|
474
|
-
if(self->getData())
|
475
|
-
MARK(
|
490
|
+
FXRbGcMark(self->FXListItem::getIcon());
|
491
|
+
if(void *d=self->FXListItem::getData())
|
492
|
+
MARK(d);
|
476
493
|
}
|
477
494
|
}
|
478
495
|
|
@@ -495,14 +512,12 @@ void FXRbColorItem::freefunc(FXColorItem* self){
|
|
495
512
|
void FXRbList::markfunc(FXList* self){
|
496
513
|
FXRbScrollArea::markfunc(self);
|
497
514
|
if(self){
|
498
|
-
for(FXint i=0;i<self->getNumItems();i++){
|
499
|
-
FXListItem* item=self->getItem(i);
|
515
|
+
for(FXint i=0;i<self->FXList::getNumItems();i++){
|
516
|
+
FXListItem* item=self->FXList::getItem(i);
|
500
517
|
FXRbGcMark(item);
|
501
518
|
FXRbListItem::markfunc(item);
|
502
|
-
if(self->getItemData(i))
|
503
|
-
MARK(self->getItemData(i));
|
504
519
|
}
|
505
|
-
FXRbGcMark(self->getFont());
|
520
|
+
FXRbGcMark(self->FXList::getFont());
|
506
521
|
}
|
507
522
|
}
|
508
523
|
|
@@ -511,13 +526,13 @@ void FXRbColorList::markfunc(FXColorList* self){
|
|
511
526
|
FXRbList::markfunc(self);
|
512
527
|
}
|
513
528
|
|
514
|
-
|
529
|
+
|
515
530
|
void FXRbTableItem::markfunc(FXTableItem* self){
|
516
531
|
FXRbObject::markfunc(self);
|
517
532
|
if(self){
|
518
|
-
FXRbGcMark(self->getIcon());
|
519
|
-
if(self->getData())
|
520
|
-
MARK(
|
533
|
+
FXRbGcMark(self->FXTableItem::getIcon());
|
534
|
+
if(void* d=self->FXTableItem::getData())
|
535
|
+
MARK(d);
|
521
536
|
}
|
522
537
|
}
|
523
538
|
|
@@ -531,16 +546,13 @@ void FXRbTable::markfunc(FXTable* self){
|
|
531
546
|
register FXTableItem* item;
|
532
547
|
FXRbScrollArea::markfunc(self);
|
533
548
|
if(self){
|
534
|
-
FXRbGcMark(self->getFont());
|
535
|
-
FXRbGcMark(self->getRowHeaderFont());
|
536
|
-
FXRbGcMark(self->getColumnHeaderFont());
|
537
|
-
for(FXint row=0;row<self->getNumRows();row++){
|
538
|
-
for(FXint col=0;col<self->getNumColumns();col++){
|
539
|
-
item=self->getItem(row,col);
|
549
|
+
FXRbGcMark(self->FXTable::getFont());
|
550
|
+
FXRbGcMark(self->FXTable::getRowHeaderFont());
|
551
|
+
FXRbGcMark(self->FXTable::getColumnHeaderFont());
|
552
|
+
for(FXint row=0;row<self->FXTable::getNumRows();row++){
|
553
|
+
for(FXint col=0;col<self->FXTable::getNumColumns();col++){
|
554
|
+
item=self->FXTable::getItem(row,col);
|
540
555
|
FXRbGcMark(item);
|
541
|
-
FXRbGcMark(self->getItemIcon(row,col));
|
542
|
-
if(self->getItemData(row,col))
|
543
|
-
MARK(self->getItemData(row,col));
|
544
556
|
}
|
545
557
|
}
|
546
558
|
}
|
@@ -550,9 +562,9 @@ void FXRbTable::markfunc(FXTable* self){
|
|
550
562
|
void FXRbHeaderItem::markfunc(FXHeaderItem* self){
|
551
563
|
FXRbObject::markfunc(self);
|
552
564
|
if(self){
|
553
|
-
FXRbGcMark(self->getIcon());
|
554
|
-
if(self->getData())
|
555
|
-
MARK(
|
565
|
+
FXRbGcMark(self->FXHeaderItem::getIcon());
|
566
|
+
if(void* d=self->FXHeaderItem::getData())
|
567
|
+
MARK(d);
|
556
568
|
}
|
557
569
|
}
|
558
570
|
|
@@ -565,14 +577,12 @@ void FXRbHeaderItem::freefunc(FXHeaderItem* self){
|
|
565
577
|
void FXRbHeader::markfunc(FXHeader* self){
|
566
578
|
FXRbFrame::markfunc(self);
|
567
579
|
if(self){
|
568
|
-
for(FXint i=0;i<self->getNumItems();i++){
|
569
|
-
FXHeaderItem* item=self->getItem(i);
|
580
|
+
for(FXint i=0;i<self->FXHeader::getNumItems();i++){
|
581
|
+
FXHeaderItem* item=self->FXHeader::getItem(i);
|
570
582
|
FXRbGcMark(item);
|
571
583
|
FXRbHeaderItem::markfunc(item);
|
572
|
-
if(item->getData())
|
573
|
-
MARK(item->getData());
|
574
584
|
}
|
575
|
-
FXRbGcMark(self->getFont());
|
585
|
+
FXRbGcMark(self->FXHeader::getFont());
|
576
586
|
}
|
577
587
|
}
|
578
588
|
|
@@ -580,10 +590,10 @@ void FXRbHeader::markfunc(FXHeader* self){
|
|
580
590
|
void FXRbIconItem::markfunc(FXIconItem* self){
|
581
591
|
FXRbObject::markfunc(self);
|
582
592
|
if(self){
|
583
|
-
FXRbGcMark(self->getBigIcon());
|
584
|
-
FXRbGcMark(self->getMiniIcon());
|
585
|
-
if(self->getData())
|
586
|
-
MARK(
|
593
|
+
FXRbGcMark(self->FXIconItem::getBigIcon());
|
594
|
+
FXRbGcMark(self->FXIconItem::getMiniIcon());
|
595
|
+
if(void *d=self->FXIconItem::getData())
|
596
|
+
MARK(d);
|
587
597
|
}
|
588
598
|
}
|
589
599
|
|
@@ -596,15 +606,13 @@ void FXRbIconItem::freefunc(FXIconItem* self){
|
|
596
606
|
void FXRbIconList::markfunc(FXIconList* self){
|
597
607
|
FXRbScrollArea::markfunc(self);
|
598
608
|
if(self){
|
599
|
-
FXRbGcMark(self->getHeader());
|
600
|
-
for(FXint i=0;i<self->getNumItems();i++){
|
601
|
-
FXIconItem* item=self->getItem(i);
|
609
|
+
FXRbGcMark(self->FXIconList::getHeader());
|
610
|
+
for(FXint i=0;i<self->FXIconList::getNumItems();i++){
|
611
|
+
FXIconItem* item=self->FXIconList::getItem(i);
|
602
612
|
FXRbGcMark(item);
|
603
613
|
FXRbIconItem::markfunc(item);
|
604
|
-
if(self->getItemData(i))
|
605
|
-
MARK(self->getItemData(i));
|
606
614
|
}
|
607
|
-
FXRbGcMark(self->getFont());
|
615
|
+
FXRbGcMark(self->FXIconList::getFont());
|
608
616
|
}
|
609
617
|
}
|
610
618
|
|
@@ -612,7 +620,7 @@ void FXRbIconList::markfunc(FXIconList* self){
|
|
612
620
|
void FXRbDelegator::markfunc(FXDelegator* self){
|
613
621
|
FXRbObject::markfunc(self);
|
614
622
|
if(self){
|
615
|
-
FXRbGcMark(self->getDelegate());
|
623
|
+
FXRbGcMark(self->FXDelegator::getDelegate());
|
616
624
|
}
|
617
625
|
}
|
618
626
|
|
@@ -645,7 +653,7 @@ void FXRbStringDict::markfunc(FXStringDict* self){
|
|
645
653
|
void FXRbRecentFiles::markfunc(FXRecentFiles* self){
|
646
654
|
FXRbObject::markfunc(self);
|
647
655
|
if(self){
|
648
|
-
FXRbGcMark(self->getTarget());
|
656
|
+
FXRbGcMark(self->FXRecentFiles::getTarget());
|
649
657
|
}
|
650
658
|
}
|
651
659
|
|
@@ -653,8 +661,8 @@ void FXRbRecentFiles::markfunc(FXRecentFiles* self){
|
|
653
661
|
void FXRbScrollArea::markfunc(FXScrollArea* self){
|
654
662
|
FXRbComposite::markfunc(self);
|
655
663
|
if(self){
|
656
|
-
FXRbGcMark(self->horizontalScrollBar());
|
657
|
-
FXRbGcMark(self->verticalScrollBar());
|
664
|
+
FXRbGcMark(self->FXScrollArea::horizontalScrollBar());
|
665
|
+
FXRbGcMark(self->FXScrollArea::verticalScrollBar());
|
658
666
|
}
|
659
667
|
}
|
660
668
|
|
@@ -667,7 +675,7 @@ void FXRbDocument::markfunc(FXDocument* self){
|
|
667
675
|
void FXRbGLContext::markfunc(FXGLContext* self){
|
668
676
|
FXRbObject::markfunc(self);
|
669
677
|
if(self){
|
670
|
-
FXRbGcMark(self->getVisual());
|
678
|
+
FXRbGcMark(self->FXGLContext::getVisual());
|
671
679
|
}
|
672
680
|
}
|
673
681
|
|
@@ -690,15 +698,15 @@ void FXRbFont::freefunc(FXFont *self){
|
|
690
698
|
void FXRbIconDict::markfunc(FXIconDict* self){
|
691
699
|
FXRbDict::markfunc(self);
|
692
700
|
if(self){
|
693
|
-
FXRbGcMark(self->getIconSource());
|
694
|
-
if(self->no()>0){
|
695
|
-
FXint pos=self->first();
|
696
|
-
FXint last=self->last();
|
701
|
+
FXRbGcMark(self->FXIconDict::getIconSource());
|
702
|
+
if(self->FXIconDict::no()>0){
|
703
|
+
FXint pos=self->FXIconDict::first();
|
704
|
+
FXint last=self->FXIconDict::last();
|
697
705
|
while(pos<=last){
|
698
|
-
const FXchar* name=self->key(pos);
|
699
|
-
FXIcon* icon=self->find(name);
|
706
|
+
const FXchar* name=self->FXIconDict::key(pos);
|
707
|
+
FXIcon* icon=self->FXIconDict::find(name);
|
700
708
|
FXRbGcMark(icon);
|
701
|
-
pos=self->next(pos);
|
709
|
+
pos=self->FXIconDict::next(pos);
|
702
710
|
}
|
703
711
|
}
|
704
712
|
}
|
@@ -707,16 +715,16 @@ void FXRbIconDict::markfunc(FXIconDict* self){
|
|
707
715
|
|
708
716
|
void FXRbFileDict::markfunc(FXFileDict* self){
|
709
717
|
FXRbDict::markfunc(self);
|
710
|
-
FXRbGcMark(self->getSettings());
|
718
|
+
FXRbGcMark(self->FXFileDict::getSettings());
|
711
719
|
if(self){
|
712
|
-
if(self->no()>0){
|
713
|
-
FXint pos=self->first();
|
714
|
-
FXint last=self->last();
|
720
|
+
if(self->FXFileDict::no()>0){
|
721
|
+
FXint pos=self->FXFileDict::first();
|
722
|
+
FXint last=self->FXFileDict::last();
|
715
723
|
while(pos<=last){
|
716
|
-
const FXchar* key=self->key(pos);
|
717
|
-
FXFileAssoc* assoc=self->find(key);
|
724
|
+
const FXchar* key=self->FXFileDict::key(pos);
|
725
|
+
FXFileAssoc* assoc=self->FXFileDict::find(key);
|
718
726
|
FXRbGcMark(assoc);
|
719
|
-
pos=self->next(pos);
|
727
|
+
pos=self->FXFileDict::next(pos);
|
720
728
|
}
|
721
729
|
}
|
722
730
|
}
|
@@ -739,7 +747,7 @@ void FXRbDirItem::markfunc(FXDirItem* self){
|
|
739
747
|
FXTRACE((100,"FXRbDirItem::markfunc() %p\n",self));
|
740
748
|
FXRbTreeItem::markfunc(self);
|
741
749
|
if(self){
|
742
|
-
FXRbGcMark(self->getAssoc());
|
750
|
+
FXRbGcMark(self->FXDirItem::getAssoc());
|
743
751
|
}
|
744
752
|
}
|
745
753
|
|
@@ -752,7 +760,7 @@ void FXRbDirList::markfunc(FXDirList* self){
|
|
752
760
|
FXTRACE((100,"FXRbDirList::markfunc() %p\n",self));
|
753
761
|
FXRbTreeList::markfunc(self);
|
754
762
|
if(self){
|
755
|
-
FXRbGcMark(self->getAssociations());
|
763
|
+
FXRbGcMark(self->FXDirList::getAssociations());
|
756
764
|
}
|
757
765
|
}
|
758
766
|
|
@@ -761,10 +769,10 @@ void FXRb4Splitter::markfunc(FX4Splitter* self){
|
|
761
769
|
FXTRACE((100,"FXRb4Splitter::markfunc() %p\n",self));
|
762
770
|
FXRbComposite::markfunc(self);
|
763
771
|
if(self){
|
764
|
-
FXRbGcMark(self->getTopLeft());
|
765
|
-
FXRbGcMark(self->getTopRight());
|
766
|
-
FXRbGcMark(self->getBottomLeft());
|
767
|
-
FXRbGcMark(self->getBottomRight());
|
772
|
+
FXRbGcMark(self->FX4Splitter::getTopLeft());
|
773
|
+
FXRbGcMark(self->FX4Splitter::getTopRight());
|
774
|
+
FXRbGcMark(self->FX4Splitter::getBottomLeft());
|
775
|
+
FXRbGcMark(self->FX4Splitter::getBottomRight());
|
768
776
|
}
|
769
777
|
}
|
770
778
|
|
@@ -773,7 +781,7 @@ void FXRbFileItem::markfunc(FXFileItem* self){
|
|
773
781
|
FXTRACE((100,"FXRbFileItem::markfunc() %p\n",self));
|
774
782
|
FXRbIconItem::markfunc(self);
|
775
783
|
if(self){
|
776
|
-
FXRbGcMark(self->getAssoc());
|
784
|
+
FXRbGcMark(self->FXFileItem::getAssoc());
|
777
785
|
}
|
778
786
|
}
|
779
787
|
|
@@ -787,9 +795,9 @@ void FXRbFileList::markfunc(FXFileList* self){
|
|
787
795
|
FXTRACE((100,"FXRbFileList::markfunc() %p\n",self));
|
788
796
|
FXRbIconList::markfunc(self);
|
789
797
|
if(self){
|
790
|
-
FXRbGcMark(self->getAssociations());
|
791
|
-
for(FXint i=0;i<self->getNumItems();i++){
|
792
|
-
FXFileAssoc* assoc=self->getItemAssoc(i);
|
798
|
+
FXRbGcMark(self->FXFileList::getAssociations());
|
799
|
+
for(FXint i=0;i<self->FXFileList::getNumItems();i++){
|
800
|
+
FXFileAssoc* assoc=self->FXFileList::getItemAssoc(i);
|
793
801
|
FXRbGcMark(assoc);
|
794
802
|
}
|
795
803
|
}
|
@@ -812,8 +820,8 @@ void FXRbDirSelector::markfunc(FXDirSelector* self){
|
|
812
820
|
FXTRACE((100,"FXRbDirSelector::markfunc() %p\n",self));
|
813
821
|
FXRbPacker::markfunc(self);
|
814
822
|
if(self){
|
815
|
-
FXRbGcMark(self->acceptButton());
|
816
|
-
FXRbGcMark(self->cancelButton());
|
823
|
+
FXRbGcMark(self->FXDirSelector::acceptButton());
|
824
|
+
FXRbGcMark(self->FXDirSelector::cancelButton());
|
817
825
|
}
|
818
826
|
}
|
819
827
|
|
@@ -822,8 +830,8 @@ void FXRbFileSelector::markfunc(FXFileSelector* self){
|
|
822
830
|
FXTRACE((100,"FXRbFileSelector::markfunc() %p\n",self));
|
823
831
|
FXRbPacker::markfunc(self);
|
824
832
|
if(self){
|
825
|
-
FXRbGcMark(self->acceptButton());
|
826
|
-
FXRbGcMark(self->cancelButton());
|
833
|
+
FXRbGcMark(self->FXFileSelector::acceptButton());
|
834
|
+
FXRbGcMark(self->FXFileSelector::cancelButton());
|
827
835
|
}
|
828
836
|
}
|
829
837
|
|
@@ -832,8 +840,8 @@ void FXRbFontSelector::markfunc(FXFontSelector* self){
|
|
832
840
|
FXTRACE((100,"FXRbFontSelector::markfunc() %p\n",self));
|
833
841
|
FXRbPacker::markfunc(self);
|
834
842
|
if(self){
|
835
|
-
FXRbGcMark(self->acceptButton());
|
836
|
-
FXRbGcMark(self->cancelButton());
|
843
|
+
FXRbGcMark(self->FXFontSelector::acceptButton());
|
844
|
+
FXRbGcMark(self->FXFontSelector::cancelButton());
|
837
845
|
}
|
838
846
|
}
|
839
847
|
|
@@ -860,11 +868,11 @@ void FXRbListBox::markfunc(FXListBox* self){
|
|
860
868
|
FXTRACE((100,"FXRbListBox::markfunc() %p\n",self));
|
861
869
|
FXRbPacker::markfunc(self);
|
862
870
|
if(self){
|
863
|
-
FXRbGcMark(self->getFont());
|
864
|
-
for(FXint i=0;i<self->getNumItems();i++){
|
865
|
-
FXRbGcMark(self->getItemIcon(i));
|
866
|
-
if(self->getItemData(i))
|
867
|
-
MARK(self->getItemData(i));
|
871
|
+
FXRbGcMark(self->FXListBox::getFont());
|
872
|
+
for(FXint i=0;i<self->FXListBox::getNumItems();i++){
|
873
|
+
FXRbGcMark(self->FXListBox::getItemIcon(i));
|
874
|
+
if(self->FXListBox::getItemData(i))
|
875
|
+
MARK(self->FXListBox::getItemData(i));
|
868
876
|
}
|
869
877
|
}
|
870
878
|
}
|
@@ -874,8 +882,8 @@ void FXRbTreeListBox::markfunc(FXTreeListBox* self){
|
|
874
882
|
FXTRACE((100,"FXRbTreeListBox::markfunc() %p\n",self));
|
875
883
|
FXRbPacker::markfunc(self);
|
876
884
|
if(self){
|
877
|
-
FXRbGcMark(self->getFont());
|
878
|
-
for(FXTreeItem* item=self->getFirstItem();item!=0;item=item->getNext()){
|
885
|
+
FXRbGcMark(self->FXTreeListBox::getFont());
|
886
|
+
for(FXTreeItem* item=self->FXTreeListBox::getFirstItem();item!=0;item=item->FXTreeItem::getNext()){
|
879
887
|
FXRbGcMark(item);
|
880
888
|
FXRbTreeItem::markfunc(item);
|
881
889
|
}
|
@@ -887,7 +895,7 @@ void FXRbToolTip::markfunc(FXToolTip* self){
|
|
887
895
|
FXTRACE((100,"FXRbToolTip::markfunc() %p\n",self));
|
888
896
|
FXRbShell::markfunc(self);
|
889
897
|
if(self){
|
890
|
-
FXRbGcMark(self->getFont());
|
898
|
+
FXRbGcMark(self->FXToolTip::getFont());
|
891
899
|
}
|
892
900
|
}
|
893
901
|
|
@@ -938,7 +946,7 @@ void FXRbTextField::markfunc(FXTextField *self){
|
|
938
946
|
FXTRACE((100,"FXRbTextField::markfunc() %p\n",self));
|
939
947
|
FXRbFrame::markfunc(self);
|
940
948
|
if(self){
|
941
|
-
FXRbGcMark(self->getFont());
|
949
|
+
FXRbGcMark(self->FXTextField::getFont());
|
942
950
|
}
|
943
951
|
}
|
944
952
|
|
@@ -947,7 +955,7 @@ void FXRbMenuCascade::markfunc(FXMenuCascade *self){
|
|
947
955
|
FXTRACE((100,"FXRbMenuCascade::markfunc() %p\n",self));
|
948
956
|
FXRbMenuCaption::markfunc(self);
|
949
957
|
if(self){
|
950
|
-
FXRbGcMark(self->getMenu());
|
958
|
+
FXRbGcMark(self->FXMenuCascade::getMenu());
|
951
959
|
}
|
952
960
|
}
|
953
961
|
|
@@ -979,7 +987,7 @@ void FXRbProgressBar::markfunc(FXProgressBar *self){
|
|
979
987
|
FXTRACE((100,"FXRbProgressBar::markfunc() %p\n",self));
|
980
988
|
FXRbFrame::markfunc(self);
|
981
989
|
if(self){
|
982
|
-
FXRbGcMark(self->getFont());
|
990
|
+
FXRbGcMark(self->FXProgressBar::getFont());
|
983
991
|
}
|
984
992
|
}
|
985
993
|
|
@@ -988,8 +996,8 @@ void FXRbSeparator::markfunc(FXSeparator* self){
|
|
988
996
|
FXTRACE((100,"FXRbSeparator::markfunc() %p\n",self));
|
989
997
|
FXRbFrame::markfunc(self);
|
990
998
|
}
|
991
|
-
|
992
|
-
|
999
|
+
|
1000
|
+
|
993
1001
|
void FXRbHorizontalSeparator::markfunc(FXHorizontalSeparator *self){
|
994
1002
|
FXTRACE((100,"FXRbHorizontalSeparator::markfunc() %p\n",self));
|
995
1003
|
FXRbSeparator::markfunc(self);
|
@@ -1000,7 +1008,7 @@ void FXRbSpinner::markfunc(FXSpinner *self){
|
|
1000
1008
|
FXTRACE((100,"FXRbSpinner::markfunc() %p\n",self));
|
1001
1009
|
FXRbPacker::markfunc(self);
|
1002
1010
|
if(self){
|
1003
|
-
FXRbGcMark(self->getFont());
|
1011
|
+
FXRbGcMark(self->FXSpinner::getFont());
|
1004
1012
|
}
|
1005
1013
|
}
|
1006
1014
|
|
@@ -1009,7 +1017,7 @@ void FXRbRealSpinner::markfunc(FXRealSpinner *self){
|
|
1009
1017
|
FXTRACE((100,"FXRbRealSpinner::markfunc() %p\n",self));
|
1010
1018
|
FXRbPacker::markfunc(self);
|
1011
1019
|
if(self){
|
1012
|
-
FXRbGcMark(self->getFont());
|
1020
|
+
FXRbGcMark(self->FXRealSpinner::getFont());
|
1013
1021
|
}
|
1014
1022
|
}
|
1015
1023
|
|
@@ -1054,7 +1062,7 @@ void FXRbMenuButton::markfunc(FXMenuButton *self){
|
|
1054
1062
|
FXTRACE((100,"FXRbMenuButton::markfunc() %p\n",self));
|
1055
1063
|
FXRbLabel::markfunc(self);
|
1056
1064
|
if(self){
|
1057
|
-
FXRbGcMark(self->getMenu());
|
1065
|
+
FXRbGcMark(self->FXMenuButton::getMenu());
|
1058
1066
|
}
|
1059
1067
|
}
|
1060
1068
|
|
@@ -1157,8 +1165,8 @@ void FXRbGLViewer::markfunc(FXGLViewer *self){
|
|
1157
1165
|
FXTRACE((100,"FXRbGLViewer::markfunc() %p\n",self));
|
1158
1166
|
FXRbGLCanvas::markfunc(self);
|
1159
1167
|
if(self){
|
1160
|
-
FXRbGcMark(self->getScene());
|
1161
|
-
FXRbGcMark(self->getSelection());
|
1168
|
+
FXRbGcMark(self->FXGLViewer::getScene());
|
1169
|
+
FXRbGcMark(self->FXGLViewer::getSelection());
|
1162
1170
|
}
|
1163
1171
|
}
|
1164
1172
|
|
@@ -1208,8 +1216,8 @@ void FXRbStatusBar::markfunc(FXStatusBar *self){
|
|
1208
1216
|
FXTRACE((100,"FXRbStatusBar::markfunc() %p\n",self));
|
1209
1217
|
FXRbHorizontalFrame::markfunc(self);
|
1210
1218
|
if(self){
|
1211
|
-
FXRbGcMark(self->getStatusLine());
|
1212
|
-
FXRbGcMark(self->getDragCorner());
|
1219
|
+
FXRbGcMark(self->FXStatusBar::getStatusLine());
|
1220
|
+
FXRbGcMark(self->FXStatusBar::getDragCorner());
|
1213
1221
|
}
|
1214
1222
|
}
|
1215
1223
|
|
@@ -1218,10 +1226,10 @@ void FXRbMDIChild::markfunc(FXMDIChild *self){
|
|
1218
1226
|
FXTRACE((100,"FXRbMDIChild::markfunc() %p\n",self));
|
1219
1227
|
FXRbComposite::markfunc(self);
|
1220
1228
|
if(self){
|
1221
|
-
FXRbGcMark(self->contentWindow());
|
1222
|
-
FXRbGcMark(self->getIcon());
|
1223
|
-
FXRbGcMark(self->getMenu());
|
1224
|
-
FXRbGcMark(self->getFont());
|
1229
|
+
FXRbGcMark(self->FXMDIChild::contentWindow());
|
1230
|
+
FXRbGcMark(self->FXMDIChild::getIcon());
|
1231
|
+
FXRbGcMark(self->FXMDIChild::getMenu());
|
1232
|
+
FXRbGcMark(self->FXMDIChild::getFont());
|
1225
1233
|
}
|
1226
1234
|
}
|
1227
1235
|
|
@@ -1253,7 +1261,7 @@ void FXRbToggleButton::markfunc(FXToggleButton *self){
|
|
1253
1261
|
FXTRACE((100,"FXRbToggleButton::markfunc() %p\n",self));
|
1254
1262
|
FXRbLabel::markfunc(self);
|
1255
1263
|
if(self){
|
1256
|
-
FXRbGcMark(self->getAltIcon());
|
1264
|
+
FXRbGcMark(self->FXToggleButton::getAltIcon());
|
1257
1265
|
}
|
1258
1266
|
}
|
1259
1267
|
|
@@ -1262,7 +1270,7 @@ void FXRbTriStateButton::markfunc(FXTriStateButton *self){
|
|
1262
1270
|
FXTRACE((100,"FXRbTriStateButton::markfunc() %p\n",self));
|
1263
1271
|
FXRbToggleButton::markfunc(self);
|
1264
1272
|
if(self){
|
1265
|
-
FXRbGcMark(self->getMaybeIcon());
|
1273
|
+
FXRbGcMark(self->FXTriStateButton::getMaybeIcon());
|
1266
1274
|
}
|
1267
1275
|
}
|
1268
1276
|
|
@@ -1271,7 +1279,7 @@ void FXRbPopup::markfunc(FXPopup *self){
|
|
1271
1279
|
FXTRACE((100,"FXRbPopup::markfunc() %p\n",self));
|
1272
1280
|
FXRbShell::markfunc(self);
|
1273
1281
|
if(self){
|
1274
|
-
FXRbGcMark(self->getGrabOwner());
|
1282
|
+
FXRbGcMark(self->FXPopup::getGrabOwner());
|
1275
1283
|
}
|
1276
1284
|
}
|
1277
1285
|
|
@@ -1280,8 +1288,8 @@ void FXRbOptionMenu::markfunc(FXOptionMenu *self){
|
|
1280
1288
|
FXTRACE((100,"FXRbOptionMenu::markfunc() %p\n",self));
|
1281
1289
|
FXRbLabel::markfunc(self);
|
1282
1290
|
if(self){
|
1283
|
-
FXRbGcMark(self->getCurrent());
|
1284
|
-
FXRbGcMark(self->getMenu());
|
1291
|
+
FXRbGcMark(self->FXOptionMenu::getCurrent());
|
1292
|
+
FXRbGcMark(self->FXOptionMenu::getMenu());
|
1285
1293
|
}
|
1286
1294
|
}
|
1287
1295
|
|
@@ -1296,8 +1304,8 @@ void FXRbToolBar::markfunc(FXToolBar *self){
|
|
1296
1304
|
FXTRACE((100,"FXRbToolBar::markfunc() %p\n",self));
|
1297
1305
|
FXRbPacker::markfunc(self);
|
1298
1306
|
if(self){
|
1299
|
-
FXRbGcMark(self->getDryDock());
|
1300
|
-
FXRbGcMark(self->getWetDock());
|
1307
|
+
FXRbGcMark(self->FXToolBar::getDryDock());
|
1308
|
+
FXRbGcMark(self->FXToolBar::getWetDock());
|
1301
1309
|
}
|
1302
1310
|
}
|
1303
1311
|
|
@@ -1329,7 +1337,7 @@ void FXRbScrollWindow::markfunc(FXScrollWindow *self){
|
|
1329
1337
|
FXTRACE((100,"FXRbScrollWindow::markfunc() %p\n",self));
|
1330
1338
|
FXRbScrollArea::markfunc(self);
|
1331
1339
|
if(self){
|
1332
|
-
FXRbGcMark(self->contentWindow());
|
1340
|
+
FXRbGcMark(self->FXScrollWindow::contentWindow());
|
1333
1341
|
}
|
1334
1342
|
}
|
1335
1343
|
|
@@ -1338,7 +1346,7 @@ void FXRbText::markfunc(FXText *self){
|
|
1338
1346
|
FXTRACE((100,"FXRbText::markfunc() %p\n",self));
|
1339
1347
|
FXRbScrollArea::markfunc(self);
|
1340
1348
|
if(self){
|
1341
|
-
FXRbGcMark(self->getFont());
|
1349
|
+
FXRbGcMark(self->FXText::getFont());
|
1342
1350
|
}
|
1343
1351
|
}
|
1344
1352
|
|
@@ -1352,7 +1360,7 @@ void FXRbSplashWindow::markfunc(FXSplashWindow *self){
|
|
1352
1360
|
FXTRACE((100,"FXRbSplashWindow::markfunc() %p\n",self));
|
1353
1361
|
FXRbTopWindow::markfunc(self);
|
1354
1362
|
if(self){
|
1355
|
-
FXRbGcMark(self->getIcon());
|
1363
|
+
FXRbGcMark(self->FXSplashWindow::getIcon());
|
1356
1364
|
}
|
1357
1365
|
}
|
1358
1366
|
|
@@ -1372,7 +1380,7 @@ void FXRbMenuTitle::markfunc(FXMenuTitle *self){
|
|
1372
1380
|
FXTRACE((100,"FXRbMenuTitle::markfunc() %p\n",self));
|
1373
1381
|
FXRbMenuCaption::markfunc(self);
|
1374
1382
|
if(self){
|
1375
|
-
FXRbGcMark(self->getMenu());
|
1383
|
+
FXRbGcMark(self->FXMenuTitle::getMenu());
|
1376
1384
|
}
|
1377
1385
|
}
|
1378
1386
|
|
@@ -1390,7 +1398,7 @@ void FXRbBitmapView::markfunc(FXBitmapView *self){
|
|
1390
1398
|
void FXRbImageView::markfunc(FXImageView *self){
|
1391
1399
|
FXRbScrollArea::markfunc(self);
|
1392
1400
|
if(self){
|
1393
|
-
FXRbGcMark(self->getImage());
|
1401
|
+
FXRbGcMark(self->FXImageView::getImage());
|
1394
1402
|
}
|
1395
1403
|
}
|
1396
1404
|
|
@@ -1398,8 +1406,8 @@ void FXRbImageView::markfunc(FXImageView *self){
|
|
1398
1406
|
void FXRbShutterItem::markfunc(FXShutterItem *self){
|
1399
1407
|
FXRbVerticalFrame::markfunc(self);
|
1400
1408
|
if(self){
|
1401
|
-
FXRbGcMark(self->getButton());
|
1402
|
-
FXRbGcMark(self->getContent());
|
1409
|
+
FXRbGcMark(self->FXShutterItem::getButton());
|
1410
|
+
FXRbGcMark(self->FXShutterItem::getContent());
|
1403
1411
|
}
|
1404
1412
|
}
|
1405
1413
|
|
@@ -1414,8 +1422,8 @@ void FXRbMenuCaption::markfunc(FXMenuCaption *self){
|
|
1414
1422
|
FXTRACE((100,"FXRbMenuCaption::markfunc() %p\n",self));
|
1415
1423
|
FXRbWindow::markfunc(self);
|
1416
1424
|
if(self){
|
1417
|
-
FXRbGcMark(self->getFont());
|
1418
|
-
FXRbGcMark(self->getIcon());
|
1425
|
+
FXRbGcMark(self->FXMenuCaption::getFont());
|
1426
|
+
FXRbGcMark(self->FXMenuCaption::getIcon());
|
1419
1427
|
}
|
1420
1428
|
}
|
1421
1429
|
|
@@ -1430,7 +1438,7 @@ void FXRbStatusLine::markfunc(FXStatusLine *self){
|
|
1430
1438
|
FXTRACE((100,"FXRbStatusLine::markfunc() %p\n",self));
|
1431
1439
|
FXRbFrame::markfunc(self);
|
1432
1440
|
if(self){
|
1433
|
-
FXRbGcMark(self->getFont());
|
1441
|
+
FXRbGcMark(self->FXStatusLine::getFont());
|
1434
1442
|
}
|
1435
1443
|
}
|
1436
1444
|
|
@@ -1480,7 +1488,7 @@ void FXRbScrollBar::markfunc(FXScrollBar *self){
|
|
1480
1488
|
void FXRbStream::markfunc(FXStream *self){
|
1481
1489
|
FXTRACE((100,"FXRbStream::markfunc() %p\n",self));
|
1482
1490
|
if(self){
|
1483
|
-
FXRbGcMark((void*)self->container());
|
1491
|
+
FXRbGcMark((void*)self->FXStream::container());
|
1484
1492
|
}
|
1485
1493
|
}
|
1486
1494
|
|
@@ -1572,7 +1580,7 @@ void FXRbBitmapFrame::markfunc(FXBitmapFrame* self){
|
|
1572
1580
|
FXTRACE((100,"start FXRbBitmapFrame::markfunc(%p)\n",self));
|
1573
1581
|
FXRbFrame::markfunc(self);
|
1574
1582
|
if(self!=0){
|
1575
|
-
FXRbGcMark(self->getBitmap());
|
1583
|
+
FXRbGcMark(self->FXBitmapFrame::getBitmap());
|
1576
1584
|
}
|
1577
1585
|
FXTRACE((100,"end FXRbBitmapFrame::markfunc(%p)\n",self));
|
1578
1586
|
}
|
@@ -1582,7 +1590,7 @@ void FXRbImageFrame::markfunc(FXImageFrame* self){
|
|
1582
1590
|
FXTRACE((100,"start FXRbImageFrame::markfunc(%p)\n",self));
|
1583
1591
|
FXRbFrame::markfunc(self);
|
1584
1592
|
if(self!=0){
|
1585
|
-
FXRbGcMark(self->getImage());
|
1593
|
+
FXRbGcMark(self->FXImageFrame::getImage());
|
1586
1594
|
}
|
1587
1595
|
FXTRACE((100,"end FXRbImageFrame::markfunc(%p)\n",self));
|
1588
1596
|
}
|
@@ -1607,12 +1615,12 @@ void FXRbWizard::markfunc(FXWizard* self){
|
|
1607
1615
|
FXTRACE((100,"FXRbWizard::markfunc() %p\n",self));
|
1608
1616
|
FXRbDialogBox::markfunc(self);
|
1609
1617
|
if(self){
|
1610
|
-
FXRbGcMark(self->advanceButton());
|
1611
|
-
FXRbGcMark(self->retreatButton());
|
1612
|
-
FXRbGcMark(self->finishButton());
|
1613
|
-
FXRbGcMark(self->cancelButton());
|
1614
|
-
FXRbGcMark(self->getContainer());
|
1615
|
-
FXRbGcMark(self->getImage());
|
1618
|
+
FXRbGcMark(self->FXWizard::advanceButton());
|
1619
|
+
FXRbGcMark(self->FXWizard::retreatButton());
|
1620
|
+
FXRbGcMark(self->FXWizard::finishButton());
|
1621
|
+
FXRbGcMark(self->FXWizard::cancelButton());
|
1622
|
+
FXRbGcMark(self->FXWizard::getContainer());
|
1623
|
+
FXRbGcMark(self->FXWizard::getImage());
|
1616
1624
|
}
|
1617
1625
|
}
|
1618
1626
|
|
@@ -1621,7 +1629,7 @@ void FXRbRuler::markfunc(FXRuler* self){
|
|
1621
1629
|
FXTRACE((100,"FXRbRuler::markfunc() %p\n",self));
|
1622
1630
|
FXRbFrame::markfunc(self);
|
1623
1631
|
if(self){
|
1624
|
-
FXRbGcMark(self->getFont());
|
1632
|
+
FXRbGcMark(self->FXRuler::getFont());
|
1625
1633
|
}
|
1626
1634
|
}
|
1627
1635
|
|
@@ -1630,14 +1638,14 @@ void FXRbRulerView::markfunc(FXRulerView* self){
|
|
1630
1638
|
FXTRACE((100,"FXRbRulerView::markfunc() %p\n",self));
|
1631
1639
|
FXRbScrollArea::markfunc(self);
|
1632
1640
|
if(self){
|
1633
|
-
FXRbGcMark(self->horizontalRuler());
|
1634
|
-
FXRbGcMark(self->verticalRuler());
|
1635
|
-
FXRbGcMark(self->getHRulerFont());
|
1636
|
-
FXRbGcMark(self->getVRulerFont());
|
1641
|
+
FXRbGcMark(self->FXRulerView::horizontalRuler());
|
1642
|
+
FXRbGcMark(self->FXRulerView::verticalRuler());
|
1643
|
+
FXRbGcMark(self->FXRulerView::getHRulerFont());
|
1644
|
+
FXRbGcMark(self->FXRulerView::getVRulerFont());
|
1637
1645
|
}
|
1638
1646
|
}
|
1639
1647
|
|
1640
|
-
|
1648
|
+
|
1641
1649
|
void FXRbPPMIcon::markfunc(FXPPMIcon* self){
|
1642
1650
|
FXTRACE((100,"FXRbPPMIcon::markfunc() %p\n",self));
|
1643
1651
|
FXRbIcon::markfunc(self);
|