fxruby 1.2.4 → 1.2.5

Sign up to get free protection for your applications and to get access to all the features.
@@ -21,7 +21,7 @@
21
21
  ***********************************************************************/
22
22
 
23
23
  /***********************************************************************
24
- * $Id: FXRbBitmapView.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
24
+ * $Id: FXRbBitmapView.h,v 1.2 2005/02/27 21:05:22 lyle Exp $
25
25
  ***********************************************************************/
26
26
 
27
27
  #ifndef FXRBBITMAPVIEW_H
@@ -40,13 +40,17 @@ public:
40
40
  /// Construct a scroll window
41
41
  FXRbBitmapView(FXComposite* p,FXBitmap* bmp=NULL,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXBitmapView(p,bmp,tgt,sel,opts,x,y,w,h){}
42
42
 
43
+ // Mark dependencies for the GC
44
+ static void markfunc(FXBitmapView* self);
45
+
46
+ // Unregister objects that this bitmap view owns and is about to destroy
47
+ static void unregisterOwnedObjects(FXBitmapView *pBitmapView);
48
+
43
49
  // Destructor
44
50
  virtual ~FXRbBitmapView(){
51
+ FXRbBitmapView::unregisterOwnedObjects(this);
45
52
  FXRbUnregisterRubyObj(this);
46
53
  }
47
-
48
- // Mark dependencies for the GC
49
- static void markfunc(FXBitmapView* self);
50
54
  };
51
55
 
52
56
  #endif
@@ -21,7 +21,7 @@
21
21
  ***********************************************************************/
22
22
 
23
23
  /***********************************************************************
24
- * $Id: FXRbFoldingList.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
24
+ * $Id: FXRbFoldingList.h,v 1.2 2005/02/27 21:05:22 lyle Exp $
25
25
  ***********************************************************************/
26
26
 
27
27
  #ifndef FXRBFOLDINGLIST_H
@@ -170,12 +170,16 @@ public:
170
170
  // Mark dependencies for the GC
171
171
  static void markfunc(FXFoldingList* self);
172
172
 
173
+ // Unregister objects that this folding list owns and is about to destroy
174
+ static void unregisterOwnedObjects(FXFoldingList *pFoldingList);
175
+
173
176
  // Enumerate items
174
177
  static void enumerateItem(FXFoldingItem* item,FXObjectListOf<FXFoldingItem>& items);
175
178
  static void enumerateItems(FXFoldingItem* fm,FXFoldingItem* to,FXObjectListOf<FXFoldingItem>& items);
176
179
 
177
180
  // Destructor
178
181
  virtual ~FXRbFoldingList(){
182
+ FXRbFoldingList::unregisterOwnedObjects(this);
179
183
  FXRbUnregisterRubyObj(this);
180
184
  }
181
185
  };
@@ -21,7 +21,7 @@
21
21
  ***********************************************************************/
22
22
 
23
23
  /***********************************************************************
24
- * $Id: FXRbHeader.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
24
+ * $Id: FXRbHeader.h,v 1.2 2005/02/27 21:05:22 lyle Exp $
25
25
  ***********************************************************************/
26
26
 
27
27
  #ifndef FXRBHEADER_H
@@ -116,8 +116,12 @@ public:
116
116
  // Mark dependencies for the GC
117
117
  static void markfunc(FXHeader* self);
118
118
 
119
+ // Unregister objects that this header owns and is about to destroy
120
+ static void unregisterOwnedObjects(FXHeader *pHeader);
121
+
119
122
  // Destructor
120
123
  virtual ~FXRbHeader(){
124
+ unregisterOwnedObjects(this);
121
125
  FXRbUnregisterRubyObj(this);
122
126
  }
123
127
  };
@@ -21,7 +21,7 @@
21
21
  ***********************************************************************/
22
22
 
23
23
  /***********************************************************************
24
- * $Id: FXRbIconList.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
24
+ * $Id: FXRbIconList.h,v 1.2 2005/02/27 21:05:22 lyle Exp $
25
25
  ***********************************************************************/
26
26
 
