Changeset 80

Show
Ignore:
Timestamp:
08/10/06 14:15:00 (2 years ago)
Author:
Gregor
Message:

bcd.gen/bcd/gen/bcdgen.d: On further thought, it's better NOT to delete out.xml, for all use.

bcd.gen/scripts/fltk2.sh: New and improved ... a lot.

bindings/bcd/fltk2/*: Wow, bcd.gen supports so much more of fltk2 now ...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/bcd.gen/bcd/gen/bcdgen.d

    r79 r80  
    291291    } 
    292292    std.file.remove("out.i"); 
    293     std.file.remove("out.xml"); 
     293    //std.file.remove("out.xml"); 
    294294     
    295295    return 0; 

  • trunk/bcd.gen/scripts/fltk2.sh

    r79 r80  
    22export CXXFLAGS="$CXXFLAGS `fltk2-config --cxxflags`" 
    33 
    4 rm -rf bcd/fltk2 
     4#rm -rf bcd/fltk2 
    55 
    66# Unsupported: 
    7 # AlignGroup (align is a keyword in D) 
    8 # filename, dirent (totally different from the handling in D, has major collisions) 
    97# error (variadic functions) 
    10 # FileBrowser, file_chooser, FileChooser (see filename, dirent) 
    11 # HelpView, HelpDialog (array support isn't stable yet) 
    12 # LabelType (array support isn't stable yet) 
    13 # Preferences (variatic functions) 
    14 # TextDisplay (not sure why this doesn't work :( ) 
     8# filename, dirent, FileBrowser, FileInput, FileChooser (untranslated dirent stuff) 
    159 
    16 for i in \ 
    17 FL_API Flags Color Style Rectangle Widget Valuator Adjuster \ 
    18 Group BarGroup \ 
    19 PixelType Symbol Box \ 
    20 Slider Scrollbar Menu Browser \ 
    21 Button \ 
    22 CheckButton \ 
    23 Choice \ 
    24 Clock \ 
    25 ColorChooser \ 
    26 Input ComboBox \ 
    27 Cursor \ 
    28 CycleButton \ 
    29 damage \ 
    30 Dial \ 
    31 Divider \ 
    32 Window DoubleBufferWindow \ 
    33 draw \ 
    34 events \ 
    35 FileIcon \ 
    36 FileInput \ 
    37 FillDial \ 
    38 FillSlider \ 
    39 NumericInput FloatInput \ 
    40 FL_VERSION \ 
    41 Font \ 
    42 HighlightButton \ 
    43 types Image \ 
    44 InputBrowser \ 
    45 IntInput \ 
    46 InvisibleBox \ 
    47 ItemGroup \ 
    48 Item \ 
    49 layout \ 
    50 LightButton \ 
    51 LineDial \ 
    52 load_plugin \ 
    53 math \ 
    54 MenuBar \ 
    55 PopupMenu MenuBuild \ 
    56 MenuWindow \ 
    57 Monitor \ 
    58 MultiBrowser \ 
    59 MultiImage \ 
    60 MultiLineInput \ 
    61 Output MultiLineOutput \ 
    62 PackedGroup \ 
    63 ProgressBar \ 
    64 RadioButton \ 
    65 RadioItem \ 
    66 RadioLightButton \ 
    67 RepeatButton \ 
    68 ReturnButton \ 
    69 run \ 
    70 ScrollGroup \ 
    71 SecretInput \ 
    72 SharedImage \ 
    73 show_colormap \ 
    74 StringList \ 
    75 StyleSet \ 
    76 TabGroup \ 
    77 TextBuffer \ 
    78 ThumbWheel \ 
    79 TiledGroup \ 
    80 TiledImage \ 
    81 ToggleButton \ 
    82 Tooltip \ 
    83 utf \ 
    84 ValueInput \ 
    85 visual \ 
    86 WordwrapInput \ 
    87 WordwrapOutput 
     10for i in Adjuster AlignGroup ask BarGroup Box Browser Button CheckButton Choice Clock ColorChooser Color ComboBox Cursor CycleButton damage Dial Divider DoubleBufferWindow draw events file_chooser FileIcon FillDial FillSlider Flags FL_API FloatInput fltk_cairo FL_VERSION Font gl glut GlWindow Group HelpDialog HelpView HighlightButton Image InputBrowser Input IntInput InvisibleBox ItemGroup Item LabelType layout LightButton LineDial load_plugin math MenuBar MenuBuild Menu MenuWindow Monitor MultiBrowser MultiImage MultiLineInput MultiLineOutput NumericInput Output PackedGroup PixelType pnmImage PopupMenu Preferences ProgressBar RadioButton RadioItem RadioLightButton Rectangle RepeatButton ReturnButton rgbImage run Scrollbar ScrollGroup SecretInput ShapedWindow SharedImage show_colormap Slider StatusBarGroup string StringList Style StyleSet Symbol SystemMenuBar TabGroup TextBuffer TextDisplay TextEditor ThumbWheel TiledGroup TiledImage ToggleButton Tooltip types utf Valuator ValueInput ValueOutput ValueSlider visual Widget Window WizardGroup WordwrapInput WordwrapOutput xbmImage xpmImage 
    8811do 
    8912        echo $i 
    9013         
    91         ./bcdgen $1/${i}.h fltk2 -Ifltk/ \ 
    92           -N"fltk::Symbol::Symbol(char const*)" \ 
     14        ./bcdgen $1/${i}.h fltk2 -Ifltk/ -r \ 
     15          -N"fltk::GlutWindow::menu" \ 
     16          -N"fltk::HelpTarget::name" \ 
     17          -N"fltk::HelpLink::filename" \ 
     18          -N"fltk::HelpLink::name" \ 
     19          -N"fltk::HelpBlock::line" \ 
     20          -N"fltk::image_filetypes" \ 
     21          -N"fltk::Scrollbar::value()" \ 
     22          -N"fltk::Scrollbar::value(int, int, int, int)" \ 
     23          -N"fltk::Browser::focus_index() const" \ 
     24          -N"fltk::Browser::value() const" \ 
     25          -N"fltk::Browser::value(int)" \ 
    9326          -N"fltk::ColorChooser::h() const" \ 
    9427          -N"fltk::ColorChooser::r() const" \ 
    9528          -N"fltk::ColorChooser::b() const" \ 
    96           -N"fltk::Widget::position(int, int)" \ 
    97           -N"fltk::FileInput::text(char const*)" \ 
    98           -N"fltk::FileInput::text(char const*, int)" \ 
    99           -N"fltk::Widget::type() const" \ 
    100           -N"fltk::Scrollbar::value()" \ 
    101           -N"fltk::Browser::focus_index() const" \ 
    102           -N"fltk::Browser::value(int)" \ 
    103           -N"fltk::Image::Image(char const*)" \ 
    104           -N"fltk::Image::Image(int, int, char const*, char const* const*)" \ 
    105           \ 
    106           -N"fltk::Input::maybe_do_callback()" \ 
    107           -N"fltk::end_group()" \ 
    108           \ 
    109           -N"fltk::image_filetypes" \ 
    110           -N"fltk::Menu::get_location(fltk::Widget*, int const*, int, int) const" \ 
    111           \ 
    112           -N"fltk::Window::backbuffer() const" 
     29          -N"fltk::Input::position(int, int)" \ 
     30          -N"fltk::ComboBox::position(int, int)" \ 
     31          -N"fltk::HelpView::resize(int, int, int, int)" \ 
     32          -N"fltk::HelpView::textsize(int)" \ 
     33          -N"fltk::HelpView::textsize() const" \ 
     34          -N"fltk::Item::type() const" \ 
     35          -N"fltk::Window::backbuffer() const" \ 
     36          -N"fltk::end_group()" 
    11337done 

  • trunk/bindings/bcd/fltk2/Adjuster.cc

    r65 r80  
    2727return (This->handle(_0)); 
    2828} 
    29 typedef void (*_BCD_func__144)(fltk::Widget *, long int); 
    30 typedef _BCD_func__144 _BCD__145_Callback1; 
    31 typedef void (*_BCD_func__146)(fltk::Widget *); 
    32 typedef _BCD_func__146 _BCD__147_Callback0; 
    33 typedef void (*_BCD_func__150)(fltk::Widget *, void *); 
    34 typedef _BCD_func__150 _BCD__151_Callback; 
    35 typedef _BCD__151_Callback _BCD__149_Callback_p; 
    36 typedef bool (*_BCD_func__291)(); 
    37 typedef _BCD_func__291 _BCD__162_Theme; 
    38 typedef fltk::Symbol * _BCD__220_Box; 
    39 typedef unsigned int _BCD__237_Color; 
    40 typedef int _BCD__240_Flags; 
    41 typedef _BCD__240_Flags _BCD__239_Align; 
     29int _BCD_R__ZN4fltk8Adjuster6handleEi__Adjuster_R_CHECK(void *); 
     30int _BCD_R__ZN4fltk8Adjuster6handleEi__Adjuster_R(void *, int _0); 
    4231} 
     32class Adjuster_R : fltk::Adjuster { 
     33public: 
     34void *__D_data; 
     35Adjuster_R(int x, int y, int w, int h, char const * l) : fltk::Adjuster(x, y, w, h, l) {} 
     36int handle(int _0) { 
     37if (_BCD_R__ZN4fltk8Adjuster6handleEi__Adjuster_R_CHECK(__D_data)) 
     38return _BCD_R__ZN4fltk8Adjuster6handleEi__Adjuster_R(__D_data, _0); 
     39else 
     40return fltk::Adjuster::handle(_0); 
     41} 
     42}; 
     43extern "C" { 
     44Adjuster_R *_BCD_new__ZN4fltk8AdjusterC1EiiiiPKc_R(int x, int y, int w, int h, char const * l) { 
     45return new Adjuster_R(x, y, w, h, l); 
     46} 
     47void _BCD_delete_N4fltk8AdjusterE__Adjuster_R(Adjuster_R *This) { 
     48delete This; 
     49} 
     50void _BCD_RI_N4fltk8AdjusterE(Adjuster_R *cd, void *dd) { 
     51cd->__D_data = dd; 
     52} 
     53typedef void (*_BCD_func__151)(fltk::Widget *, long int); 
     54typedef _BCD_func__151 _BCD__152_Callback1; 
     55typedef void (*_BCD_func__153)(fltk::Widget *); 
     56typedef _BCD_func__153 _BCD__154_Callback0; 
     57typedef void (*_BCD_func__157)(fltk::Widget *, void *); 
     58typedef _BCD_func__157 _BCD__158_Callback; 
     59typedef _BCD__158_Callback _BCD__156_Callback_p; 
     60typedef bool (*_BCD_func__298)(); 
     61typedef _BCD_func__298 _BCD__169_Theme; 
     62typedef fltk::Symbol * _BCD__227_Box; 
     63typedef unsigned int _BCD__244_Color; 
     64typedef int _BCD__247_Flags; 
     65typedef _BCD__247_Flags _BCD__246_Align; 
     66} 

  • trunk/bindings/bcd/fltk2/Adjuster.d

    r65 r80  
    1616extern (C) int _BCD__ZNK4fltk8Adjuster4softEv(void *This); 
    1717extern (C) int _BCD__ZN4fltk8Adjuster6handleEi(void *This, int); 
    18 alias void function(Widget *, int) _BCD_func__144; 
    19 alias void function(Widget *) _BCD_func__146; 
    20 alias void function(Widget *, void *) _BCD_func__150; 
    21 alias bool function() _BCD_func__291; 
     18extern (C) void _BCD_RI_N4fltk8AdjusterE(void *cd, void *dd); 
     19extern (C) void _BCD_delete_N4fltk8AdjusterE__Adjuster_R(void *This); 
     20extern (C) void *_BCD_new__ZN4fltk8AdjusterC1EiiiiPKc_R(int, int, int, int, char *); 
     21extern (C) int _BCD_R__ZN4fltk8Adjuster6handleEi__Adjuster_R_CHECK(Adjuster_R x) { 
     22union dp { 
     23int delegate(int) d; 
     24struct { void *o; void *f; } 
     25} 
     26dp d; d.d = &x.handle; 
     27return cast(int) (d.f != &Adjuster.handle); 
     28} 
     29extern (C) int _BCD_R__ZN4fltk8Adjuster6handleEi__Adjuster_R(Adjuster_R __D_class, int _0) { 
     30return __D_class.handle(_0); 
     31} 
     32alias void function(Widget *, int) _BCD_func__151; 
     33alias void function(Widget *) _BCD_func__153; 
     34alias void function(Widget *, void *) _BCD_func__157; 
     35alias bool function() _BCD_func__298; 
    2236class Adjuster : Valuator { 
    2337this(ifloat ignore) { 
    …… 
    5468} 
    5569} 
     70class Adjuster_R : Adjuster { 
     71~this() { 
     72if (__C_data && __C_data_owned) _BCD_delete_N4fltk8AdjusterE__Adjuster_R(__C_data); 
     73__C_data = null; 
     74} 
     75this(int x, int y, int w, int h, char * l) { 
     76super(cast(ifloat) 0); 
     77__C_data = _BCD_new__ZN4fltk8AdjusterC1EiiiiPKc_R(x, y, w, h, l); 
     78__C_data_owned = true; 
     79_BCD_RI_N4fltk8AdjusterE(__C_data, cast(void *) this); 
     80} 
     81} 

  • trunk/bindings/bcd/fltk2/BarGroup.cc

    r65 r80  
    4545(This->glyph_size(v)); 
    4646} 
    47 typedef void (*_BCD_func__144)(fltk::Widget *, long int); 
    48 typedef _BCD_func__144 _BCD__145_Callback1; 
    49 typedef void (*_BCD_func__146)(fltk::Widget *); 
    50 typedef _BCD_func__146 _BCD__147_Callback0; 
    51 typedef void (*_BCD_func__150)(fltk::Widget *, void *); 
    52 typedef _BCD_func__150 _BCD__151_Callback; 
    53 typedef _BCD__151_Callback _BCD__149_Callback_p; 
    54 typedef bool (*_BCD_func__320)(); 
    55 typedef _BCD_func__320 _BCD__162_Theme; 
    56 typedef fltk::Symbol * _BCD__220_Box; 
    57 typedef unsigned int _BCD__237_Color; 
    58 typedef int _BCD__240_Flags; 
    59 typedef _BCD__240_Flags _BCD__239_Align; 
     47int _BCD_R__ZN4fltk8BarGroup6layoutEv__BarGroup_R_CHECK(void *); 
     48void _BCD_R__ZN4fltk8BarGroup6layoutEv__BarGroup_R(void *); 
     49int _BCD_R__ZN4fltk8BarGroup6handleEi__BarGroup_R_CHECK(void *); 
     50int _BCD_R__ZN4fltk8BarGroup6handleEi__BarGroup_R(void *, int _0); 
     51int _BCD_R__ZN4fltk8BarGroup4drawEv__BarGroup_R_CHECK(void *); 
     52void _BCD_R__ZN4fltk8BarGroup4drawEv__BarGroup_R(void *); 
    6053} 
     54class BarGroup_R : fltk::BarGroup { 
     55public: 
     56void *__D_data; 
     57BarGroup_R(int x, int y, int w, int h, char const * l) : fltk::BarGroup(x, y, w, h, l) {} 
     58void layout() { 
     59if (_BCD_R__ZN4fltk8BarGroup6layoutEv__BarGroup_R_CHECK(__D_data)) 
     60_BCD_R__ZN4fltk8BarGroup6layoutEv__BarGroup_R(__D_data); 
     61else 
     62fltk::BarGroup::layout(); 
     63} 
     64int handle(int _0) { 
     65if (_BCD_R__ZN4fltk8BarGroup6handleEi__BarGroup_R_CHECK(__D_data)) 
     66return _BCD_R__ZN4fltk8BarGroup6handleEi__BarGroup_R(__D_data, _0); 
     67else 
     68return fltk::BarGroup::handle(_0); 
     69} 
     70void draw() { 
     71if (_BCD_R__ZN4fltk8BarGroup4drawEv__BarGroup_R_CHECK(__D_data)) 
     72_BCD_R__ZN4fltk8BarGroup4drawEv__BarGroup_R(__D_data); 
     73else 
     74fltk::BarGroup::draw(); 
     75} 
     76}; 
     77extern "C" { 
     78BarGroup_R *_BCD_new__ZN4fltk8BarGroupC1EiiiiPKc_R(int x, int y, int w, int h, char const * l) { 
     79return new BarGroup_R(x, y, w, h, l); 
     80} 
     81void _BCD_delete_N4fltk8BarGroupE__BarGroup_R(BarGroup_R *This) { 
     82delete This; 
     83} 
     84void _BCD_RI_N4fltk8BarGroupE(BarGroup_R *cd, void *dd) { 
     85cd->__D_data = dd; 
     86} 
     87typedef void (*_BCD_func__151)(fltk::Widget *, long int); 
     88typedef _BCD_func__151 _BCD__152_Callback1; 
     89typedef void (*_BCD_func__153)(fltk::Widget *); 
     90typedef _BCD_func__153 _BCD__154_Callback0; 
     91typedef void (*_BCD_func__157)(fltk::Widget *, void *); 
     92typedef _BCD_func__157 _BCD__158_Callback; 
     93typedef _BCD__158_Callback _BCD__156_Callback_p; 
     94typedef bool (*_BCD_func__327)(); 
     95typedef _BCD_func__327 _BCD__169_Theme; 
     96typedef fltk::Symbol * _BCD__227_Box; 
     97typedef unsigned int _BCD__244_Color; 
     98typedef int _BCD__247_Flags; 
     99typedef _BCD__247_Flags _BCD__246_Align; 
     100} 

  • trunk/bindings/bcd/fltk2/BarGroup.d

    r65 r80  
    2222extern (C) int _BCD__ZNK4fltk8BarGroup10glyph_sizeEv(void *This); 
    2323extern (C) void _BCD__ZN4fltk8BarGroup10glyph_sizeEi(void *This, int); 
    24 alias void function(Widget *, int) _BCD_func__144; 
    25 alias void function(Widget *) _BCD_func__146; 
    26 alias void function(Widget *, void *) _BCD_func__150; 
    27 alias bool function() _BCD_func__320; 
     24extern (C) void _BCD_RI_N4fltk8BarGroupE(void *cd, void *dd); 
     25extern (C) void _BCD_delete_N4fltk8BarGroupE__BarGroup_R(void *This); 
     26extern (C) void *_BCD_new__ZN4fltk8BarGroupC1EiiiiPKc_R(int, int, int, int, char *); 
     27extern (C) int _BCD_R__ZN4fltk8BarGroup6layoutEv__BarGroup_R_CHECK(BarGroup_R x) { 
     28union dp { 
     29void delegate() d; 
     30struct { void *o; void *f; } 
     31} 
     32dp d; d.d = &x.layout; 
     33return cast(int) (d.f != &BarGroup.layout); 
     34} 
     35extern (C) void _BCD_R__ZN4fltk8BarGroup6layoutEv__BarGroup_R(BarGroup_R __D_class, ) { 
     36__D_class.layout(); 
     37} 
     38extern (C) int _BCD_R__ZN4fltk8BarGroup6handleEi__BarGroup_R_CHECK(BarGroup_R x) { 
     39union dp { 
     40int delegate(int) d; 
     41struct { void *o; void *f; } 
     42} 
     43dp d; d.d = &x.handle; 
     44return cast(int) (d.f != &BarGroup.handle); 
     45} 
     46extern (C) int _BCD_R__ZN4fltk8BarGroup6handleEi__BarGroup_R(BarGroup_R __D_class, int _0) { 
     47return __D_class.handle(_0); 
     48} 
     49extern (C) int _BCD_R__ZN4fltk8BarGroup4drawEv__BarGroup_R_CHECK(BarGroup_R x) { 
     50union dp { 
     51void delegate() d; 
     52struct { void *o; void *f; } 
     53} 
     54dp d; d.d = &x.draw; 
     55return cast(int) (d.f != &BarGroup.draw); 
     56} 
     57extern (C) void _BCD_R__ZN4fltk8BarGroup4drawEv__BarGroup_R(BarGroup_R __D_class, ) { 
     58__D_class.draw(); 
     59} 
     60alias void function(Widget *, int) _BCD_func__151; 
     61alias void function(Widget *) _BCD_func__153; 
     62alias void function(Widget *, void *) _BCD_func__157; 
     63alias bool function() _BCD_func__327; 
    2864class BarGroup : Group { 
    2965this(ifloat ignore) { 
    …… 
    78114} 
    79115} 
     116class BarGroup_R : BarGroup { 
     117~this() { 
     118if (__C_data && __C_data_owned) _BCD_delete_N4fltk8BarGroupE__BarGroup_R(__C_data); 
     119__C_data = null; 
     120} 
     121this(int x, int y, int w, int h, char * l) { 
     122super(cast(ifloat) 0); 
     123__C_data = _BCD_new__ZN4fltk8BarGroupC1EiiiiPKc_R(x, y, w, h, l); 
     124__C_data_owned = true; 
     125_BCD_RI_N4fltk8BarGroupE(__C_data, cast(void *) this); 
     126} 
     127} 

  • trunk/bindings/bcd/fltk2/Box.cc

    r65 r80  
    2121return (This->is_frame()); 
    2222} 
    23 typedef fltk::Symbol * _BCD__152_Box; 
    24 fltk::HighlightBox *_BCD_new__ZN4fltk12HighlightBoxC1EPKcPKNS_6SymbolE(char const * n, _BCD__152_Box const d) { 
     23typedef fltk::Symbol * _BCD__159_Box; 
     24fltk::HighlightBox *_BCD_new__ZN4fltk12HighlightBoxC1EPKcPKNS_6SymbolE(char const * n, _BCD__159_Box const d) { 
    2525return new fltk::HighlightBox(n, d); 
     26} 
     27int _BCD_R__ZNK4fltk7FlatBox5_drawERKNS_9RectangleE__HighlightBox_R_CHECK(void *); 
     28void _BCD_R__ZNK4fltk7FlatBox5_drawERKNS_9RectangleE__HighlightBox_R(void *, fltk::Rectangle   const & _0); 
     29int _BCD_R__ZNK4fltk7FlatBox15fills_rectangleEv__HighlightBox_R_CHECK(void *); 
     30bool _BCD_R__ZNK4fltk7FlatBox15fills_rectangleEv__HighlightBox_R(void *); 
     31int _BCD_R__ZNK4fltk7FlatBox8is_frameEv__HighlightBox_R_CHECK(void *); 
     32bool _BCD_R__ZNK4fltk7FlatBox8is_frameEv__HighlightBox_R(void *); 
     33int _BCD_R__ZNK4fltk12HighlightBox5insetERNS_9RectangleE__HighlightBox_R_CHECK(void *); 
     34void _BCD_R__ZNK4fltk12HighlightBox5insetERNS_9RectangleE__HighlightBox_R(void *, fltk::Rectangle   & _0); 
     35} 
     36class HighlightBox_R : fltk::HighlightBox { 
     37public: 
     38void *__D_data; 
     39void _draw(fltk::Rectangle   const & _0) { 
     40if (_BCD_R__ZNK4fltk7FlatBox5_drawERKNS_9RectangleE__HighlightBox_R_CHECK(__D_data)) 
     41_BCD_R__ZNK4fltk7FlatBox5_drawERKNS_9RectangleE__HighlightBox_R(__D_data, _0); 
     42else 
     43fltk::HighlightBox::_draw(_0); 
     44} 
     45bool fills_rectangle() { 
     46if (_BCD_R__ZNK4fltk7FlatBox15fills_rectangleEv__HighlightBox_R_CHECK(__D_data)) 
     47return _BCD_R__ZNK4fltk7FlatBox15fills_rectangleEv__HighlightBox_R(__D_data); 
     48else 
     49return fltk::HighlightBox::fills_rectangle(); 
     50} 
     51bool is_frame() { 
     52if (_BCD_R__ZNK4fltk7FlatBox8is_frameEv__HighlightBox_R_CHECK(__D_data)) 
     53return _BCD_R__ZNK4fltk7FlatBox8is_frameEv__HighlightBox_R(__D_data); 
     54else 
     55return fltk::HighlightBox::is_frame(); 
     56} 
     57void inset(fltk::Rectangle   & _0) { 
     58if (_BCD_R__ZNK4fltk12HighlightBox5insetERNS_9RectangleE__HighlightBox_R_CHECK(__D_data)) 
     59_BCD_R__ZNK4fltk12HighlightBox5insetERNS_9RectangleE__HighlightBox_R(__D_data, _0); 
     60else 
     61fltk::HighlightBox::inset(_0); 
     62} 
     63HighlightBox_R(char const * n, _BCD__159_Box const d) : fltk::HighlightBox(n, d) {} 
     64}; 
     65extern "C" { 
     66HighlightBox_R *_BCD_new__ZN4fltk12HighlightBoxC1EPKcPKNS_6SymbolE_R(char const * n, _BCD__159_Box const d) { 
     67return new HighlightBox_R(n, d); 
     68} 
     69void _BCD_delete_N4fltk12HighlightBoxE__HighlightBox_R(HighlightBox_R *This) { 
     70delete This; 
     71} 
     72void _BCD_RI_N4fltk12HighlightBoxE(HighlightBox_R *cd, void *dd) { 
     73cd->__D_data = dd; 
    2674} 
    2775void _BCD_delete_N4fltk7FlatBoxE(fltk::FlatBox *This) { 
    …… 
    4088return new fltk::FlatBox(n); 
    4189} 
     90int _BCD_R__ZNK4fltk7FlatBox5_drawERKNS_9RectangleE__FlatBox_R_CHECK(void *); 
     91void _BCD_R__ZNK4fltk7FlatBox5_drawERKNS_9RectangleE__FlatBox_R(void *, fltk::Rectangle   const & _0); 
     92int _BCD_R__ZNK4fltk7FlatBox15fills_rectangleEv__FlatBox_R_CHECK(void *); 
     93bool _BCD_R__ZNK4fltk7FlatBox15fills_rectangleEv__FlatBox_R(void *); 
     94int _BCD_R__ZNK4fltk7FlatBox8is_frameEv__FlatBox_R_CHECK(void *); 
     95bool _BCD_R__ZNK4fltk7FlatBox8is_frameEv__FlatBox_R(void *); 
     96} 
     97class FlatBox_R : fltk::FlatBox { 
     98public: 
     99void *__D_data; 
     100void _draw(fltk::Rectangle   const & _0) { 
     101if (_BCD_R__ZNK4fltk7FlatBox5_drawERKNS_9RectangleE__FlatBox_R_CHECK(__D_data)) 
     102_BCD_R__ZNK4fltk7FlatBox5_drawERKNS_9RectangleE__FlatBox_R(__D_data, _0); 
     103else 
     104fltk::FlatBox::_draw(_0); 
     105} 
     106bool fills_rectangle() { 
     107if (_BCD_R__ZNK4fltk7FlatBox15fills_rectangleEv__FlatBox_R_CHECK(__D_data)) 
     108return _BCD_R__ZNK4fltk7FlatBox15fills_rectangleEv__FlatBox_R(__D_data); 
     109else 
     110return fltk::FlatBox::fills_rectangle(); 
     111} 
     112bool is_frame() { 
     113if (_BCD_R__ZNK4fltk7FlatBox8is_frameEv__FlatBox_R_CHECK(__D_data)) 
     114return _BCD_R__ZNK4fltk7FlatBox8is_frameEv__FlatBox_R(__D_data); 
     115else 
     116return fltk::FlatBox::is_frame(); 
     117} 
     118FlatBox_R(char const * n) : fltk::FlatBox(n) {} 
     119}; 
     120extern "C" { 
     121FlatBox_R *_BCD_new__ZN4fltk7FlatBoxC1EPKc_R(char const * n) { 
     122return new FlatBox_R(n); 
     123} 
     124void _BCD_delete_N4fltk7FlatBoxE__FlatBox_R(FlatBox_R *This) { 
     125delete This; 
     126} 
     127void _BCD_RI_N4fltk7FlatBoxE(FlatBox_R *cd, void *dd) { 
     128cd->__D_data = dd; 
     129} 
    42130void _BCD_delete_N4fltk8FrameBoxE(fltk::FrameBox *This) { 
    43131delete This; 
    …… 
    70158return (This->is_frame()); 
    71159} 
    72 fltk::FrameBox *_BCD_new__ZN4fltk8FrameBoxC1EPKciiiiS2_PKNS_6SymbolE(char const * name, int dx, int dy, int dw, int dh, char const * pattern, _BCD__152_Box const down) { 
     160fltk::FrameBox *_BCD_new__ZN4fltk8FrameBoxC1EPKciiiiS2_PKNS_6SymbolE(char const * name, int dx, int dy, int dw, int dh, char const * pattern, _BCD__159_Box const down) { 
    73161return new fltk::FrameBox(name, dx, dy, dw, dh, pattern, down); 
     162} 
     163int _BCD_R__ZNK4fltk8FrameBox5_drawERKNS_9RectangleE__FrameBox_R_CHECK(void *); 
     164void _BCD_R__ZNK4fltk8FrameBox5_drawERKNS_9RectangleE__FrameBox_R(void *, fltk::Rectangle   const & _0); 
     165int _BCD_R__ZNK4fltk8FrameBox5insetERNS_9RectangleE__FrameBox_R_CHECK(void *); 
     166void _BCD_R__ZNK4fltk8FrameBox5insetERNS_9RectangleE__FrameBox_R(void *, fltk::Rectangle   & _0); 
     167int _BCD_R__ZNK4fltk8FrameBox15fills_rectangleEv__FrameBox_R_CHECK(void *); 
     168bool _BCD_R__ZNK4fltk8FrameBox15fills_rectangleEv__FrameBox_R(void *); 
     169int _BCD_R__ZNK4fltk8FrameBox8is_frameEv__FrameBox_R_CHECK(void *); 
     170bool _BCD_R__ZNK4fltk8FrameBox8is_frameEv__FrameBox_R(void *); 
     171} 
     172class FrameBox_R : fltk::FrameBox { 
     173public: 
     174void *__D_data; 
     175void _draw(fltk::Rectangle   const & _0) { 
     176if (_BCD_R__ZNK4fltk8FrameBox5_drawERKNS_9RectangleE__FrameBox_R_CHECK(__D_data)) 
     177_BCD_R__ZNK4fltk8FrameBox5_drawERKNS_9RectangleE__FrameBox_R(__D_data, _0); 
     178else 
     179fltk::FrameBox::_draw(_0); 
     180} 
     181void inset(fltk::Rectangle   & _0) { 
     182if (_BCD_R__ZNK4fltk8FrameBox5insetERNS_9RectangleE__FrameBox_R_CHECK(__D_data)) 
     183_BCD_R__ZNK4fltk8FrameBox5insetERNS_9RectangleE__FrameBox_R(__D_data, _0); 
     184else 
     185fltk::FrameBox::inset(_0); 
     186} 
     187bool fills_rectangle() { 
     188if (_BCD_R__ZNK4fltk8FrameBox15fills_rectangleEv__FrameBox_R_CHECK(__D_data)) 
     189return _BCD_R__ZNK4fltk8FrameBox15fills_rectangleEv__FrameBox_R(__D_data); 
     190else 
     191return fltk::FrameBox::fills_rectangle(); 
     192} 
     193bool is_frame() { 
     194if (_BCD_R__ZNK4fltk8FrameBox8is_frameEv__FrameBox_R_CHECK(__D_data)) 
     195return _BCD_R__ZNK4fltk8FrameBox8is_frameEv__FrameBox_R(__D_data); 
     196else 
     197return fltk::FrameBox::is_frame(); 
     198} 
     199FrameBox_R(char const * name, int dx, int dy, int dw, int dh, char const * pattern, _BCD__159_Box const down) : fltk::FrameBox(name, dx, dy, dw, dh, pattern, down) {} 
     200}; 
     201extern "C" { 
     202FrameBox_R *_BCD_new__ZN4fltk8FrameBoxC1EPKciiiiS2_PKNS_6SymbolE_R(char const * name, int dx, int dy, int dw, int dh, char const * pattern, _BCD__159_Box const down) { 
     203return new FrameBox_R(name, dx, dy, dw, dh, pattern, down); 
     204} 
     205void _BCD_delete_N4fltk8FrameBoxE__FrameBox_R(FrameBox_R *This) { 
     206delete This; 
     207} 
     208void _BCD_RI_N4fltk8FrameBoxE(FrameBox_R *cd, void *dd) { 
     209cd->__D_data = dd; 
    74210} 
    75211int _BCD__ZN4fltk6box_dhEPKNS_8FrameBoxE(fltk::FrameBox const * b) { 
    …… 
    85221return (fltk::box_dx(b)); 
    86222} 
    87 typedef unsigned int _BCD__173_Color; 
    88 typedef int _BCD__176_Flags; 
    89 typedef _BCD__176_Flags _BCD__175_Align; 
    90 } 
     223typedef unsigned int _BCD__180_Color; 
     224typedef int _BCD__183_Flags; 
     225typedef _BCD__183_Flags _BCD__182_Align; 
     226} 

  • trunk/bindings/bcd/fltk2/Box.d

    r65 r80  
    1515alias Symbol Box; 
    1616extern (C) void *_BCD_new__ZN4fltk12HighlightBoxC1EPKcPKNS_6SymbolE(char *, void *); 
     17