fxruby 1.6.28-x86-mingw32 → 1.6.29-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (231) hide show
  1. checksums.yaml +7 -7
  2. checksums.yaml.gz.sig +0 -0
  3. data.tar.gz.sig +0 -0
  4. data/.gitignore +1 -1
  5. data/History.txt +13 -1
  6. data/Manifest.txt +1 -1
  7. data/Rakefile +49 -39
  8. data/examples/RAA.rb +8 -2
  9. data/examples/WhatAQuietStiff.rb +2 -2
  10. data/examples/babelfish.rb +9 -2
  11. data/examples/browser.rb +1 -1
  12. data/examples/button.rb +3 -9
  13. data/examples/canvasdemo.rb +3 -3
  14. data/examples/charts.rb +9 -2
  15. data/examples/dctest.rb +4 -10
  16. data/examples/gembrowser.rb +4 -4
  17. data/examples/gltest.rb +3 -3
  18. data/examples/glviewer.rb +3 -9
  19. data/examples/groupbox.rb +3 -9
  20. data/examples/header.rb +1 -1
  21. data/examples/hello2.rb +1 -1
  22. data/examples/iRAA.rb +7 -1
  23. data/examples/iconlist.rb +3 -9
  24. data/examples/imageviewer.rb +3 -9
  25. data/examples/mditest.rb +1 -1
  26. data/examples/raabrowser.rb +8 -2
  27. data/examples/rmagick.rb +7 -1
  28. data/examples/shutter.rb +3 -9
  29. data/examples/splitter.rb +3 -9
  30. data/examples/table.rb +26 -3
  31. data/examples/textedit/textedit.rb +3 -3
  32. data/ext/fox16_c/FXRbApp.cpp +1 -1
  33. data/ext/fox16_c/FXRuby.cpp +18 -9
  34. data/ext/fox16_c/extconf.rb +252 -11
  35. data/ext/fox16_c/include/FXRbTreeList.h +3 -3
  36. data/ext/fox16_c/include/FXRuby.h +7 -6
  37. data/ext/fox16_c/markfuncs.cpp +3 -22
  38. data/ext/fox16_c/unregisterOwnedObjects.cpp +1 -2
  39. data/lib/1.8/fox16_c.so +0 -0
  40. data/lib/1.9/fox16_c.so +0 -0
  41. data/lib/2.0/fox16_c.so +0 -0
  42. data/lib/2.1/fox16_c.so +0 -0
  43. data/lib/2.2/fox16_c.so +0 -0
  44. data/lib/fox16.rb +16 -6
  45. data/lib/fox16/core.rb +14 -0
  46. data/lib/fox16/glshapes.rb +1 -0
  47. data/lib/fox16/version.rb +1 -1
  48. data/lib/x86-mingw32/libFOX-1.6-0.dll +0 -0
  49. data/lib/x86-mingw32/libfxscintilla-20.dll +0 -0
  50. data/lib/x86-mingw32/libgcc_s_sjlj-1.dll +0 -0
  51. data/lib/x86-mingw32/libjpeg-8.dll +0 -0
  52. data/lib/x86-mingw32/libpng15-15.dll +0 -0
  53. data/lib/x86-mingw32/libstdc++-6.dll +0 -0
  54. data/lib/x86-mingw32/libtiff-5.dll +0 -0
  55. data/lib/x86-mingw32/libwinpthread-1.dll +0 -0
  56. data/lib/x86-mingw32/zlib1.dll +0 -0
  57. data/rdoc-sources/FXBMPIcon.rb +1 -1
  58. data/rdoc-sources/FXImage.rb +8 -2
  59. data/swig-interfaces/FX4Splitter.i +0 -6
  60. data/swig-interfaces/FX7Segment.i +0 -8
  61. data/swig-interfaces/FXAccelTable.i +0 -7
  62. data/swig-interfaces/FXApp.i +15 -23
  63. data/swig-interfaces/FXArrowButton.i +0 -10
  64. data/swig-interfaces/FXBMPIcon.i +0 -2
  65. data/swig-interfaces/FXBMPImage.i +0 -2
  66. data/swig-interfaces/FXBitmap.i +0 -6
  67. data/swig-interfaces/FXButton.i +0 -4
  68. data/swig-interfaces/FXCURCursor.i +0 -2
  69. data/swig-interfaces/FXCanvas.i +0 -2
  70. data/swig-interfaces/FXCheckButton.i +0 -7
  71. data/swig-interfaces/FXChoiceBox.i +0 -8
  72. data/swig-interfaces/FXColorBar.i +0 -8
  73. data/swig-interfaces/FXColorDialog.i +0 -4
  74. data/swig-interfaces/FXColorList.i +0 -9
  75. data/swig-interfaces/FXColorRing.i +0 -40
  76. data/swig-interfaces/FXColorSelector.i +0 -25
  77. data/swig-interfaces/FXColorWell.i +0 -10
  78. data/swig-interfaces/FXColorWheel.i +0 -15
  79. data/swig-interfaces/FXComboBox.i +0 -7
  80. data/swig-interfaces/FXComposeContext.i +0 -5
  81. data/swig-interfaces/FXComposite.i +0 -4
  82. data/swig-interfaces/FXCursor.i +0 -9
  83. data/swig-interfaces/FXDC.i +0 -26
  84. data/swig-interfaces/FXDCPrint.i +0 -19
  85. data/swig-interfaces/FXDataTarget.i +0 -5
  86. data/swig-interfaces/FXDebugTarget.i +0 -4
  87. data/swig-interfaces/FXDelegator.i +0 -2
  88. data/swig-interfaces/FXDial.i +0 -14
  89. data/swig-interfaces/FXDialogBox.i +0 -2
  90. data/swig-interfaces/FXDict.i +0 -27
  91. data/swig-interfaces/FXDirDialog.i +0 -5
  92. data/swig-interfaces/FXDirList.i +0 -31
  93. data/swig-interfaces/FXDirSelector.i +0 -19
  94. data/swig-interfaces/FXDockBar.i +0 -8
  95. data/swig-interfaces/FXDockHandler.i +0 -10
  96. data/swig-interfaces/FXDockSite.i +0 -7
  97. data/swig-interfaces/FXDockTitle.i +0 -6
  98. data/swig-interfaces/FXDragCorner.i +0 -9
  99. data/swig-interfaces/FXDrawable.i +0 -7
  100. data/swig-interfaces/FXFileDialog.i +0 -5
  101. data/swig-interfaces/FXFileDict.i +0 -5
  102. data/swig-interfaces/FXFileList.i +0 -23
  103. data/swig-interfaces/FXFileSelector.i +0 -33
  104. data/swig-interfaces/FXFoldingList.i +6 -19
  105. data/swig-interfaces/FXFont.i +0 -20
  106. data/swig-interfaces/FXFontDialog.i +3 -7
  107. data/swig-interfaces/FXFontSelector.i +3 -29
  108. data/swig-interfaces/FXFrame.i +0 -20
  109. data/swig-interfaces/FXGIFIcon.i +0 -2
  110. data/swig-interfaces/FXGIFImage.i +0 -2
  111. data/swig-interfaces/FXGLCanvas.i +0 -4
  112. data/swig-interfaces/FXGLContext.i +0 -4
  113. data/swig-interfaces/FXGLShape.i +0 -11
  114. data/swig-interfaces/FXGLViewer.i +0 -65
  115. data/swig-interfaces/FXGradientBar.i +8 -9
  116. data/swig-interfaces/FXGroupBox.i +0 -6
  117. data/swig-interfaces/FXHeader.i +0 -24
  118. data/swig-interfaces/FXHorizontalFrame.i +0 -2
  119. data/swig-interfaces/FXICOIcon.i +0 -2
  120. data/swig-interfaces/FXICOImage.i +0 -2
  121. data/swig-interfaces/FXIcon.i +0 -7
  122. data/swig-interfaces/FXIconList.i +0 -51
  123. data/swig-interfaces/FXIconSource.i +0 -4
  124. data/swig-interfaces/FXId.i +0 -4
  125. data/swig-interfaces/FXImage.i +21 -4
  126. data/swig-interfaces/FXImageFrame.i +0 -7
  127. data/swig-interfaces/FXImageView.i +0 -6
  128. data/swig-interfaces/FXInputDialog.i +0 -8
  129. data/swig-interfaces/FXJPGIcon.i +0 -4
  130. data/swig-interfaces/FXJPGImage.i +0 -4
  131. data/swig-interfaces/FXKnob.i +0 -12
  132. data/swig-interfaces/FXLabel.i +0 -16
  133. data/swig-interfaces/FXList.i +0 -33
  134. data/swig-interfaces/FXListBox.i +0 -7
  135. data/swig-interfaces/FXMDIButton.i +0 -12
  136. data/swig-interfaces/FXMDIChild.i +0 -51
  137. data/swig-interfaces/FXMDIClient.i +0 -6
  138. data/swig-interfaces/FXMainWindow.i +0 -2
  139. data/swig-interfaces/FXMat3d.i +0 -2
  140. data/swig-interfaces/FXMat3f.i +0 -2
  141. data/swig-interfaces/FXMat4d.i +0 -2
  142. data/swig-interfaces/FXMat4f.i +0 -2
  143. data/swig-interfaces/FXMatrix.i +0 -4
  144. data/swig-interfaces/FXMemoryStream.i +0 -1
  145. data/swig-interfaces/FXMenuBar.i +0 -2
  146. data/swig-interfaces/FXMenuButton.i +0 -7
  147. data/swig-interfaces/FXMenuCaption.i +0 -15
  148. data/swig-interfaces/FXMenuCascade.i +0 -5
  149. data/swig-interfaces/FXMenuCheck.i +0 -8
  150. data/swig-interfaces/FXMenuCommand.i +0 -5
  151. data/swig-interfaces/FXMenuPane.i +0 -2
  152. data/swig-interfaces/FXMenuRadio.i +0 -8
  153. data/swig-interfaces/FXMenuSeparator.i +0 -5
  154. data/swig-interfaces/FXMenuTitle.i +0 -4
  155. data/swig-interfaces/FXMessageBox.i +13 -10
  156. data/swig-interfaces/FXOptionMenu.i +0 -7
  157. data/swig-interfaces/FXPCXIcon.i +0 -2
  158. data/swig-interfaces/FXPCXImage.i +0 -2
  159. data/swig-interfaces/FXPNGIcon.i +0 -2
  160. data/swig-interfaces/FXPNGImage.i +0 -2
  161. data/swig-interfaces/FXPPMIcon.i +0 -2
  162. data/swig-interfaces/FXPPMImage.i +0 -2
  163. data/swig-interfaces/FXPacker.i +0 -23
  164. data/swig-interfaces/FXPicker.i +0 -2
  165. data/swig-interfaces/FXPopup.i +0 -18
  166. data/swig-interfaces/FXPrintDialog.i +0 -31
  167. data/swig-interfaces/FXProgressBar.i +0 -12
  168. data/swig-interfaces/FXProgressDialog.i +0 -8
  169. data/swig-interfaces/FXRGBIcon.i +0 -2
  170. data/swig-interfaces/FXRGBImage.i +0 -2
  171. data/swig-interfaces/FXRadioButton.i +0 -7
  172. data/swig-interfaces/FXRecentFiles.i +0 -6
  173. data/swig-interfaces/FXRegion.i +0 -2
  174. data/swig-interfaces/FXRegistry.i +0 -12
  175. data/swig-interfaces/FXReplaceDialog.i +0 -15
  176. data/swig-interfaces/FXRootWindow.i +0 -6
  177. data/swig-interfaces/FXRuler.i +0 -45
  178. data/swig-interfaces/FXScrollArea.i +0 -14
  179. data/swig-interfaces/FXScrollBar.i +0 -2
  180. data/swig-interfaces/FXScrollPane.i +0 -10
  181. data/swig-interfaces/FXScrollWindow.i +0 -2
  182. data/swig-interfaces/FXSearchDialog.i +0 -2
  183. data/swig-interfaces/FXSeparator.i +0 -9
  184. data/swig-interfaces/FXSettings.i +0 -11
  185. data/swig-interfaces/FXShell.i +0 -4
  186. data/swig-interfaces/FXShutter.i +0 -14
  187. data/swig-interfaces/FXSlider.i +0 -19
  188. data/swig-interfaces/FXSpinner.i +0 -9
  189. data/swig-interfaces/FXSplashWindow.i +0 -8
  190. data/swig-interfaces/FXSplitter.i +0 -10
  191. data/swig-interfaces/FXSpring.i +0 -8
  192. data/swig-interfaces/FXStatusBar.i +0 -5
  193. data/swig-interfaces/FXStatusLine.i +0 -8
  194. data/swig-interfaces/FXStringDict.i +0 -3
  195. data/swig-interfaces/FXSwitcher.i +0 -4
  196. data/swig-interfaces/FXTGAIcon.i +0 -2
  197. data/swig-interfaces/FXTGAImage.i +0 -2
  198. data/swig-interfaces/FXTIFIcon.i +0 -4
  199. data/swig-interfaces/FXTIFImage.i +0 -4
  200. data/swig-interfaces/FXTabBar.i +0 -5
  201. data/swig-interfaces/FXTabBook.i +0 -2
  202. data/swig-interfaces/FXTabItem.i +0 -2
  203. data/swig-interfaces/FXTable.i +0 -17
  204. data/swig-interfaces/FXToggleButton.i +0 -12
  205. data/swig-interfaces/FXToolBarGrip.i +0 -4
  206. data/swig-interfaces/FXToolBarShell.i +0 -16
  207. data/swig-interfaces/FXToolBarTab.i +0 -13
  208. data/swig-interfaces/FXToolTip.i +0 -10
  209. data/swig-interfaces/FXTopWindow.i +0 -17
  210. data/swig-interfaces/FXTranslator.i +0 -2
  211. data/swig-interfaces/FXTreeList.i +18 -75
  212. data/swig-interfaces/FXTreeListBox.i +18 -38
  213. data/swig-interfaces/FXVerticalFrame.i +0 -2
  214. data/swig-interfaces/FXVisual.i +0 -38
  215. data/swig-interfaces/FXWindow.i +3 -53
  216. data/swig-interfaces/FXWizard.i +0 -17
  217. data/swig-interfaces/FXXBMIcon.i +0 -2
  218. data/swig-interfaces/FXXBMImage.i +0 -2
  219. data/swig-interfaces/FXXPMIcon.i +0 -2
  220. data/swig-interfaces/FXXPMImage.i +0 -2
  221. data/swig-interfaces/fxdefs.i +33 -35
  222. data/swig-interfaces/ruby-typemaps.i +19 -2
  223. data/test/TC_FXBMPImage.rb +13 -0
  224. data/test/TC_FXFileStream.rb +3 -3
  225. data/test/TC_FXImage.rb +40 -2
  226. data/test/TC_FXSize.rb +12 -0
  227. data/test/TC_FXWindow.rb +26 -0
  228. data/test/TC_Misc.rb +2 -0
  229. metadata +177 -161
  230. metadata.gz.sig +0 -0
  231. data/Rakefile.cross +0 -421