27
27
  #ifndef FXRBICONLIST_H
@@ -254,11 +254,15 @@ public:
254
254
  // Mark dependencies for the GC
255
255
  static void markfunc(FXIconList* self);
256
256
 
257
+ // Unregister objects that this icon list owns and is about to destroy
258
+ static void unregisterOwnedObjects(FXIconList *pIconList);
259
+
257
260
  // Sort function stand-in
258
261
  static FXint sortFunc(const FXIconItem* a,const FXIconItem* b);
259
262
 
260
263
  // Destructor
261
264
  virtual ~FXRbIconList(){
265
+ FXRbIconList::unregisterOwnedObjects(this);
262
266
  FXRbUnregisterRubyObj(this);
263
267
  }
264
268
  };
@@ -21,7 +21,7 @@
21
21
  ***********************************************************************/
22
22
 
23
23
  /***********************************************************************
24
- * $Id: FXRbImageView.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
24
+ * $Id: FXRbImageView.h,v 1.2 2005/02/27 21:05:22 lyle Exp $
25
25
  ***********************************************************************/
26
26
 
27
27
  #ifndef FXRBIMAGEVIEW_H
@@ -40,13 +40,16 @@ public:
40
40
  /// Construct a scroll window
41
41
  FXRbImageView(FXComposite* p,FXImage* img=NULL,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXImageView(p,img,tgt,sel,opts,x,y,w,h){}
42
42
 
43
+ // Mark dependencies for the GC
44
+ static void markfunc(FXImageView* self);
45
+
46
+ // Unregister objects that this image view owns and is about to destroy
47
+ static void unregisterOwnedObjects(FXImageView *pImageView);
48
+
43
49
  // Destructor
44
50
  virtual ~FXRbImageView(){
45
51
  FXRbUnregisterRubyObj(this);
46
52
  }
47
-
48
- // Mark dependencies for the GC
49
- static void markfunc(FXImageView* self);
50
53
  };
51
54
 
52
55
  #endif
@@ -21,7 +21,7 @@
21
21
  ***********************************************************************/
22
22
 
23
23
  /***********************************************************************
24
- * $Id: FXRbList.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
24
+ * $Id: FXRbList.h,v 1.2 2005/02/27 21:05:22 lyle Exp $
25
25
  ***********************************************************************/
26
26
 
27
27
  #ifndef FXRBLIST_H
@@ -195,8 +195,12 @@ public:
195
195
  // Mark dependencies for the GC
196
196
  static void markfunc(FXList* self);
197
197
 
198
+ // Unregister objects that this list owns and is about to destroy
199
+ static void unregisterOwnedObjects(FXList *pList);
200
+
198
201
  // Destructor
199
202
  virtual ~FXRbList(){
203
+ FXRbList::unregisterOwnedObjects(this);
200
204
  FXRbUnregisterRubyObj(this);
201
205
  }
202
206
  };
@@ -21,7 +21,7 @@
21
21
  ***********************************************************************/
22
22
 
23
23
  /***********************************************************************
24
- * $Id: FXRbScrollArea.h,v 1.2 2005/02/22 14:47:14 lyle Exp $
24
+ * $Id: FXRbScrollArea.h,v 1.3 2005/02/27 21:05:22 lyle Exp $
25
25
  ***********************************************************************/
26
26
 
27
27
  #ifndef FXRBSCROLLAREA_H
@@ -73,11 +73,13 @@ public:
73
73
  // Mark dependencies for the GC
74
74
  static void markfunc(FXScrollArea* self);
75
75
 
76
+ // Unregister objects that this scroll area owns and is about to destroy
77
+ static void unregisterOwnedObjects(FXScrollArea *pScrollArea);
78
+
76
79
  // Destructor
77
80
  virtual ~FXRbScrollArea(){
78
- FXRbUnregisterRubyObj(horizontal);
79
- FXRbUnregisterRubyObj(vertical);
80
- FXRbUnregisterRubyObj(corner);
81
+ FXRbScrollArea::unregisterOwnedObjects(this);
82
+ FXRbUnregisterRubyObj(corner); // must do this here; no public accessor method for it
81
83
  FXRbUnregisterRubyObj(this);
82
84
  }
