Changeset 62

Show
Ignore:
Timestamp:
06/03/06 20:00:02 (2 years ago)
Author:
Gregor
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/bindings/bcd/bind.d

    r61 r62  
    3030    } 
    3131    void *__C_data = null; 
     32    bool __C_data_owned = false; 
    3233} 
    3334 
    …… 
    3637        super("BCDReflectionException: " ~ msg); 
    3738    } 
     39} 
     40 
     41struct CXXDelegate { 
     42    void *o; 
     43    void *f; 
    3844} 
    3945 

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

    r58 r62  
    1515return (fltk::NamedStyle *) This->default_style; 
    1616} 
    17 fltk::Adjuster *_BCD_new__ZN4fltk8AdjusterC1EiiiiPKc(fltk::Adjuster *This, int x, int y, int w, int h, const char * l) { 
     17fltk::Adjuster *_BCD_new__ZN4fltk8AdjusterC1EiiiiPKc(int x, int y, int w, int h, char const * l) { 
    1818return new fltk::Adjuster(x, y, w, h, l); 
    1919} 

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

    r58 r62  
    1212extern (C) void _BCD_set__ZN4fltk8Adjuster13default_styleE(void *, NamedStyle *); 
    1313extern (C) NamedStyle * _BCD_get__ZN4fltk8Adjuster13default_styleE(void *); 
    14 extern (C) void *_BCD_new__ZN4fltk8AdjusterC1EiiiiPKc(void *This, int x, int y, int w, int h, char * l); 
    15 extern (C) void _BCD__ZN4fltk8Adjuster4softEi(void *This, int x); 
     14extern (C) void *_BCD_new__ZN4fltk8AdjusterC1EiiiiPKc(int, int, int, int, char *); 
     15extern (C) void _BCD__ZN4fltk8Adjuster4softEi(void *This, int); 
    1616extern (C) int _BCD__ZNK4fltk8Adjuster4softEv(void *This); 
    17 extern (C) int _BCD__ZN4fltk8Adjuster6handleEi(void *This, int _0); 
     17extern (C) int _BCD__ZN4fltk8Adjuster6handleEi(void *This, int); 
    1818alias void function(Widget *, int) _BCD_func__144; 
    1919alias void function(Widget *) _BCD_func__146; 
    …… 
    2424super(ignore); 
    2525} 
     26this(ifloat ignore, void *x) { 
     27super(ignore); 
     28__C_data = x; 
     29__C_data_owned = false; 
     30} 
    2631~this() { 
    27 if (__C_data) _BCD_delete_N4fltk8AdjusterE(__C_data); 
     32if (__C_data && __C_data_owned) _BCD_delete_N4fltk8AdjusterE(__C_data); 
    2833__C_data = null; 
    2934} 
    …… 
    3641this(int x, int y, int w, int h, char * l) { 
    3742super(cast(ifloat) 0); 
    38 __C_data = _BCD_new__ZN4fltk8AdjusterC1EiiiiPKc(__C_data, x, y, w, h, l); 
     43__C_data = _BCD_new__ZN4fltk8AdjusterC1EiiiiPKc(x, y, w, h, l); 
     44__C_data_owned = true; 
    3945} 
    4046void soft(int x) { 

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

    r58 r62  
    1515return (fltk::NamedStyle *) This->default_style; 
    1616} 
    17 fltk::BarGroup *_BCD_new__ZN4fltk8BarGroupC1EiiiiPKc(fltk::BarGroup *This, int x, int y, int w, int h, const char * l) { 
     17fltk::BarGroup *_BCD_new__ZN4fltk8BarGroupC1EiiiiPKc(int x, int y, int w, int h, char const * l) { 
    1818return new fltk::BarGroup(x, y, w, h, l); 
    1919} 

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

    r58 r62  
    1212extern (C) void _BCD_set__ZN4fltk8BarGroup13default_styleE(void *, NamedStyle *); 
    1313extern (C) NamedStyle * _BCD_get__ZN4fltk8BarGroup13default_styleE(void *); 
    14 extern (C) void *_BCD_new__ZN4fltk8BarGroupC1EiiiiPKc(void *This, int x, int y, int w, int h, char * l); 
     14extern (C) void *_BCD_new__ZN4fltk8BarGroupC1EiiiiPKc(int, int, int, int, char *); 
    1515extern (C) void _BCD__ZN4fltk8BarGroup6layoutEv(void *This); 
    16 extern (C) int _BCD__ZN4fltk8BarGroup6handleEi(void *This, int _0); 
     16extern (C) int _BCD__ZN4fltk8BarGroup6handleEi(void *This, int); 
    1717extern (C) void _BCD__ZN4fltk8BarGroup4drawEv(void *This); 
    1818extern (C) bool _BCD__ZNK4fltk8BarGroup6openedEv(void *This); 
    19 extern (C) bool _BCD__ZN4fltk8BarGroup6openedEb(void *This, bool _0); 
     19extern (C) bool _BCD__ZN4fltk8BarGroup6openedEb(void *This, bool); 
    2020extern (C) bool _BCD__ZN4fltk8BarGroup4openEv(void *This); 
    2121extern (C) bool _BCD__ZN4fltk8BarGroup5closeEv(void *This); 
    2222extern (C) int _BCD__ZNK4fltk8BarGroup10glyph_sizeEv(void *This); 
    23 extern (C) void _BCD__ZN4fltk8BarGroup10glyph_sizeEi(void *This, int v); 
     23extern (C) void _BCD__ZN4fltk8BarGroup10glyph_sizeEi(void *This, int); 
    2424alias void function(Widget *, int) _BCD_func__144; 
    2525alias void function(Widget *) _BCD_func__146; 
    …… 
    3030super(ignore); 
    3131} 
     32this(ifloat ignore, void *x) { 
     33super(ignore); 
     34__C_data = x; 
     35__C_data_owned = false; 
     36} 
    3237~this() { 
    33 if (__C_data) _BCD_delete_N4fltk8BarGroupE(__C_data); 
     38if (__C_data && __C_data_owned) _BCD_delete_N4fltk8BarGroupE(__C_data); 
    3439__C_data = null; 
    3540} 
    …… 
    4247this(int x, int y, int w, int h, char * l) { 
    4348super(cast(ifloat) 0); 
    44 __C_data = _BCD_new__ZN4fltk8BarGroupC1EiiiiPKc(__C_data, x, y, w, h, l); 
     49__C_data = _BCD_new__ZN4fltk8BarGroupC1EiiiiPKc(x, y, w, h, l); 
     50__C_data_owned = true; 
    4551} 
    4652void layout() { 

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

    r58 r62  
    99delete This; 
    1010} 
    11 void _BCD__ZNK4fltk12HighlightBox5_drawERKNS_9RectangleE(fltk::HighlightBox *This, const fltk::Rectangle & _0) { 
     11void _BCD__ZNK4fltk12HighlightBox5_drawERKNS_9RectangleE(fltk::HighlightBox *This, fltk::Rectangle   const & _0) { 
    1212(This->_draw(_0)); 
    1313} 
    14 void _BCD__ZNK4fltk12HighlightBox5insetERNS_9RectangleE(fltk::HighlightBox *This, fltk::Rectangle & _0) { 
     14void _BCD__ZNK4fltk12HighlightBox5insetERNS_9RectangleE(fltk::HighlightBox *This, fltk::Rectangle   & _0) { 
    1515(This->inset(_0)); 
    1616} 
    …… 
    2222} 
    2323typedef fltk::Symbol * _BCD_Box; 
    24 fltk::HighlightBox *_BCD_new__ZN4fltk12HighlightBoxC1EPKcPKNS_6SymbolE(fltk::HighlightBox *This, const char * n, const _BCD_Box d) { 
     24fltk::HighlightBox *_BCD_new__ZN4fltk12HighlightBoxC1EPKcPKNS_6SymbolE(char const * n, _BCD_Box const d) { 
    2525return new fltk::HighlightBox(n, d); 
    2626} 
    …… 
    2828delete This; 
    2929} 
    30 void _BCD__ZNK4fltk7FlatBox5_drawERKNS_9RectangleE(fltk::FlatBox *This, const fltk::Rectangle & _0) { 
     30void _BCD__ZNK4fltk7FlatBox5_drawERKNS_9RectangleE(fltk::FlatBox *This, fltk::Rectangle   const & _0) { 
    3131(This->_draw(_0)); 
    3232} 
    …… 
    3737return (bool) (This->is_frame()); 
    3838} 
    39 fltk::FlatBox *_BCD_new__ZN4fltk7FlatBoxC1EPKc(fltk::FlatBox *This, const char * n) { 
     39fltk::FlatBox *_BCD_new__ZN4fltk7FlatBoxC1EPKc(char const * n) { 
    4040return new fltk::FlatBox(n); 
    4141} 
    …… 
    4343delete This; 
    4444} 
    45 const char * _BCD__ZNK4fltk8FrameBox4dataEv(fltk::FrameBox *This) { 
    46 return (const char *) (This->data()); 
     45char const * _BCD__ZNK4fltk8FrameBox4dataEv(fltk::FrameBox *This) { 
     46return (char const *) (This->data()); 
    4747} 
    48 void _BCD__ZNK4fltk8FrameBox5_drawERKNS_9RectangleE(fltk::FrameBox *This, const fltk::Rectangle & _0) { 
     48void _BCD__ZNK4fltk8FrameBox5_drawERKNS_9RectangleE(fltk::FrameBox *This, fltk::Rectangle   const & _0) { 
    4949(This->_draw(_0)); 
    5050} 
    51 void _BCD__ZNK4fltk8FrameBox5insetERNS_9RectangleE(fltk::FrameBox *This, fltk::Rectangle & _0) { 
     51void _BCD__ZNK4fltk8FrameBox5insetERNS_9RectangleE(fltk::FrameBox *This, fltk::Rectangle   & _0) { 
    5252(This->inset(_0)); 
    5353} 
    …… 
    7070return (bool) (This->is_frame()); 
    7171} 
    72 fltk::FrameBox *_BCD_new__ZN4fltk8FrameBoxC1EPKciiiiS2_PKNS_6SymbolE(fltk::FrameBox *This, const char * name, int dx, int dy, int dw, int dh, const char * pattern, const _BCD_Box down) { 
     72fltk::FrameBox *_BCD_new__ZN4fltk8FrameBoxC1EPKciiiiS2_PKNS_6SymbolE(char const * name, int dx, int dy, int dw, int dh, char const * pattern, _BCD_Box const down) { 
    7373return new fltk::FrameBox(name, dx, dy, dw, dh, pattern, down); 
    7474} 
    75 int _BCD__ZN4fltk6box_dhEPKNS_8FrameBoxE(const fltk::FrameBox * b) { 
     75int _BCD__ZN4fltk6box_dhEPKNS_8FrameBoxE(fltk::FrameBox const * b) { 
    7676return (int) (fltk::box_dh(b)); 
    7777} 
    78 int _BCD__ZN4fltk6box_dwEPKNS_8FrameBoxE(const fltk::FrameBox * b) { 
     78int _BCD__ZN4fltk6box_dwEPKNS_8FrameBoxE(fltk::FrameBox const * b) { 
    7979return (int) (fltk::box_dw(b)); 
    8080} 
    81 int _BCD__ZN4fltk6box_dyEPKNS_8FrameBoxE(const fltk::FrameBox * b) { 
     81int _BCD__ZN4fltk6box_dyEPKNS_8FrameBoxE(fltk::FrameBox const * b) { 
    8282return (int) (fltk::box_dy(b)); 
    8383} 
    84 int _BCD__ZN4fltk6box_dxEPKNS_8FrameBoxE(const fltk::FrameBox * b) { 
     84int _BCD__ZN4fltk6box_dxEPKNS_8FrameBoxE(fltk::FrameBox const * b) { 
    8585return (int) (fltk::box_dx(b)); 
    8686} 
    87 int _BCD__ZN4fltk6box_dhEPKNS_6SymbolE(const _BCD_Box b) { 
     87int _BCD__ZN4fltk6box_dhEPKNS_6SymbolE(_BCD_Box const b) { 
    8888return (int) (fltk::box_dh(b)); 
    8989} 
    90 int _BCD__ZN4fltk6box_dwEPKNS_6SymbolE(const _BCD_Box b) { 
     90int _BCD__ZN4fltk6box_dwEPKNS_6SymbolE(_BCD_Box const b) { 
    9191return (int) (fltk::box_dw(b)); 
    9292} 
    93 int _BCD__ZN4fltk6box_dyEPKNS_6SymbolE(const _BCD_Box b) { 
     93int _BCD__ZN4fltk6box_dyEPKNS_6SymbolE(_BCD_Box const b) { 
    9494return (int) (fltk::box_dy(b)); 
    9595} 
    96 int _BCD__ZN4fltk6box_dxEPKNS_6SymbolE(const _BCD_Box b) { 
     96int _BCD__ZN4fltk6box_dxEPKNS_6SymbolE(_BCD_Box const b) { 
    9797return (int) (fltk::box_dx(b)); 
    9898} 

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

    r58 r62  
    99import bcd.fltk2.Flags; 
    1010extern (C) void _BCD_delete_N4fltk12HighlightBoxE(void *); 
    11 extern (C) void _BCD__ZNK4fltk12HighlightBox5_drawERKNS_9RectangleE(void *This, void *_0); 
    12 extern (C) void _BCD__ZNK4fltk12HighlightBox5insetERNS_9RectangleE(void *This, void *_0); 
     11extern (C) void _BCD__ZNK4fltk12HighlightBox5_drawERKNS_9RectangleE(void *This, void *); 
     12extern (C) void _BCD__ZNK4fltk12HighlightBox5insetERNS_9RectangleE(void *This, void *); 
    1313extern (C) bool _BCD__ZNK4fltk12HighlightBox15fills_rectangleEv(void *This); 
    1414extern (C) bool _BCD__ZNK4fltk12HighlightBox8is_frameEv(void *This); 
    1515alias Symbol Box; 
    16 extern (C) void *_BCD_new__ZN4fltk12HighlightBoxC1EPKcPKNS_6SymbolE(void *This, char * n, void *d); 
     16extern (C) void *_BCD_new__ZN4fltk12HighlightBoxC1EPKcPKNS_6SymbolE(char *, void *); 
    1717extern (C) void _BCD_delete_N4fltk7FlatBoxE(void *); 
    18 extern (C) void _BCD__ZNK4fltk7FlatBox5_drawERKNS_9RectangleE(void *This, void *_0); 
     18extern (C) void _BCD__ZNK4fltk7FlatBox5_drawERKNS_9RectangleE(void *This, void *); 
    1919extern (C) bool _BCD__ZNK4fltk7FlatBox15fills_rectangleEv(void *This); 
    2020extern (C) bool _BCD__ZNK4fltk7FlatBox8is_frameEv(void *This); 
    21 extern (C) void *_BCD_new__ZN4fltk7FlatBoxC1EPKc(void *This, char * n); 
     21extern (C) void *_BCD_new__ZN4fltk7FlatBoxC1EPKc(char *); 
    2222extern (C) void _BCD_delete_N4fltk8FrameBoxE(void *); 
    2323extern (C) char * _BCD__ZNK4fltk8FrameBox4dataEv(void *This); 
    24 extern (C) void _BCD__ZNK4fltk8FrameBox5_drawERKNS_9RectangleE(void *This, void *_0); 
    25 extern (C) void _BCD__ZNK4fltk8FrameBox5insetERNS_9RectangleE(void *This, void *_0); 
     24extern (C) void _BCD__ZNK4fltk8FrameBox5_drawERKNS_9RectangleE(void *This, void *); 
     25extern (C) void _BCD__ZNK4fltk8FrameBox5insetERNS_9RectangleE(void *This, void *); 
    2626extern (C) int _BCD__ZNK4fltk8FrameBox2dxEv(void *This); 
    2727extern (C) int _BCD__ZNK4fltk8FrameBox2dyEv(void *This); 
    …… 
    3030extern (C) bool _BCD__ZNK4fltk8FrameBox15fills_rectangleEv(void *This); 
    3131extern (C) bool _BCD__ZNK4fltk8FrameBox8is_frameEv(void *This); 
    32 extern (C) void *_BCD_new__ZN4fltk8FrameBoxC1EPKciiiiS2_PKNS_6SymbolE(void *This, char * name, int dx, int dy, int dw, int dh, char * pattern, void *down); 
    33 extern (C) int _BCD__ZN4fltk6box_dhEPKNS_8FrameBoxE(void *b); 
    34 extern (C) int _BCD__ZN4fltk6box_dwEPKNS_8FrameBoxE(void *b); 
    35 extern (C) int _BCD__ZN4fltk6box_dyEPKNS_8FrameBoxE(void *b); 
    36 extern (C) int _BCD__ZN4fltk6box_dxEPKNS_8FrameBoxE(void *b); 
    37 extern (C) int _BCD__ZN4fltk6box_dhEPKNS_6SymbolE(void *b); 
    38 extern (C) int _BCD__ZN4fltk6box_dwEPKNS_6SymbolE(void *b); 
    39 extern (C) int _BCD__ZN4fltk6box_dyEPKNS_6SymbolE(void *b); 
    40 extern (C) int _BCD__ZN4fltk6box_dxEPKNS_6SymbolE(void *b); 
     32extern (C) void *_BCD_new__ZN4fltk8FrameBoxC1EPKciiiiS2_PKNS_6SymbolE(char *, int, int, int, int, char *, void *); 
     33extern (C) int _BCD__ZN4fltk6box_dhEPKNS_8FrameBoxE(void *); 
     34extern (C) int _BCD__ZN4fltk6box_dwEPKNS_8FrameBoxE(void *); 
     35extern (C) int _BCD__ZN4fltk6box_dyEPKNS_8FrameBoxE(void *); 
     36extern (C) int _BCD__ZN4fltk6box_dxEPKNS_8FrameBoxE(void *); 
     37extern (C) int _BCD__ZN4fltk6box_dhEPKNS_6SymbolE(void *); 
     38extern (C) int _BCD__ZN4fltk6box_dwEPKNS_6SymbolE(void *); 
     39extern (C) int _BCD__ZN4fltk6box_dyEPKNS_6SymbolE(void *); 
     40extern (C) int _BCD__ZN4fltk6box_dxEPKNS_6SymbolE(void *); 
    4141class HighlightBox : FlatBox { 
    4242this(ifloat ignore) { 
    4343super(ignore); 
    4444} 
     45this(ifloat ignore, void *x) { 
     46super(ignore); 
     47__C_data = x; 
     48__C_data_owned = false; 
     49} 
    4550~this() { 
    46 if (__C_data) _BCD_delete_N4fltk12HighlightBoxE(__C_data); 
     51if (__C_data && __C_data_owned) _BCD_delete_N4fltk12HighlightBoxE(__C_data); 
    4752__C_data = null; 
    4853} 
    …… 
    6166this(char * n, Symbol * d) { 
    6267super(cast(ifloat) 0); 
    63 __C_data = _BCD_new__ZN4fltk12HighlightBoxC1EPKcPKNS_6SymbolE(__C_data, n, d.__C_data); 
     68__C_data = _BCD_new__ZN4fltk12HighlightBoxC1EPKcPKNS_6SymbolE(n, d.__C_data); 
     69__C_data_owned = true; 
    6470} 
    6571} 
    …… 
    6874super(ignore); 
    6975} 
     76this(ifloat ignore, void *x) { 
     77super(ignore); 
     78__C_data = x; 
     79__C_data_owned = false; 
     80} 
    7081~this() { 
    71 if (__C_data) _BCD_delete_N4fltk7FlatBoxE(__C_data); 
     82if (__C_data && __C_data_owned) _BCD_delete_N4fltk7FlatBoxE(__C_data); 
    7283__C_data = null; 
    7384} 
    …… 
    8394this(char * n) { 
    8495super(cast(ifloat) 0); 
    85 __C_data = _BCD_new__ZN4fltk7FlatBoxC1EPKc(__C_data, n); 
     96__C_data = _BCD_new__ZN4fltk7FlatBoxC1EPKc(n); 
     97__C_data_owned = true; 
    8698} 
    8799} 
    …… 
    90102super(ignore); 
    91103} 
     104this(ifloat ignore, void *x) { 
     105super(ignore); 
     106__C_data = x; 
     107__C_data_owned = false; 
     108} 
    92109~this() { 
    93 if (__C_data) _BCD_delete_N4fltk8FrameBoxE(__C_data); 
     110if (__C_data && __C_data_owned) _BCD_delete_N4fltk8FrameBoxE(__C_data); 
    94111__C_data = null; 
    95112} 
    …… 
    123140this(char * name, int dx, int dy, int dw, int dh, char * pattern, Symbol * down) { 
    124141super(cast(ifloat) 0); 
    125 __C_data = _BCD_new__ZN4fltk8FrameBoxC1EPKciiiiS2_PKNS_6SymbolE(__C_data, name, dx, dy, dw, dh, pattern, down.__C_data); 
     142__C_data = _BCD_new__ZN4fltk8FrameBoxC1EPKciiiiS2_PKNS_6SymbolE(name, dx, dy, dw, dh, pattern, down.__C_data); 
     143__C_data_owned = true; 
    126144} 
    127145} 

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

    r58 r62  
    3636(This->draw()); 
    3737} 
    38 fltk::Browser *_BCD_new__ZN4fltk7BrowserC1EiiiiPKc(fltk::Browser *This, int X, int Y, int W, int H, const char * l) { 
     38fltk::Browser *_BCD_new__ZN4fltk7BrowserC1EiiiiPKc(int X, int Y, int W, int H, char const * l) { 
    3939return new fltk::Browser(X, Y, W, H, l); 
    4040} 
    …… 
    7878return (fltk::Widget *) (This->goto_position(y)); 
    7979} 
    80 fltk::Widget * _BCD__ZN4fltk7Browser10goto_indexEPKii(fltk::Browser *This, const int * indexes, int level) { 
     80fltk::Widget * _BCD__ZN4fltk7Browser10goto_indexEPKii(fltk::Browser *This, int const * indexes, int level) { 
    8181return (fltk::Widget *) (This->goto_index(indexes, level)); 
    8282} 
    …… 
    135135return (int) (This->current_level()); 
    136136} 
    137 const int * _BCD__ZNK4fltk7Browser13current_indexEv(fltk::Browser *This) { 
    138 return (const int *) (This->current_index()); 
     137int const * _BCD__ZNK4fltk7Browser13current_indexEv(fltk::Browser *This) { 
     138return (int const *) (This->current_index()); 
    139139} 
    140140int _BCD__ZNK4fltk7Browser16current_positionEv(fltk::Browser *This) { 
    …… 
    150150return (int) (This->value()); 
    151151} 
    152 const int * _BCD__ZNK4fltk7Browser13column_widthsEv(fltk::Browser *This) { 
    153 return (const int *) (This->column_widths()); 
    154 } 
    155 void _BCD__ZN4fltk7Browser13column_widthsEPKi(fltk::Browser *This, const int * pWidths) { 
     152int const * _BCD__ZNK4fltk7Browser13column_widthsEv(fltk::Browser *This) { 
     153return (int const *) (This->column_widths()); 
     154} 
     155void _BCD__ZN4fltk7Browser13column_widthsEPKi(fltk::Browser *This, int const * pWidths) { 
    156156(This->column_widths(pWidths)); 
    157157} 
    158 const char * * _BCD__ZNK4fltk7Browser13column_labelsEv(fltk::Browser *This) { 
    159 return (const char * *) (This->column_labels()); 
    160 } 
    161 void _BCD__ZN4fltk7Browser13column_labelsEPPKc(fltk::Browser *This, const char * * pLabels) { 
     158char const * * _BCD__ZNK4fltk7Browser13column_labelsEv(fltk::Browser *This) { 
     159return (char const * *) (This->column_labels()); 
     160} 
     161void _BCD__ZN4fltk7Browser13column_labelsEPPKc(fltk::Browser *This, char const * * pLabels) { 
    162162(This->column_labels(pLabels)); 
    163163} 
    …… 
    198198return (int) (This->nheader()); 
    199199} 
    200 int _BCD__ZN4fltk7Browser4loadEPKc(fltk::Browser *This, const char * filename) { 
     200int _BCD__ZN4fltk7Browser4loadEPKc(fltk::Browser *This, char const * filename) { 
    201201return (int) (This->load(filename)); 
    202202} 
    203 void _BCD__ZN4fltk7Browser10set_symbolENS0_8NodeTypeEPKNS_6SymbolES4_S4_(fltk::Browser *This, enum fltk::Browser::NodeType nodetype, const fltk::Symbol * imgClosed, const fltk::Symbol * imgFocus, const fltk::Symbol * imgOpen) { 
     203void _BCD__ZN4fltk7Browser10set_symbolENS0_8NodeTypeEPKNS_6SymbolES4_S4_(fltk::Browser *This, enum fltk::Browser::NodeType nodetype, fltk::Symbol const * imgClosed, fltk::Symbol const * imgFocus, fltk::Symbol const * imgOpen) { 
    204204(This->set_symbol(nodetype, imgClosed, imgFocus, imgOpen)); 
    205205} 
    206206typedef int _BCD_Flags; 
    207 const fltk::Symbol * _BCD__ZNK4fltk7Browser10get_symbolENS0_8NodeTypeEi(fltk::Browser *This, enum fltk::Browser::NodeType nodetype, _BCD_Flags f) { 
    208 return (const fltk::Symbol *) (This->get_symbol(nodetype, f)); 
    209 } 
    210 fltk::ItemGroup * _BCD__ZN4fltk7Browser9add_groupEPKcPNS_5GroupEiPKNS_6SymbolES7_S7_(fltk::Browser *This, const char * label, fltk::Group * parent, int state, const fltk::Symbol * imgClosed, const fltk::Symbol * imgFocus, const fltk::Symbol * imgOpen) { 
     207fltk::Symbol const * _BCD__ZNK4fltk7Browser10get_symbolENS0_8NodeTypeEi(fltk::Browser *This, enum fltk::Browser::NodeType nodetype, _BCD_Flags f) { 
     208return (fltk::Symbol const *) (This->get_symbol(nodetype, f)); 
     209} 
     210fltk::ItemGroup * _BCD__ZN4fltk7Browser9add_groupEPKcPNS_5GroupEiPKNS_6SymbolES7_S7_(fltk::Browser *This, char const * label, fltk::Group * parent, int state, fltk::Symbol const * imgClosed, fltk::Symbol const * imgFocus, fltk::Symbol const * imgOpen) { 
    211211return (fltk::ItemGroup *) (This->add_group(label, parent, state, imgClosed, imgFocus, imgOpen)); 
    212212} 
    213 fltk::Item * _BCD__ZN4fltk7Browser8add_leafEPKcPNS_5GroupEPKNS_6SymbolES7_(fltk::Browser *This, const char * label, fltk::Group * parent, const fltk::Symbol * img, const fltk::Symbol * imgFocus) { 
     213fltk::Item * _BCD__ZN4fltk7Browser8add_leafEPKcPNS_5GroupEPKNS_6SymbolES7_(fltk::Browser *This, char const * label, fltk::Group * parent, fltk::Symbol const * img, fltk::Symbol const * imgFocus) { 
    214214return (fltk::Item *) (This->add_leaf(label, parent, img, imgFocus)); 
    215215} 
    216 void _BCD__ZN4fltk7Browser7replaceERNS_6WidgetES2_(fltk::Browser *This, fltk::Widget & old, fltk::Widget & o) { 
     216void _BCD__ZN4fltk7Browser7replaceERNS_6WidgetES2_(fltk::Browser *This, fltk::Widget   & old, fltk::Widget  & o) { 
    217217(This->replace(old, o)); 
    218218} 
    219 void _BCD__ZN4fltk7Browser6removeERNS_6WidgetE(fltk::Browser *This, fltk::Widget & o) { 
     219void _BCD__ZN4fltk7Browser6removeERNS_6WidgetE(fltk::Browser *This, fltk::Widget   & o) { 
    220220(This->remove(o)); 
    221221} 

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

    r58 r62  
    2020extern (C) void _BCD_set__ZN4fltk7Browser10hscrollbarE(void *, Scrollbar); 
    2121extern (C) Scrollbar _BCD_get__ZN4fltk7Browser10hscrollbarE(void *); 
    22 extern (C) int _BCD__ZN4fltk7Browser6handleEi(void *This, int _0); 
     22extern (C) int _BCD__ZN4fltk7Browser6handleEi(void *This, int); 
    2323extern (C) void _BCD__ZN4fltk7Browser6layoutEv(void *This); 
    2424extern (C) void _BCD__ZN4fltk7Browser4drawEv(void *This); 
    25 extern (C) void *_BCD_new__ZN4fltk7BrowserC1EiiiiPKc(void *This, int X, int Y, int W, int H, char * l); 
     25extern (C) void *_BCD_new__ZN4fltk7BrowserC1EiiiiPKc(int, int, int, int, char *); 
    2626extern (C) int _BCD__ZNK4fltk7Browser5widthEv(void *This); 
    2727extern (C) int _BCD__ZNK4fltk7Browser6heightEv(void *This); 
    …… 
    2929extern (C) int _BCD__ZNK4fltk7Browser10box_heightEv(void *This); 
    3030extern (C) int _BCD__ZNK4fltk7Browser9xpositionEv(void *This); 
    31 extern (C) void _BCD__ZN4fltk7Browser9xpositionEi(void *This, int _0); 
     31extern (C) void _BCD__ZN4fltk7Browser9xpositionEi(void *This, int); 
    3232extern (C) int _BCD__ZNK4fltk7Browser9ypositionEv(void *This); 
    33 extern (C) void _BCD__ZN4fltk7Browser9ypositionEi(void *This, int _0); 
     33extern (C) void _BCD__ZN4fltk7Browser9ypositionEi(void *This, int); 
    3434extern (C) bool _BCD__ZNK4fltk7Browser8indentedEv(void *This); 
    35 extern (C) void _BCD__ZN4fltk7Browser8indentedEb(void *This, bool v); 
     35extern (C) void _BCD__ZN4fltk7Browser8indentedEb(void *This, bool); 
    3636extern (C) Widget * _BCD__ZN4fltk7Browser8goto_topEv(void *This); 
    3737extern (C) Widget * _BCD__ZN4fltk7Browser10goto_focusEv(void *This); 
    38 extern (C) Widget * _BCD__ZN4fltk7Browser13goto_positionEi(void *This, int y); 
    39 extern (C) Widget * _BCD__ZN4fltk7Browser10goto_indexEPKii(void *This, int * indexes, int level); 
    40 extern (C) Widget * _BCD__ZN4fltk7Browser10goto_indexEi(void *This, int _0); 
    41 extern (C) Widget * _BCD__ZN4fltk7Browser10goto_indexEiiiii(void *This, int _0, int _1, int _2, int _3, int _4); 
     38extern (C) Widget * _BCD__ZN4fltk7Browser13goto_positionEi(void *This, int); 
     39extern (C) Widget * _BCD__ZN4fltk7Browser10goto_indexEPKii(void *This, int *, int); 
     40extern (C) Widget * _BCD__ZN4fltk7Browser10goto_indexEi(void *This, int); 
     41extern (C) Widget * _BCD__ZN4fltk7Browser10goto_indexEiiiii(void *This, int, int, int, int, int); 
    4242extern (C) Widget * _BCD__ZN4fltk7Browser4nextEv(void *This); 
    4343extern (C) Widget * _BCD__ZN4fltk7Browser12next_visibleEv(void *This); 
    …… 
    4848extern (C) int _BCD__ZNK4fltk7Browser6item_hEv(void *This); 
    4949extern (C) bool _BCD__ZN4fltk7Browser9set_focusEv(void *This); 
    50 extern (C) bool _BCD__ZN4fltk7Browser17set_item_selectedEbi(void *This, bool value, int do_callback); 
    51 extern (C) bool _BCD__ZN4fltk7Browser16select_only_thisEi(void *This, int do_callback); 
    52 extern (C) bool _BCD__ZN4fltk7Browser8deselectEi(void *This, int do_callback); 
     50extern (C) bool _BCD__ZN4fltk7Browser17set_item_selectedEbi(void *This, bool, int); 
     51extern (C) bool _BCD__ZN4fltk7Browser16select_only_thisEi(void *This, int); 
     52extern (C) bool _BCD__ZN4fltk7Browser8deselectEi(void *This, int); 
    5353enum linepos { 
    5454NOSCROLL=0, 
    …… 
    5757BOTTOM=3, 
    5858} 
    59 extern (C) bool _BCD__ZN4fltk7Browser17make_item_visibleENS0_7lineposE(void *This, int _0); 
     59extern (C) bool _BCD__ZN4fltk7Browser17make_item_visibleENS0_7lineposE(void *This, int); 
    6060extern (C) void _BCD__ZN4fltk7Browser11damage_itemEv(void *This); 
    61 extern (C) bool _BCD__ZN4fltk7Browser15set_item_openedEb(void *This, bool _0); 
    62 extern (C) bool _BCD__ZN4fltk7Browser16set_item_visibleEb(void *This, bool _0); 
     61extern (C) bool _BCD__ZN4fltk7Browser15set_item_openedEb(void *This, bool); 
     62extern (C) bool _BCD__ZN4fltk7Browser16set_item_visibleEb(void *This, bool); 
    6363extern (C) int _BCD__ZNK4fltk7Browser13current_levelEv(void *This); 
    6464extern (C) int * _BCD__ZNK4fltk7Browser13current_indexEv(void *This); 
    …… 
    6868extern (C) int _BCD__ZNK4fltk7Browser5valueEv(void *This); 
    6969extern (C) int * _BCD__ZNK4fltk7Browser13column_widthsEv(void *This); 
    70 extern (C) void _BCD__ZN4fltk7Browser13column_widthsEPKi(void *This, int * pWidths); 
     70extern (C) void _BCD__ZN4fltk7Browser13column_widthsEPKi(void *This, int *); 
    7171extern (C) char * * _BCD__ZNK4fltk7Browser13column_labelsEv(void *This); 
    72 extern (C) void _BCD__ZN4fltk7Browser13column_labelsEPPKc(void *This, char * * pLabels); 
     72extern (C) void _BCD__ZN4fltk7Browser13column_labelsEPPKc(void *This, char * *); 
    7373extern (C) int _BCD__ZN4fltk7Browser15selected_columnEv(void *This); 
    74 extern (C) int _BCD__ZN4fltk7Browser16set_column_startEii(void *This, int column, int x); 
    75 extern (C) bool _BCD__ZN4fltk7Browser6selectEib(void *This, int line, bool value); 
    76 extern (C) bool _BCD__ZN4fltk7Browser8selectedEi(void *This, int line); 
     74extern (C) int _BCD__ZN4fltk7Browser16set_column_startEii(void *This, int, int); 
     75extern (C) bool _BCD__ZN4fltk7Browser6selectEib(void *This, int, bool); 
     76extern (C) bool _BCD__ZN4fltk7Browser8selectedEi(void *This, int); 
    7777extern (C) int _BCD__ZNK4fltk7Browser7toplineEv(void *This); 
    78 extern (C) void _BCD__ZN4fltk7Browser7toplineEi(void *This, int line); 
    79 extern (C) void _BCD__ZN4fltk7Browser10bottomlineEi(void *This, int line); 
    80 extern (C) void _BCD__ZN4fltk7Browser10middlelineEi(void *This, int line); 
    81 extern (C) bool _BCD__ZN4fltk7Browser9displayedEi(void *This, int line); 
    82 extern (C) bool _BCD__ZN4fltk7Browser7displayEib(void *This, int line, bool value); 
    83 extern (C) Widget * _BCD__ZN4fltk7Browser6headerEi(void *This, int col); 
     78extern (C) void _BCD__ZN4fltk7Browser7toplineEi(void *This, int); 
     79extern (C) void _BCD__ZN4fltk7Browser10bottomlineEi(void *This, int); 
     80extern (C) void _BCD__ZN4fltk7Browser10middlelineEi(void *This, int); 
     81extern (C) bool _BCD__ZN4fltk7Browser9displayedEi(void *This, int); 
     82extern (C) bool _BCD__ZN4fltk7Browser7displayEib(void *This, int, bool); 
     83extern (C) Widget * _BCD__ZN4fltk7Browser6headerEi(void *This, int); 
    8484extern (C) int _BCD__ZNK4fltk7Browser7nheaderEv(void *This); 
    85 extern (C) int _BCD__ZN4fltk7Browser4loadEPKc(void *This, char * filename); 
     85extern (C) int _BCD__ZN4fltk7Browser4loadEPKc(void *This, char *); 
    8686enum NodeType { 
    8787GROUP=0, 
    8888LEAF=1, 
    8989} 
    90 extern (C) void _BCD__ZN4fltk7Browser10set_symbolENS0_8NodeTypeEPKNS_6SymbolES4_S4_(void *This, int nodetype, void *imgClosed, void *imgFocus, void *imgOpen); 
    91 extern (C) bcd.bind.BoundClass * _BCD__ZNK4fltk7Browser10get_symbolENS0_8NodeTypeEi(void *This, int nodetype, int f); 
    92 extern (C) bcd.bind.BoundClass * _BCD__ZN4fltk7Browser9add_groupEPKcPNS_5GroupEiPKNS_6SymbolES7_S7_(void *This, char * label, void *parent, int state, void *imgClosed, void *imgFocus, void *imgOpen); 
    93 extern (C) bcd.bind.BoundClass * _BCD__ZN4fltk7Browser8add_leafEPKcPNS_5GroupEPKNS_6SymbolES7_(void *This, char * label, void *parent, void *img, void *imgFocus); 
    94 extern (C) void _BCD__ZN4fltk7Browser7replaceERNS_6WidgetES2_(void *This, void *old, void *o); 
    95 extern (C) void _BCD__ZN4fltk7Browser6removeERNS_6WidgetE(void *This, void *o); 
    96 extern (C) void _BCD__ZN4fltk7Browser6removeEPNS_6WidgetE(void *This, void *o); 
    97 extern (C) void _BCD__ZN4fltk7Browser6removeEi(void *This, int index); 
    98 extern (C) void _BCD__ZN4fltk7Browser13notify_removeEPNS_6WidgetE(void *This, void *o); 
     90extern (C) void _BCD__ZN4fltk7Browser10set_symbolENS0_8NodeTypeEPKNS_6SymbolES4_S4_(void *This, int, void *, void *, void *); 
     91extern (C) bcd.bind.BoundClass * _BCD__ZNK4fltk7Browser10get_symbolENS0_8NodeTypeEi(void *This, int, int); 
     92extern (C) bcd.bind.BoundClass * _BCD__ZN4fltk7Browser9add_groupEPKcPNS_5GroupEiPKNS_6SymbolES7_S7_(void *This, char *, void *, int, void *, void *, void *); 
     93extern (C) bcd.bind.BoundClass * _BCD__ZN4fltk7Browser8add_leafEPKcPNS_5GroupEPKNS_6SymbolES7_(void *This, char *, void *, void *, void *); 
     94extern (C) void _BCD__ZN4fltk7Browser7replaceERNS_6WidgetES2_(void *This, void *, void *); 
     95extern (C) void _BCD__ZN4fltk7Browser6removeERNS_6WidgetE(void *This, void *); 
     96extern (C) void _BCD__ZN4fltk7Browser6removeEPNS_6WidgetE(void *This, void *); 
     97extern (C) void _BCD__ZN4fltk7Browser6removeEi(void *This, int); 
     98extern (C) void _BCD__ZN4fltk7Browser13notify_removeEPNS_6WidgetE(void *This, void *); 
    9999extern (C) void _BCD__ZN4fltk7Browser5clearEv(void *This); 
    100100alias void function(Widget *, int) _BCD_func__159; 
    …… 
    106106super(ignore); 
    107107} 
     108this(ifloat ignore, void *x) { 
     109super(ignore); 
     110__C_data = x; 
     111__C_data_owned = false; 
     112} 
    108113~this() { 
    109 if (__C_data) _BCD_delete_N4fltk7BrowserE(__C_data); 
     114if (__C_data && __C_data_owned) _BCD_delete_N4fltk7BrowserE(__C_data); 
    110115__C_data = null; 
    111116} 
    …… 
    139144this(int X, int Y, int W, int H, char * l) { 
    140145super(cast(ifloat) 0); 
    141 __C_data = _BCD_new__ZN4fltk7BrowserC1EiiiiPKc(__C_data, X, Y, W, H, l); 
     146__C_data = _BCD_new__ZN4fltk7BrowserC1EiiiiPKc(X, Y, W, H, l); 
     147__C_data_owned = true; 
    142148} 
    143149int width() { 

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

    r58