@@ -57,51 +57,6 @@ class FXFont;
57
57
  * and size of entities within the document.
58
58
  */
59
59
  class FXRuler : public FXFrame {
60
- protected:
61
- FXFont *font; // Font for numbers
62
- FXint documentSize; // Size of document
63
- FXint edgeSpacing; // Edge spacing around document
64
- FXint marginLower; // Lower margin
65
- FXint marginUpper; // Upper margin
66
- FXint indentFirst; // First line paragraph indent
67
- FXint indentLower; // Lower paragraph indent
68
- FXint indentUpper; // Upper paragraph indent
69
- FXdouble pixelPerTick; // Number of pixels per tick increment
70
- FXint numberTicks; // Tick increments between numbers
71
- FXint majorTicks; // Tick increments between major ticks
72
- FXint mediumTicks; // Tick increments between medium ticks
73
- FXint tinyTicks; // Tick increments between tiny ticks
74
- FXint arrowPos; // Arrow position
75
- FXColor textColor; // Color for numbers and ticks
76
- FXint shift; // Left edge of content
77
- FXint pos; // Scroll position
78
- FXint off; // Offset item was grabbed
79
- FXString tip; // Tooltip text
80
- FXString help; // Help text
81
- FXuchar mode; // Mode widget is in
82
- protected:
83
- FXRuler();
84
- FXint picked(FXint x,FXint y);
85
- void drawLeftArrow(FXDCWindow& dc,FXint x,FXint y);
86
- void drawRightArrow(FXDCWindow& dc,FXint x,FXint y);
87
- void drawUpArrow(FXDCWindow& dc,FXint x,FXint y);
88
- void drawDownArrow(FXDCWindow& dc,FXint x,FXint y);
89
- void drawLeftMarker(FXDCWindow& dc,FXint x,FXint y);
90
- void drawRightMarker(FXDCWindow& dc,FXint x,FXint y);
91
- void drawUpMarker(FXDCWindow& dc,FXint x,FXint y);
92
- void drawDownMarker(FXDCWindow& dc,FXint x,FXint y);
93
- protected:
94
- enum{
95
- MOUSE_NONE, // No mouse operation
96
- MOUSE_MARG_LOWER, // Drag lower margin
97
- MOUSE_MARG_UPPER, // Drag upper margin
98
- MOUSE_PARA_FIRST, // Drag first indent
99
- MOUSE_PARA_LOWER, // Drag lower indent
100
- MOUSE_PARA_UPPER // Drag upper indent
101
- };
102
- private:
103
- FXRuler(const FXRuler&);
104
- FXRuler &operator=(const FXRuler&);
105
60
  public:
106
61
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
107
62
  long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
@@ -55,20 +55,6 @@ class FXScrollCorner;
55
55
  * scrolling may be turned off.
56
56
  */
57
57
  class FXScrollArea : public FXComposite {
58
- protected:
59
- FXScrollBar *horizontal; // Horizontal scroll bar
60
- FXScrollBar *vertical; // Vertical scroll bar
61
- FXScrollCorner *corner; // Scroll corner
62
- FXint viewport_w; // Viewport width
63
- FXint viewport_h; // Viewport height
64
- FXint pos_x; // X scroll position (pos_x<=0)
65
- FXint pos_y; // Y scroll position (pos_y<=0)
66
- protected:
67
- FXScrollArea();
68
- FXbool startAutoScroll(FXEvent* event,FXbool onlywheninside=FALSE);
69
- void stopAutoScroll();
70
- FXScrollArea(FXComposite* p,FXuint opts,FXint x,FXint y,FXint w,FXint h);
71
- virtual void moveContents(FXint x,FXint y);
72
58
  public:
73
59
  long onHMouseWheel(FXObject*,FXSelector,void* PTR_EVENT);
74
60
  long onVMouseWheel(FXObject*,FXSelector,void* PTR_EVENT);
@@ -154,8 +154,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXScrollBar)
154
154
 
155
155
  /// Corner between scroll bars
156
156
  class FXScrollCorner : public FXWindow {
157
- protected:
158
- FXScrollCorner();
159
157
  public:
160
158
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
161
159
  public:
@@ -31,16 +31,6 @@ class FXArrowButton;
31
31
  * known in advance how many entries will be added.
32
32
  */
33
33
  class FXScrollPane : public FXMenuPane {
34
- protected:
35
- FXArrowButton *dn; // Button to scroll down
36
- FXArrowButton *up; // Button to scroll up
37
- FXint visible; // Visible entries
38
- FXint top; // Top visible entry
39
- protected:
40
- FXScrollPane();
41
- private:
42
- FXScrollPane(const FXScrollPane&);
43
- FXScrollPane &operator=(const FXScrollPane&);
44
34
  public:
45
35
  long onCmdIncrement(FXObject*,FXSelector,void* PTR_IGNORE);
46
36
  long onCmdDecrement(FXObject*,FXSelector,void* PTR_IGNORE);
@@ -36,8 +36,6 @@
36
36
  * necessarily equal to the scroll position of the scroll window!
37
37
  */
38
38
  class FXScrollWindow : public FXScrollArea {
39
- protected:
40
- FXScrollWindow(){}
41
39
  public:
42
40
  long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
43
41
  long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);
@@ -23,8 +23,6 @@
23
23
 
24
24
  /// Text search dialog
25
25
  class FXSearchDialog : public FXReplaceDialog {
26
- protected:
27
- FXSearchDialog(){}
28
26
  public:
29
27
 
30
28
  /// Construct search dialog box
@@ -37,11 +37,6 @@ enum {
37
37
  * it can also have the frame's border styles.
38
38
  */
39
39
  class FXSeparator : public FXFrame {
40
- protected:
41
- FXSeparator(){}
42
- private:
43
- FXSeparator(const FXSeparator&);
44
- FXSeparator &operator=(const FXSeparator&);
45
40
  public:
46
41
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
47
42
  public:
@@ -91,8 +86,6 @@ DYNAMIC_CAST(SWIGTYPE_p_FXSeparator, FXSeparator_dynamic_cast);
91
86
 
92
87
  /// Horizontal separator
93
88
  class FXHorizontalSeparator : public FXSeparator {
94
- protected:
95
- FXHorizontalSeparator(){}
96
89
  public:
97
90
 
98
91
  /// Constructor
@@ -115,8 +108,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXHorizontalSeparator)
115
108
 
116
109
  /// Vertical separator
117
110
  class FXVerticalSeparator : public FXSeparator {
118
- protected:
119
- FXVerticalSeparator(){}
120
111
  public:
121
112
 
122
113
  /// Constructor
@@ -37,17 +37,6 @@ class FXStringDict;
37
37
  * to the file.
38
38
  */
39
39
  class FXSettings : public FXDict {
40
- protected:
41
- bool modified;
42
- protected:
43
- virtual void *createData(const void*);
44
- virtual void deleteData(void*);
45
- FXchar* dequote(FXchar* text) const;
46
- FXchar* enquote(FXchar* result,const FXchar* text);
47
- FXStringDict* insert(const FXchar* ky);
48
- FXStringDict* replace(const FXchar* ky,FXStringDict* section);
49
- FXStringDict* remove(const FXchar* ky);
50
- FXStringDict* find(const FXchar* ky);
51
40
  public:
52
41
 
53
42
  /// Construct settings database.
@@ -26,10 +26,6 @@
26
26
  * windows which are direct children of the root window.
27
27
  */
28
28
  class FXShell : public FXComposite {
29
- protected:
30
- FXShell(){}
31
- FXShell(FXApp* a,FXuint opts,FXint x,FXint y,FXint w,FXint h);
32
- FXShell(FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h);
33
29
  public:
34
30
  long onLayout(FXObject*,FXSelector,void* PTR_IGNORE);
35
31
  long onConfigure(FXObject*,FXSelector,void* PTR_EVENT);
@@ -31,12 +31,6 @@ class FXScrollWindow;
31
31
  * window to allow unlimited room for all the contents.
32
32
  */
33
33
  class FXShutterItem : public FXVerticalFrame {
34
- protected:
35
- FXButton *button;
36
- FXScrollWindow *scrollWindow;
37
- FXVerticalFrame *content;
38
- protected:
39
- FXShutterItem(){}
40
34
  public:
41
35
  long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
42
36
  long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
@@ -90,14 +84,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXShutterItem)
90
84
  * A sub panel can be unfolded by pressing on that panel's button.
91
85
  */
92
86
  class FXShutter : public FXVerticalFrame {
93
- protected:
94
- FXint current; // Item currently open
95
- FXint closing; // Item closing down
96
- FXint heightIncrement; // Height delta
97
- FXint closingHeight; // Closing items current height
98
- FXbool closingHadScrollbar; // Closing item had a scroll bar
99
- protected:
100
- FXShutter(){}
101
87
  public:
102
88
  long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
103
89
  long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
@@ -39,25 +39,6 @@ enum {
39
39
 
40
40
  /// Slider Control
41
41
  class FXSlider : public FXFrame {
42
- protected:
43
- FXint range[2]; // Reported data range
44
- FXint pos; // Reported data position
45
- FXint incr; // Increment when auto-sliding
46
- FXint delta; // Interval between ticks
47
- FXint headpos; // Head position
48
- FXint headsize; // Head size
49
- FXint slotsize; // Slot size
50
- FXColor slotColor; // Color of slot the head moves in
51
- FXint dragpoint; // Where the head is grabbed
52
- FXString help; // Help string
53
- FXString tip; // Tip string
54
- protected:
55
- FXSlider();
56
- FXint headPos(FXint v) const;
57
- FXint headVal(FXint p) const;
58
- void drawSliderHead(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
59
- void drawHorzTicks(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
60
- void drawVertTicks(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
61
42
  public:
62
43
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
63
44
  long onMotion(FXObject*,FXSelector,void* PTR_EVENT);
@@ -37,15 +37,6 @@ class FXArrowButton;
37
37
 
38
38
  /// Spinner control
39
39
  class FXSpinner : public FXPacker {
40
- protected:
41
- FXTextField *textField; // Text field
42
- FXArrowButton *upButton; // The up button
43
- FXArrowButton *downButton; // The down button
44
- FXint range[2]; // Reported data range
45
- FXint incr; // Increment
46
- FXint pos; // Current position
47
- protected:
48
- FXSpinner();
49
40
  public:
50
41
  long onUpdIncrement(FXObject*,FXSelector,void* PTR_IGNORE);
51
42
  long onCmdIncrement(FXObject*,FXSelector,void* PTR_EVENT);
@@ -40,14 +40,6 @@ enum {
40
40
  * with the SPLASH_SIMPLE option the window will be simply rectangular.
41
41
  */
42
42
  class FXSplashWindow : public FXTopWindow {
43
- protected:
44
- FXIcon *icon; // Really big icon
45
- FXuint delay; // Delay before hiding
46
- protected:
47
- FXSplashWindow();
48
- private:
49
- FXSplashWindow(const FXSplashWindow&);
50
- FXSplashWindow &operator=(const FXSplashWindow&);
51
43
  public:
52
44
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
53
45
  public:
@@ -58,16 +58,6 @@ enum {
58
58
  * LAYOUT_FIX_HEIGHT behave analogously.
59
59
  */
60
60
  class FXSplitter : public FXComposite {
61
- protected:
62
- FXSplitter();
63
- void adjustHLayout();
64
- void adjustVLayout();
65
- void moveHSplit(FXint amount);
66
- void moveVSplit(FXint amount);
67
- void drawHSplit(FXint pos);
68
- void drawVSplit(FXint pos);
69
- FXWindow* findHSplit(FXint pos);
70
- FXWindow* findVSplit(FXint pos);
71
61
  public:
72
62
  long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
73
63
  long onLeftBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
@@ -42,14 +42,6 @@
42
42
  * it provides the same layout behavior as packer.
43
43
  */
44
44
  class FXSpring : public FXPacker {
45
- protected:
46
- FXint relWidth; // Relative width
47
- FXint relHeight; // Relative height
48
- protected:
49
- FXSpring(){}
50
- private:
51
- FXSpring(const FXSpring&);
52
- FXSpring &operator=(const FXSpring&);
53
45
  public:
54
46
 
55
47
  %extend {
@@ -31,11 +31,6 @@ class FXStatusLine;
31
31
 
32
32
  /// Status bar
33
33
  class FXStatusBar : public FXHorizontalFrame {
34
- protected:
35
- FXDragCorner *corner;
36
- FXStatusLine *status;
37
- protected:
38
- FXStatusBar(){}
39
34
  public:
40
35
  %extend {
41
36
  /// Construct status bar with or without a drag corner
@@ -36,14 +36,6 @@
36
36
  */
37
37
 
38
38
  class FXStatusLine : public FXFrame {
39
- protected:
40
- FXString status; // Current status message
41
- FXString normal; // Normally displayed message
42
- FXFont *font; // Font
43
- FXColor textColor; // Status text color
44
- FXColor textHighlightColor; // Status text highlight color
45
- protected:
46
- FXStatusLine();
47
39
  public:
48
40
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
49
41
  long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
@@ -26,9 +26,6 @@
26
26
  * The inserted strings are copied when they're inserted.
27
27
  */
28
28
  class FXStringDict : public FXDict {
29
- protected:
30
- virtual void *createData(const void*);
31
- virtual void deleteData(void*);
32
29
  public:
33
30
  %extend {
34
31
  /// Construct a string dictionary
@@ -50,10 +50,6 @@ enum {
50
50
  * or height of all of the children.
51
51
  */
52
52
  class FXSwitcher : public FXPacker {
53
- protected:
54
- FXint current;
55
- protected:
56
- FXSwitcher(){}
57
53
  public:
58
54
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
59
55
  long onCmdSetValue(FXObject*,FXSelector,void* PTR_INT);
@@ -23,8 +23,6 @@
23
23
 
24
24
  /// Targa Icon class
25
25
  class FXTGAIcon : public FXIcon {
26
- protected:
27
- FXTGAIcon(){}
28
26
  public:
29
27
  %extend {
30
28
  static VALUE fileExt() {
@@ -23,8 +23,6 @@
23
23
 
24
24
  /// TGA Image class
25
25
  class FXTGAImage : public FXImage {
26
- protected:
27
- FXTGAImage(){}
28
26
  public:
29
27
  %extend {
30
28
  static VALUE fileExt() {
@@ -24,10 +24,6 @@
24
24
 
25
25
  /// TIFF Icon class
26
26
  class FXTIFIcon : public FXIcon {
27
- protected:
28
- FXushort codec;
29
- protected:
30
- FXTIFIcon(){}
31
27
  public:
32
28
  %extend {
33
29
  static VALUE fileExt() {
@@ -24,10 +24,6 @@
24
24
 
25
25
  /// TIFF Image class
26
26
  class FXTIFImage : public FXImage {
27
- protected:
28
- FXushort codec;
29
- protected:
30
- FXTIFImage(){}
31
27
  public:
32
28
  %extend {
33
29
  static VALUE fileExt() {
@@ -42,11 +42,6 @@ enum {
42
42
  * SEL_COMMAND message to its target.
43
43
  */
44
44
  class FXTabBar : public FXPacker {
45
- protected:
46
- FXint current; // Current tab index
47
- FXint shift; // Shift amount
48
- protected:
49
- FXTabBar(){}
50
45
  public:
51
46
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
52
47
  long onFocusNext(FXObject*,FXSelector,void* PTR_EVENT);
@@ -38,8 +38,6 @@
38
38
  * SEL_COMMAND message to its target.
39
39
  */
40
40
  class FXTabBook : public FXTabBar {
41
- protected:
42
- FXTabBook(){}
43
41
  public:
44
42
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
45
43
  long onFocusNext(FXObject*,FXSelector,void* PTR_EVENT);
@@ -42,8 +42,6 @@ enum {
42
42
  * the corresponding panel to be raised to the top.
43
43
  */
44
44
  class FXTabItem : public FXLabel {
45
- protected:
46
- FXTabItem();
47
45
  public:
48
46
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
49
47
  long onFocusIn(FXObject*,FXSelector,void* PTR_EVENT);
@@ -55,25 +55,8 @@ struct FXTableRange {
55
55
  ~FXTableRange();
56
56
  };
57
57
 
58
-
59
58
  /// Item in table
60
59
  class FXTableItem : public FXObject {
61
- protected:
62
- FXString label;
63
- FXIcon *icon;
64
- void *data;
65
- FXuint state;
66
- protected:
67
- FXTableItem():icon(NULL),data(NULL),state(0){}
68
- FXint textWidth(const FXTable* table) const;
69
- FXint textHeight(const FXTable* table) const;
70
- virtual void draw(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
71
- virtual void drawBorders(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
72
- virtual void drawContent(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
73
- virtual void drawPattern(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
74
- virtual void drawBackground(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
75
- protected:
76
- FXTableItem();
77
60
  public:
78
61
  enum{
79
62
  SELECTED = 0x00000001, /// Selected