83
85
  };
@@ -21,7 +21,7 @@
21
21
  ***********************************************************************/
22
22
 
23
23
  /***********************************************************************
24
- * $Id: FXRbScrollWindow.h,v 1.2 2005/02/22 14:47:14 lyle Exp $
24
+ * $Id: FXRbScrollWindow.h,v 1.3 2005/02/27 21:05:22 lyle Exp $
25
25
  ***********************************************************************/
26
26
 
27
27
  #ifndef FXRBSCROLLWINDOW_H
@@ -40,16 +40,18 @@ public:
40
40
  /// Construct a scroll window
41
41
  FXRbScrollWindow(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXScrollWindow(p,opts,x,y,w,h){}
42
42
 
43
+ // Mark dependencies for the GC
44
+ static void markfunc(FXScrollWindow* self);
45
+
46
+ // Unregister objects that this scroll window owns and is about to destroy
47
+ static void unregisterOwnedObjects(FXScrollWindow *pScrollWindow);
48
+
43
49
  // Destructor
44
50
  virtual ~FXRbScrollWindow(){
45
- FXRbUnregisterRubyObj(horizontal);
46
- FXRbUnregisterRubyObj(vertical);
47
- FXRbUnregisterRubyObj(corner);
51
+ FXRbScrollWindow::unregisterOwnedObjects(this);
52
+ FXRbUnregisterRubyObj(corner); // created by FXScrollArea; must do this here; no public accessor method for it
48
53
  FXRbUnregisterRubyObj(this);
49
54
  }
50
-
51
- // Mark dependencies for the GC
52
- static void markfunc(FXScrollWindow* self);
53
55
  };
54
56
 
55
57
  #endif
@@ -21,7 +21,7 @@
21
21
  ***********************************************************************/
22
22
 
23
23
  /***********************************************************************
24
- * $Id: FXRbTable.h,v 1.3 2005/02/22 14:50:43 lyle Exp $
24
+ * $Id: FXRbTable.h,v 1.6 2005/02/27 21:05:22 lyle Exp $
25
25
  ***********************************************************************/
26
26
 
27
27
  #ifndef FXRBTABLE_H
@@ -207,7 +207,17 @@ inline FXTableItem* klass ## _createItem(klass* self,const FXString& text,FXIcon
207
207
  return dynamic_cast<subklass*>(self)->public_createItem(text,icon,ptr); \
208
208
  } \
209
209
  inline void klass ## _setTableSize(klass* self,FXint nr,FXint nc,FXbool notify){ \
210
+ if(nr<0 || nc<0) rb_raise(rb_eArgError,"numbers of rows and columns must be zero or greater"); \
211
+ FXObjectListOf<FXTableItem> items; \
212
+ for(FXint r=0;r<self->getNumRows();r++){ \
213
+ for(FXint c=0;c<self->getNumColumns();c++){ \
214
+ items.append(self->getItem(r,c)); \
215
+ } \
216
+ } \
210
217
  self->klass::setTableSize(nr,nc,notify); \
218
+ for(FXint i=0;i<items.no();i++){ \
219
+ FXRbUnregisterRubyObj(items[i]); \
220
+ } \
211
221
  } \
212
222
  inline void klass ## _insertRows(klass* self,FXint row,FXint nr,FXbool notify){ \
213
223
  self->klass::insertRows(row,nr,notify); \
@@ -407,14 +417,15 @@ public:
407
417
  // Mark dependencies for the GC
408
418
  static void markfunc(FXTable* self);
409
419
 
420
+ // Unregister objects that this table owns and is about to destroy
421
+ static void unregisterOwnedObjects(FXTable *pTable);
422
+
410
423
  // Destructor
411
424
  virtual ~FXRbTable(){
425
+ FXRbTable::unregisterOwnedObjects(this);
426
+ FXRbUnregisterRubyObj(corner); // created by FXScrollArea; must do this here; no public accessor method for it
427
+ FXRbUnregisterRubyObj(cornerButton); // must do this here; no public accessor method for it
412
428
  FXRbUnregisterRubyObj(this);
413
- for(FXint r=0; r<getNumRows(); r++){
414
- for(FXint c=0; c<getNumColumns(); c++){
415
- FXRbUnregisterRubyObj(getItem(r,c));
416
- }
417
- }
418
429
  }
419
430
  };
420
431
 
@@ -21,7 +21,7 @@
21
21
  ***********************************************************************/
22
22
 
23
23
  /***********************************************************************
24
- * $Id: FXRbText.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
24
+ * $Id: FXRbText.h,v 1.2 2005/02/27 21:05:22 lyle Exp $
25
25
  ***********************************************************************/
26
26
 
27
27
  #ifndef FXRBTEXT_H
@@ -74,16 +74,21 @@ public:
74
74
  // Style array
75
75
  FXHiliteStyle *styles;
76
76
 
77
+
78
+ // Mark dependencies for the GC
79
+ static void markfunc(FXText* self);
80
+
81
+ // Unregister objects that this text owns and is about to destroy
82
+ static void unregisterOwnedObjects(FXText *pText);
83
+
77
84
  // Destructor
78
85
  virtual ~FXRbText(){
79
86
  numStyles=0;
80
87
  delete [] styles;
81
88
  styles=(FXHiliteStyle*)-1;
89
+ FXRbText::unregisterOwnedObjects(this);
82
90
  FXRbUnregisterRubyObj(this);
83
91
  }
84
-
85
- // Mark dependencies for the GC
86
- static void markfunc(FXText* self);
87
92
  };
88
93
 
89
94
  #endif
@@ -21,7 +21,7 @@
21
21
  ***********************************************************************/
22
22
 
23
23
  /***********************************************************************
24
- * $Id: FXRbTreeList.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
24
+ * $Id: FXRbTreeList.h,v 1.2 2005/02/27 21:05:22 lyle Exp $
25
25
  ***********************************************************************/
26
26
 
27
27
  #ifndef FXRBTREELIST_H
@@ -236,12 +236,16 @@ public:
236
236
  // Mark dependencies for the GC
237
237
  static void markfunc(FXTreeList* self);
238
238
 
239
+ // Unregister objects that this tree list owns and is about to destroy
240
+ static void unregisterOwnedObjects(FXTreeList *pTreeList);
241
+
239
242
  // Enumerate items
240
243
  static void enumerateItem(FXTreeItem* item,FXObjectListOf<FXTreeItem>& items);
241
244
  static void enumerateItems(FXTreeItem* fm,FXTreeItem* to,FXObjectListOf<FXTreeItem>& items);
242
245
 
243
246
  // Destructor
244
247
  virtual ~FXRbTreeList(){
248
+ FXRbTreeList::unregisterOwnedObjects(this);
245
249
  FXRbUnregisterRubyObj(this);
246
250
  }
247
251
  };
@@ -660,24 +660,14 @@ void FXList_removeItem(FXList *self,FXint index,FXbool notify){
660
660
  }
661
661
  void FXList_clearItems(FXList *self,FXbool notify){
662
662
  // Save pointers to the soon-to-be-destroyed items
663
- FXint numItems=self->getNumItems();
664
- FXListItem** items=0;
665
- if(FXMALLOC(&items,FXListItem*,numItems)){
666
- for(FXint i=0; i<numItems; i++){
667
- items[i]=self->getItem(i);
668
- }
669
- }
663
+ FXObjectListOf<FXListItem> items;
664
+ for(FXint i=0; i<self->getNumItems(); i++) items.append(self->getItem(i));
670
665
 
671
666
  // Do the deed
672
667
  self->clearItems(notify);
673
668
 
674
669
  // Now zero-out pointers held by still-alive Ruby objects
675
- if(items){
676
- for(FXint i=0; i<numItems; i++){
677
- FXRbUnregisterRubyObj(items[i]);
678
- }
679
- FXFREE(&items);
680
- }
670
+ for(FXint j=0; j<items.no(); j++) FXRbUnregisterRubyObj(items[j]);
681
671
  }
682
672
  void FXList_makeItemVisible__SWIG_1(FXList *self,FXListItem *item){
683
673
  FXint numItems=self->getNumItems();
@@ -523,17 +523,15 @@ SWIGIMPORT(void) SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_ty
523
523
  #define SWIGTYPE_p_FXComposite swig_types[4]
524
524
  #define SWIGTYPE_p_FXId swig_types[5]
525
525
  #define SWIGTYPE_p_FXFont swig_types[6]
526
- #define SWIGTYPE_p_p_FXchar swig_types[7]
527
- #define SWIGTYPE_p_FXTable swig_types[8]
528
- #define SWIGTYPE_p_FXStream swig_types[9]
529
- #define SWIGTYPE_p_FXDrawable swig_types[10]
530
- #define SWIGTYPE_p_FXTableRange swig_types[11]
531
- #define SWIGTYPE_p_FXIcon swig_types[12]
532
- #define SWIGTYPE_p_FXHeader swig_types[13]
533
- #define SWIGTYPE_p_FXTableItem swig_types[14]
534
- #define SWIGTYPE_p_FXint swig_types[15]
535
- #define SWIGTYPE_p_FXTablePos swig_types[16]
536
- static swig_type_info *swig_types[18];
526
+ #define SWIGTYPE_p_FXTable swig_types[7]
527
+ #define SWIGTYPE_p_FXStream swig_types[8]
528
+ #define SWIGTYPE_p_FXDrawable swig_types[9]
529
+ #define SWIGTYPE_p_FXTableRange swig_types[10]
530
+ #define SWIGTYPE_p_FXIcon swig_types[11]
531
+ #define SWIGTYPE_p_FXHeader swig_types[12]
532
+ #define SWIGTYPE_p_FXTableItem swig_types[13]
533
+ #define SWIGTYPE_p_FXTablePos swig_types[14]
534
+ static swig_type_info *swig_types[16];
537
535
 
538
536
  /* -------- TYPES TABLE (END) -------- */
539
537
 
@@ -624,13 +622,13 @@ void FXTable_setItem(FXTable *self,FXint row,FXint col,FXTableItem *item,FXbool
624
622
  self->setItem(row,col,item,notify);
625
623
  }
626
624
  FXint FXTable_getColumnX(FXTable const *self,FXint colEdge){
627
- if(colEdge<0 || colEdge>self->getNumColumns()){
625
+ if(colEdge<0 || self->getColumnHeader()->getNumItems()<=colEdge){
628
626
  rb_raise(rb_eIndexError,"table column out of bounds");
629
627
  }
630
628
  return self->getColumnX(colEdge);
631
629
  }
632
630
  FXint FXTable_getRowY(FXTable const *self,FXint rowEdge){
633
- if(rowEdge<0 || rowEdge>self->getNumRows()){
631
+ if(rowEdge<0 || self->getRowHeader()->getNumItems()<=rowEdge){
634
632
  rb_raise(rb_eIndexError,"table row out of bounds");
635
633
  }
636
634
  return self->getRowY(rowEdge);
@@ -663,13 +661,25 @@ VALUE FXTable_getItemData(FXTable const *self,FXint r,FXint c){
663
661
  void* ptr=self->getItemData(r,c);
664
662
  return (ptr!=0) ? reinterpret_cast<VALUE>(ptr) : Qnil;
665
663
  }
664
+ VALUE FXTable_extractText(FXTable const *self,FXint startrow,FXint endrow,FXint startcol,FXint endcol,FXchar cs,FXchar rs){
665
+ FXchar* text;
666
+ FXint size;
667
+ VALUE result;
668
+ if(startrow<0 || startcol<0 || self->getNumRows()<=endrow || self->getNumColumns()<=endcol) rb_raise(rb_eIndexError,"index out of bounds");
669
+ self->extractText(text,size,startrow,endrow,startcol,endcol,cs,rs);
670
+ result=rb_str_new2(text);
671
+ FXFREE(&text);
672
+ return result;
673
+ }
674
+ void FXTable_overlayText(FXTable *self,FXint startrow,FXint endrow,FXint startcol,FXint endcol,VALUE str,FXchar cs,FXchar rs){
675
+ if(startrow<0 || startcol<0 || self->getNumRows()<=endrow || self->getNumColumns()<=endcol) rb_raise(rb_eIndexError,"index out of bounds");
676
+ const FXchar* text=reinterpret_cast<FXchar*>(STR2CSTR(str));
677
+ FXint size=RSTRING(str)->len;
678
+ self->overlayText(startrow,endrow,startcol,endcol,text,size,cs,rs);
679
+ }
666
680
  void FXTable_updateRange(FXTable const *self,FXint sr,FXint er,FXint sc,FXint ec){
667
- if(sr<0 || sc<0 || er>self->getNumRows() || ec>self->getNumColumns()){
668
- rb_raise(rb_eIndexError,"index out of bounds");
669
- }
670
- else{
671
- self->updateRange(sr,er,sc,ec);
672
- }
681
+ if(sr<0 || sc<0 || self->getNumRows()<=er || self->getNumColumns()<=ec) rb_raise(rb_eIndexError,"index out of bounds");
682
+ self->updateRange(sr,er,sc,ec);
673
683
  }
674
684
  VALUE FXTable_position__SWIG_1(FXTable const *self){
675
685
  FXint x, y;
@@ -1601,22 +1611,19 @@ static VALUE _wrap_FXTable_getItemData(int argc, VALUE *argv, VALUE self) { FXTa
1601
1611
  if (arg2 < 0 || arg2 >= arg1->getNumRows()) { rb_raise(rb_eIndexError, "table row out of bounds"); } } {
1602
1612
  if (arg3 < 0 || arg3 >= arg1->getNumColumns()) { rb_raise(rb_eIndexError, "table column out of bounds"); } }
1603
1613
  result = (VALUE)FXTable_getItemData((FXTable const *)arg1,arg2,arg3); vresult = result; return vresult; }
1604
- static VALUE _wrap_FXTable_extractText(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXchar **arg2 = 0 ;
1605
- FXint *arg3 = 0 ; FXint arg4 ; FXint arg5 ; FXint arg6 ; FXint arg7 ; FXchar arg8 = (FXchar) '\t' ;
1606
- FXchar arg9 = (FXchar) '\n' ; if ((argc < 6) || (argc > 8)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc);
1607
- SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1);
1608
- SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_p_FXchar, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
1609
- SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXint, 1); if (arg3 == NULL) rb_raise(rb_eTypeError, "null reference");
1610
- arg4 = NUM2INT(argv[2]); arg5 = NUM2INT(argv[3]); arg6 = NUM2INT(argv[4]); arg7 = NUM2INT(argv[5]); if (argc > 6) {
1611
- arg8 = NUM2CHR(argv[6]); } if (argc > 7) { arg9 = NUM2CHR(argv[7]); }
1612
- ((FXTable const *)arg1)->extractText(*arg2,*arg3,arg4,arg5,arg6,arg7,arg8,arg9); return Qnil; }
1614
+ static VALUE _wrap_FXTable_extractText(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
1615
+ FXint arg3 ; FXint arg4 ; FXint arg5 ; FXchar arg6 = (FXchar) '\t' ; FXchar arg7 = (FXchar) '\n' ; VALUE result;
1616
+ VALUE vresult = Qnil; if ((argc < 4) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
1617
+ SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
1618
+ arg4 = NUM2INT(argv[2]); arg5 = NUM2INT(argv[3]); if (argc > 4) { arg6 = NUM2CHR(argv[4]); } if (argc > 5) {
1619
+ arg7 = NUM2CHR(argv[5]); } result = (VALUE)FXTable_extractText((FXTable const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7);
1620
+ vresult = result; return vresult; }
1613
1621
  static VALUE _wrap_FXTable_overlayText(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
1614
- FXint arg3 ; FXint arg4 ; FXint arg5 ; FXchar *arg6 ; FXint arg7 ; FXchar arg8 = (FXchar) '\t' ;
1615
- FXchar arg9 = (FXchar) '\n' ; if ((argc < 6) || (argc > 8)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc);
1622
+ FXint arg3 ; FXint arg4 ; FXint arg5 ; VALUE arg6 ; FXchar arg7 = (FXchar) '\t' ; FXchar arg8 = (FXchar) '\n' ;
1623
+ if ((argc < 5) || (argc > 7)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc);
1616
1624
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
1617
- arg4 = NUM2INT(argv[2]); arg5 = NUM2INT(argv[3]); arg6 = StringValuePtr(argv[4]); arg7 = NUM2INT(argv[5]); if (argc > 6) {
1618
- arg8 = NUM2CHR(argv[6]); } if (argc > 7) { arg9 = NUM2CHR(argv[7]); }
1619
- (arg1)->overlayText(arg2,arg3,arg4,arg5,(FXchar const *)arg6,arg7,arg8,arg9); return Qnil; }
1625
+ arg4 = NUM2INT(argv[2]); arg5 = NUM2INT(argv[3]); arg6 = argv[4]; if (argc > 5) { arg7 = NUM2CHR(argv[5]); }
1626
+ if (argc > 6) { arg8 = NUM2CHR(argv[6]); } FXTable_overlayText(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); return Qnil; }
1620
1627
  static VALUE _wrap_FXTable_isItemSpanning(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
1621
1628
  FXint arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
1622
1629
  rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
@@ -2158,13 +2165,11 @@ static VALUE _wrap_FXTable_setRowHeight(int argc, VALUE *argv, VALUE self) { FXT
2158
2165
  FXTable_setRowHeight(arg1,arg2,arg3); return Qnil; }
2159
2166
  static VALUE _wrap_FXTable_setColumnX(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
2160
2167
  FXint arg3 ; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
2161
- SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]); {
2162
- if (arg2 < 0 || arg2 >= arg1->getNumColumns()) { rb_raise(rb_eIndexError, "table column out of bounds"); } }
2168
+ SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
2163
2169
  FXTable_setColumnX(arg1,arg2,arg3); return Qnil; }
2164
2170
  static VALUE _wrap_FXTable_setRowY(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
2165
2171
  FXint arg3 ; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
2166
- SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]); {
2167
- if (arg2 < 0 || arg2 >= arg1->getNumRows()) { rb_raise(rb_eIndexError, "table row out of bounds"); } }
2172
+ SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
2168
2173
  FXTable_setRowY(arg1,arg2,arg3); return Qnil; }
2169
2174
  static VALUE _wrap_FXTable_setCurrentItem(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
2170
2175
  FXint arg3 ; FXbool arg4 = (FXbool) 0 ; if ((argc < 2) || (argc > 3))
@@ -3186,7 +3191,6 @@ static swig_type_info _swigt__p_FXWindow[] = {{"_p_FXWindow", 0, "FXWindow *", 0
3186
3191
  static swig_type_info _swigt__p_FXComposite[] = {{"_p_FXComposite", 0, "FXComposite *", 0, 0, 0, 0},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXToolBar", _p_FXToolBarTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXComposite", 0, 0, 0, 0, 0, 0},{"_p_FXToolTip", _p_FXToolTipTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXTabBook", _p_FXTabBookTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXGroupBox", _p_FXGroupBoxTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXRealSpinner", _p_FXRealSpinnerTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXTable", _p_FXTableTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXListBox", _p_FXListBoxTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXTabBar", _p_FXTabBarTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXImageView", _p_FXImageViewTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXToolBarShell", _p_FXToolBarShellTo_p_FXComposite, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
3187
3192
  static swig_type_info _swigt__p_FXId[] = {{"_p_FXId", 0, "FXId *", 0, 0, 0, 0},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXToolBar", _p_FXToolBarTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXToolTip", _p_FXToolTipTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXTabBook", _p_FXTabBookTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXId", 0, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXGroupBox", _p_FXGroupBoxTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRuler", _p_FXRulerTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXCanvas", _p_FXCanvasTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRealSpinner", _p_FXRealSpinnerTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXScrollBar", _p_FXScrollBarTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXToolBarGrip", _p_FXToolBarGripTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXTable", _p_FXTableTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXDrawable", _p_FXDrawableTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXCursor", _p_FXCursorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXGIFCursor", _p_FXGIFCursorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXListBox", _p_FXListBoxTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXToolBarTab", _p_FXToolBarTabTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXTabBar", _p_FXTabBarTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXImageView", _p_FXImageViewTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXToolBarShell", _p_FXToolBarShellTo_p_FXId, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
3188
3193
  static swig_type_info _swigt__p_FXFont[] = {{"_p_FXFont", 0, "FXFont *", 0, 0, 0, 0},{"_p_FXFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
3189
- static swig_type_info _swigt__p_p_FXchar[] = {{"_p_p_FXchar", 0, "char **|FXchar **", 0, 0, 0, 0},{"_p_p_FXchar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
3190
3194
  static swig_type_info _swigt__p_FXTable[] = {{"_p_FXTable", 0, "FXTable *", 0, 0, 0, 0},{"_p_FXTable", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
3191
3195
  static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *", 0, 0, 0, 0},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream, 0, 0, 0, 0, 0},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream, 0, 0, 0, 0, 0},{"_p_FXStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
3192
3196
  static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *", 0, 0, 0, 0},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXToolBar", _p_FXToolBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXToolTip", _p_FXToolTipTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTabBook", _p_FXTabBookTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXGroupBox", _p_FXGroupBoxTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRuler", _p_FXRulerTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXCanvas", _p_FXCanvasTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRealSpinner", _p_FXRealSpinnerTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXScrollBar", _p_FXScrollBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXToolBarGrip", _p_FXToolBarGripTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTable", _p_FXTableTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDrawable", 0, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXListBox", _p_FXListBoxTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXToolBarTab", _p_FXToolBarTabTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTabBar", _p_FXTabBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXImageView", _p_FXImageViewTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXToolBarShell", _p_FXToolBarShellTo_p_FXDrawable, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -3194,7 +3198,6 @@ static swig_type_info _swigt__p_FXTableRange[] = {{"_p_FXTableRange", 0, "FXTabl
3194
3198
  static swig_type_info _swigt__p_FXIcon[] = {{"_p_FXIcon", 0, "FXIcon *", 0, 0, 0, 0},{"_p_FXIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
3195
3199
  static swig_type_info _swigt__p_FXHeader[] = {{"_p_FXHeader", 0, "FXHeader *", 0, 0, 0, 0},{"_p_FXHeader", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
3196
3200
  static swig_type_info _swigt__p_FXTableItem[] = {{"_p_FXTableItem", 0, "FXTableItem *", 0, 0, 0, 0},{"_p_FXTableItem", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
3197
- static swig_type_info _swigt__p_FXint[] = {{"_p_FXint", 0, "int *|FXint *", 0, 0, 0, 0},{"_p_FXint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
3198
3201
  static swig_type_info _swigt__p_FXTablePos[] = {{"_p_FXTablePos", 0, "FXTablePos *", 0, 0, 0, 0},{"_p_FXTablePos", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
3199
3202
 
3200
3203
  static swig_type_info *swig_types_initial[] = {
@@ -3205,7 +3208,6 @@ _swigt__p_FXWindow,
3205
3208
  _swigt__p_FXComposite,
3206
3209
  _swigt__p_FXId,
3207
3210
  _swigt__p_FXFont,
3208
- _swigt__p_p_FXchar,
3209
3211
  _swigt__p_FXTable,
3210
3212
  _swigt__p_FXStream,
3211
3213
  _swigt__p_FXDrawable,
@@ -3213,7 +3215,6 @@ _swigt__p_FXTableRange,
3213
3215
  _swigt__p_FXIcon,
3214
3216
  _swigt__p_FXHeader,
3215
3217
  _swigt__p_FXTableItem,
3216
- _swigt__p_FXint,
3217
3218
  _swigt__p_FXTablePos,
3218
3219
  0
3219
3220
  };