diff --git a/swig-interfaces/FX4Splitter.i b/swig-interfaces/FX4Splitter.i
index a14302362a541f65cfd55927af6beefa827faf62..10446e7dffc46c93ab6847a9bb26f3ad541689a0 100644
--- a/swig-interfaces/FX4Splitter.i
+++ b/swig-interfaces/FX4Splitter.i
@@ -39,12 +39,6 @@ enum {
* proportionally resized, maintaining the same split-percentage.
*/
class FX4Splitter : public FXComposite {
-protected:
- FX4Splitter();
- FXuchar getMode(FXint x,FXint y);
- void moveSplit(FXint x,FXint y);
- void drawSplit(FXint x,FXint y);
- void adjustLayout();
public:
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FX7Segment.i b/swig-interfaces/FX7Segment.i
index 779b2bad161625fe67f8daab247d0f5bcb8909c1..bed0ec01658857a69e3073c201a8622e0174be8d 100644
--- a/swig-interfaces/FX7Segment.i
+++ b/swig-interfaces/FX7Segment.i
@@ -50,14 +50,6 @@ enum {
* display widget can also display some letters and punctuations.
*/
class FX7Segment : public FXFrame {
-protected:
- FXString label; // Text being shown
- FXColor textColor; // Text color
- FXint thickness; // Segment thickness
- FXint cellwidth; // Width of cell
- FXint cellheight; // height of cell
-protected:
- FX7Segment();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onCmdSetValue(FXObject*,FXSelector,void*); // FIXME
diff --git a/swig-interfaces/FXAccelTable.i b/swig-interfaces/FXAccelTable.i
index 18aa9eae7c9e0edeae4baf391643d174b90f10f4..022d19164b5b821736c0f8897b88965dd2fa1aed 100644
--- a/swig-interfaces/FXAccelTable.i
+++ b/swig-interfaces/FXAccelTable.i
@@ -27,13 +27,6 @@
*/
class FXAccelTable : public FXObject {
-protected:
- struct FXAccelKey {
- FXObject *target; // Target object of message
- FXSelector messagedn; // Message being sent
- FXSelector messageup; // Message being sent
- FXHotKey code; // Keysym and modifier mask to match
- };
public:
long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXApp.i b/swig-interfaces/FXApp.i
index f192169e08a3a2c4e362c568cf45846f15edd6a7..9f20fca05b0b085bce8cb2bff6bba2351f368866 100644
--- a/swig-interfaces/FXApp.i
+++ b/swig-interfaces/FXApp.i
@@ -133,14 +133,6 @@ struct FXTimer {
/// Application Object
class FXApp : public FXObject {
-protected:
-
- /// Return TRUE when new raw event is available
- virtual bool getNextEvent(FXRawEvent& ev,FXbool blocking=TRUE);
-
- /// Dispatch raw event
- virtual bool dispatchEvent(FXRawEvent& ev);
-
public:
long onCmdQuit(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdDump(FXObject*,FXSelector,void* PTR_IGNORE);
@@ -178,7 +170,7 @@ public:
return 0;
}
else{
- return FXRbApp::constructAndInit(name,vendor);
+ return FXRbApp::constructAndInit(name,vendor);
}
}
}
@@ -368,15 +360,15 @@ public:
FXuint m;
if(mode&INPUT_READ){
m=INPUT_READ;
- if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
+ if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
fd=FXRbGetReadFileHandle(obj);
- self->addInput(fd,m,tgt,sel);
+ self->addInput(fd,m,tgt,sel);
}
if(mode&INPUT_WRITE){
m=INPUT_WRITE;
- if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
+ if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
fd=FXRbGetWriteFileHandle(obj);
- self->addInput(fd,m,tgt,sel);
+ self->addInput(fd,m,tgt,sel);
}
return true;
}
@@ -390,15 +382,15 @@ public:
FXuint m;
if(mode&INPUT_READ){
m=INPUT_READ;
- if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
+ if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
fd=FXRbGetReadFileHandle(obj);
- self->removeInput(fd,m);
+ self->removeInput(fd,m);
}
if(mode&INPUT_WRITE){
m=INPUT_WRITE;
- if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
+ if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
fd=FXRbGetWriteFileHandle(obj);
- self->removeInput(fd,m);
+ self->removeInput(fd,m);
}
return true;
}
@@ -557,13 +549,13 @@ public:
FXASSERT(cur);
if(cur->isMemberOf(FXMETACLASS(FXRbCursor))){
dynamic_cast<FXRbCursor*>(cur)->ownedByApp=TRUE;
- }
+ }
else if(cur->isMemberOf(FXMETACLASS(FXRbCURCursor))){
dynamic_cast<FXRbCURCursor*>(cur)->ownedByApp=TRUE;
- }
+ }
else if(cur->isMemberOf(FXMETACLASS(FXRbGIFCursor))){
dynamic_cast<FXRbGIFCursor*>(cur)->ownedByApp=TRUE;
- }
+ }
self->setWaitCursor(cur);
}
}
@@ -580,13 +572,13 @@ public:
FXASSERT(cur);
if(cur->isMemberOf(FXMETACLASS(FXRbCursor))){
dynamic_cast<FXRbCursor*>(cur)->ownedByApp=TRUE;
- }
+ }
else if(cur->isMemberOf(FXMETACLASS(FXRbCURCursor))){
dynamic_cast<FXRbCURCursor*>(cur)->ownedByApp=TRUE;
- }
+ }
else if(cur->isMemberOf(FXMETACLASS(FXRbGIFCursor))){
dynamic_cast<FXRbGIFCursor*>(cur)->ownedByApp=TRUE;
- }
+ }
self->setDefaultCursor(which,cur);
}
}
diff --git a/swig-interfaces/FXArrowButton.i b/swig-interfaces/FXArrowButton.i
index f27f412e03c37ee42ecea573848887c147b0b890..7a431eda56f789f501a000ea7be6afd4931c92cf 100644
--- a/swig-interfaces/FXArrowButton.i
+++ b/swig-interfaces/FXArrowButton.i
@@ -38,16 +38,6 @@ enum {
/// Button with an arrow
class FXArrowButton : public FXFrame {
-protected:
- FXColor arrowColor; // Arrow color
- FXint arrowSize; // Arrow size
- FXTimer *repeater; // Timer for auto-repeat
- FXString tip; // Tooltip value
- FXString help; // Help value
- FXbool state; // State of button
- FXbool fired; // Timer has fired
-protected:
- FXArrowButton();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
diff --git a/swig-interfaces/FXBMPIcon.i b/swig-interfaces/FXBMPIcon.i
index b785c999a9d2df68c4cf1f88910e16689e857ff6..0038f3fd246590ea948b1d681ece443624f55e6c 100644
--- a/swig-interfaces/FXBMPIcon.i
+++ b/swig-interfaces/FXBMPIcon.i
@@ -23,8 +23,6 @@
/// Microsoft Bitmap icon
class FXBMPIcon : public FXIcon {
-protected:
- FXBMPIcon(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXBMPImage.i b/swig-interfaces/FXBMPImage.i
index 26c2912c396940f66a295933a45282753684a476..f16c0252757f3c77c0d6acb57e4911740eeed878 100644
--- a/swig-interfaces/FXBMPImage.i
+++ b/swig-interfaces/FXBMPImage.i
@@ -23,8 +23,6 @@
/// Microsoft Bitmap image
class FXBMPImage : public FXImage {
-protected:
- FXBMPImage(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXBitmap.i b/swig-interfaces/FXBitmap.i
index f236f3e2464e938f7dba2254bd23e61ea52400f5..2d932b6d8721da8a85bd6751671e12d631535bb5 100644
--- a/swig-interfaces/FXBitmap.i
+++ b/swig-interfaces/FXBitmap.i
@@ -41,12 +41,6 @@ enum {
* words 8 pixels packed into a single byte, starting at bit 0 on the left.
*/
class FXBitmap : public FXDrawable {
-protected:
- FXuchar *data; // Pixel data
- FXint bytewidth; // Number of bytes across
- FXuint options; // Options
-protected:
- FXBitmap();
public:
%extend {
/**
diff --git a/swig-interfaces/FXButton.i b/swig-interfaces/FXButton.i
index d18eb294561d5ff9b5e00ae44a9f925d9a00bcd2..3ffe706cd175c562d426727fbfaaf2a57eecabff 100644
--- a/swig-interfaces/FXButton.i
+++ b/swig-interfaces/FXButton.i
@@ -41,10 +41,6 @@ enum {
/// FXButton provides a push button. Buttons can have icons and/or labels.
class FXButton : public FXLabel {
-protected:
- FXuchar state;
-protected:
- FXButton();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
diff --git a/swig-interfaces/FXCURCursor.i b/swig-interfaces/FXCURCursor.i
index fc8894b268c4432cf9144ccee564e9496635fc3f..87f00b46f7ced5c799c2347c6ed6a97be6bdb286 100644
--- a/swig-interfaces/FXCURCursor.i
+++ b/swig-interfaces/FXCURCursor.i
@@ -23,8 +23,6 @@
/// CUR Cursor class
class FXCURCursor : public FXCursor {
-protected:
- FXCURCursor(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXCanvas.i b/swig-interfaces/FXCanvas.i
index e6c87dce41c7cd5b06d99865e41c0f87c96b2959..87abedd5abf2a5ecaa6895a8b37f65768b679621 100644
--- a/swig-interfaces/FXCanvas.i
+++ b/swig-interfaces/FXCanvas.i
@@ -23,8 +23,6 @@
/// Canvas, an area drawn by another object
class FXCanvas : public FXWindow {
-protected:
- FXCanvas();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
diff --git a/swig-interfaces/FXCheckButton.i b/swig-interfaces/FXCheckButton.i
index 50983d517d557e7b3f3a04c2c0ec40f6f57df9a1..bac02f730b92a4458f5ecc4626d7dd6a6be620ef 100644
--- a/swig-interfaces/FXCheckButton.i
+++ b/swig-interfaces/FXCheckButton.i
@@ -31,13 +31,6 @@ enum {
/// Check button
class FXCheckButton : public FXLabel {
-protected:
- FXColor checkColor; // Color of check mark
- FXColor boxColor; // Color of check box
- FXbool check; // Check state
- FXbool oldcheck; // Old check state
-protected:
- FXCheckButton();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
diff --git a/swig-interfaces/FXChoiceBox.i b/swig-interfaces/FXChoiceBox.i
index 87a88012f5ef3afa1eecc7fad10e83b7ff68b4a6..9db121b3e6b20fd12655684c2c9aa4417b2b4a55 100644
--- a/swig-interfaces/FXChoiceBox.i
+++ b/swig-interfaces/FXChoiceBox.i
@@ -29,14 +29,6 @@
* while a -1 is returned if the dialog was canceled,
*/
class FXChoiceBox : public FXDialogBox {
-protected:
- FXList *list;
-protected:
- FXChoiceBox(){}
-private:
- FXChoiceBox(const FXChoiceBox&);
- FXChoiceBox &operator=(const FXChoiceBox&);
- void initialize(const FXString& text,FXIcon* icon);
public:
long onCmdClicked(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdCancel(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXColorBar.i b/swig-interfaces/FXColorBar.i
index c0e98372ec33dcaee29426755463f655aea2dc8b..9ce81a803e7b0b08c004a9ce428ca055bb0ddbad 100644
--- a/swig-interfaces/FXColorBar.i
+++ b/swig-interfaces/FXColorBar.i
@@ -35,14 +35,6 @@ class FXImage;
* color by means of the hue, saturation, value specification system.
*/
class FXColorBar : public FXFrame {
-protected:
- FXImage *bar; // Intensity bar
- FXfloat hsv[3]; // Hue, saturation, value
- FXString tip; // Tooltip value
- FXString help; // Help value
-protected:
- FXColorBar();
- void updatebar();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXColorDialog.i b/swig-interfaces/FXColorDialog.i
index 21f2b29c4fa3dd77c313b033cede636d3118d1fb..4def5ea86e5f651faf73e7e26a56a2afbeb57d17 100644
--- a/swig-interfaces/FXColorDialog.i
+++ b/swig-interfaces/FXColorDialog.i
@@ -33,10 +33,6 @@ class FXColorSelector;
* automatically saved into the registry for future use.
*/
class FXColorDialog : public FXDialogBox {
-protected:
- FXColorSelector *colorbox;
-protected:
- FXColorDialog(){}
public:
long onChgColor(FXObject*,FXSelector,void* PTR_COLOR);
long onCmdColor(FXObject*,FXSelector,void* PTR_COLOR);
diff --git a/swig-interfaces/FXColorList.i b/swig-interfaces/FXColorList.i
index 08aa347b3a49ad613d8b9d9135c98f51c94c5153..9dc64c6533a3f323eec5ce5c69895f2434b2259f 100644
--- a/swig-interfaces/FXColorList.i
+++ b/swig-interfaces/FXColorList.i
@@ -25,12 +25,6 @@
/// Color item
class FXColorItem : public FXListItem {
-protected:
- FXColor color;
-protected:
- FXColorItem();
- virtual void draw(const FXList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h);
- virtual FXint hitItem(const FXList* list,FXint x,FXint y) const;
public:
%extend {
/// Construct new item with given text, color, and user-data
@@ -56,9 +50,6 @@ DECLARE_FXLISTITEM_VIRTUALS(FXColorItem)
* A ColorList Widget displays a list of colors.
*/
class FXColorList : public FXList {
-protected:
- FXColorList();
- virtual FXListItem *createItem(const FXString& text,FXIcon* icon,void* ptr);
public:
%extend {
/// Construct a list with initially no items in it
diff --git a/swig-interfaces/FXColorRing.i b/swig-interfaces/FXColorRing.i
index 84f4baf722e20c045031496a3e708430bc94b5bb..e55a999a7118feedef62eb8bc19562b70a313f51 100644
--- a/swig-interfaces/FXColorRing.i
+++ b/swig-interfaces/FXColorRing.i
@@ -42,46 +42,6 @@
* the brightness goes from black to a bright color.
*/
class FXColorRing : public FXFrame {
-protected:
- FXImage *dial; // HSV dial image
- FXfloat hsv[3]; // Hue, saturation, value
- FXint ringwidth; // Width of hue ring
- FXint ringouter; // Outer radius
- FXint ringinner; // Inner radius
- FXint dialx; // Dial x location
- FXint dialy; // Dial y location
- FXint satvalx; // Saturation value x
- FXint satvaly; // Saturation value y
- FXint huex; // Hue x
- FXint huey; // Hue y
- FXint clrx; // Color corner of triangle
- FXint clry;
- FXint blkx; // Black corner of triangle
- FXint blky;
- FXint whtx; // White corner of triangle
- FXint whty;
- FXString tip; // Tooltip value
- FXString help; // Help value
- FXuchar mode; // Mode widget is in
-protected:
- FXColorRing();
- void updatering();
- FXfloat hueFromXY(FXint x,FXint y) const;
- void hueToXY(FXint& x,FXint& y,FXfloat hue) const;
- void satValToXY(FXint& x,FXint& y,FXfloat s,FXfloat v) const;
- void satValFromXY(FXfloat& s,FXfloat& v,FXint x,FXint y) const;
- FXbool inCorner(FXint x,FXint y) const;
- FXbool inHueRing(FXint x,FXint y) const;
- FXbool inTriangle(FXint x,FXint y) const;
-protected:
- enum {
- MOUSE_NONE, // No mouse operation
- MOUSE_HUE, // Moving in hue-ring
- MOUSE_SATVAL // Moving in saturation/value triangle
- };
-private:
- FXColorRing(const FXColorRing&);
- FXColorRing &operator=(const FXColorRing&);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXColorSelector.i b/swig-interfaces/FXColorSelector.i
index b1cfa2b661d7966337199a15cd691c6c662815f5..324a2172e526d2473a56b87755959242f86185a5 100644
--- a/swig-interfaces/FXColorSelector.i
+++ b/swig-interfaces/FXColorSelector.i
@@ -34,31 +34,6 @@ class FXLabel;
/// Color selection widget
class FXColorSelector : public FXPacker {
-protected:
- FXTabBook *panels; // Color panes
- FXColorWell *well; // Main well
- FXColorList *list; // List of color names
- FXColorRing *wheel; // Color ring
- FXSlider *rgbaslider[4]; // RGBA sliders
- FXTextField *rgbatext[4]; // RGBA text fields
- FXSlider *hsvaslider[4]; // HSVA sliders
- FXTextField *hsvatext[4]; // HSVA text fields
- FXSlider *cmyslider[4]; // CMY sliders
- FXTextField *cmytext[4]; // CMY text fields
- FXColorWell *colorwells[24]; // Custom color wells
- FXIcon *eyedropicon; // Icon for eye dropper
- FXIcon *dialmodeicon; // Icon for dial mode
- FXIcon *rgbmodeicon; // Icon for RGB mode
- FXIcon *hsvmodeicon; // Icon for HSV mode
- FXIcon *cmymodeicon; // Icon for CMY mode
- FXIcon *txtmodeicon; // Icon for TEXT mode
- FXButton *accept; // Accept button
- FXButton *cancel; // Cancel button
- FXfloat rgba[4]; // Accurate RGBA color
- FXfloat hsva[4]; // Accurate HSVA color
-protected:
- FXColorSelector(){}
- void updateWell();
public:
long onCmdWell(FXObject*,FXSelector,void* PTR_IGNORE);
long onChgWell(FXObject*,FXSelector,void* PTR_COLOR);
diff --git a/swig-interfaces/FXColorWell.i b/swig-interfaces/FXColorWell.i
index eaba8e5d04049dde1f510ba9aafd3772b7c7c9a3..47295ea6753a81f854a3e6e327d62592b9e70aeb 100644
--- a/swig-interfaces/FXColorWell.i
+++ b/swig-interfaces/FXColorWell.i
@@ -38,16 +38,6 @@ enum {
* you can highlight the word `red' and paste it into a color well.
*/
class FXColorWell : public FXFrame {
-protected:
- FXColor wellColor[2]; // Pixel value of RGBA over black and white
- FXColor rgba; // Color with RGB and Alpha
- FXColor oldrgba; // Old color
- FXString tip; // Tooltip value
- FXString help; // Help value
-protected:
- FXColorWell();
- static FXColor rgbaoverblack(FXColor clr);
- static FXColor rgbaoverwhite(FXColor clr);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXColorWheel.i b/swig-interfaces/FXColorWheel.i
index 8b67a4c5a66a08825183b35cb4dc9a89bdcf86a4..611cae7c4c3b454440a3e9df674aa8dbc6571400 100644
--- a/swig-interfaces/FXColorWheel.i
+++ b/swig-interfaces/FXColorWheel.i
@@ -28,21 +28,6 @@ class FXImage;
* of the hue, saturation, value color specification system.
*/
class FXColorWheel : public FXFrame {
-protected:
- FXImage *dial; // HSV dial image
- FXfloat hsv[3]; // Hue, saturation, value
- FXint dialx; // Dial x location
- FXint dialy; // Dial Y location
- FXint spotx; // Spot x location
- FXint spoty; // Spot Y location
- FXString tip; // Tooltip value
- FXString help; // Help value
-protected:
- FXColorWheel();
- void updatedial();
- void movespot(FXint x,FXint y);
- FXbool hstoxy(FXint& x,FXint& y,FXfloat h,FXfloat s) const;
- FXbool xytohs(FXfloat& h,FXfloat& s,FXint x,FXint y) const;
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXComboBox.i b/swig-interfaces/FXComboBox.i
index 3f118e794d60eba3331c6d0b8c8c8198e390a50d..32c4debb815181bcf18f4f0a430a73cf82001bae 100644
--- a/swig-interfaces/FXComboBox.i
+++ b/swig-interfaces/FXComboBox.i
@@ -72,13 +72,6 @@ class FXPopup;
* the value of the field.
*/
class FXComboBox : public FXPacker {
-protected:
- FXTextField *field;
- FXMenuButton *button;
- FXList *list;
- FXPopup *pane;
-protected:
- FXComboBox(){}
public:
long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXComposeContext.i b/swig-interfaces/FXComposeContext.i
index 4cd2f86924c605ef36f02116e188951545892259..7fe1746f4d7e486415f85fc66a01b30da6f9390c 100644
--- a/swig-interfaces/FXComposeContext.i
+++ b/swig-interfaces/FXComposeContext.i
@@ -28,11 +28,6 @@
* if input method support is enabled.
*/
class FXComposeContext : public FXId {
-protected:
- FXWindow *window; // Window we belong to
- FXSelector message; // Message to send it
-protected:
- FXComposeContext();
public:
%extend {
diff --git a/swig-interfaces/FXComposite.i b/swig-interfaces/FXComposite.i
index 0b8670d814ba08929d46dcdce4b49dbbd6f02689..6052c2da031964940fc2c4c97384d395cfc78aed 100644
--- a/swig-interfaces/FXComposite.i
+++ b/swig-interfaces/FXComposite.i
@@ -23,10 +23,6 @@
/// Base composite
class FXComposite : public FXWindow {
-protected:
- FXComposite(){}
- FXComposite(FXApp* a,FXVisual *vis);
- FXComposite(FXApp* a,FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h);
public:
long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXCursor.i b/swig-interfaces/FXCursor.i
index 2709fe18135aabeb42fe46b65d2610bff3d42ed1..4934cdaa66682f9fc20109f10679b3c1e0abc79d 100644
--- a/swig-interfaces/FXCursor.i
+++ b/swig-interfaces/FXCursor.i
@@ -42,15 +42,6 @@ enum {
/// Cursor class
class FXCursor : public FXId {
-protected:
- FXColor *data; // Source data
- FXint width; // Width
- FXint height; // Height
- FXint hotx; // Hot spot x
- FXint hoty; // Hot spot y
- FXuint options; // Options
-protected:
- FXCursor();
public:
%extend {
/// Make stock cursor
diff --git a/swig-interfaces/FXDC.i b/swig-interfaces/FXDC.i
index 6ad5062c548ab43119da61ac6b481deb4eed46d1..b8f8756783c25e3e45bdef3727d5d4f9b7669cf1 100644
--- a/swig-interfaces/FXDC.i
+++ b/swig-interfaces/FXDC.i
@@ -164,32 +164,6 @@ class FXDrawable;
* application regardless of the actual device surface being utilized.
*/
class FXDC {
-private:
- FXApp *app; // Application
-protected:
- void *ctx; // Context handle
- FXFont *font; // Drawing font
- FXStipplePattern pattern; // Stipple pattern
- FXBitmap *stipple; // Stipple bitmap
- FXImage *tile; // Tile image
- FXBitmap *mask; // Mask bitmap
- FXRectangle clip; // Clip rectangle
- FXColor fg; // Foreground color
- FXColor bg; // Background color
- FXuint width; // Line width
- FXCapStyle cap; // Line cap style
- FXJoinStyle join; // Line join style
- FXLineStyle style; // Line style
- FXFillStyle fill; // Fill style
- FXFillRule rule; // Fill rule
- FXFunction rop; // RasterOp
- FXchar dashpat[32]; // Line dash pattern data
- FXuint dashlen; // Line dash pattern length
- FXuint dashoff; // Line dash pattern offset
- FXint tx; // Tile dx
- FXint ty; // Tile dy
- FXint cx; // Clip x
- FXint cy; // Clip y
public:
%extend {
/// Construct dummy DC
diff --git a/swig-interfaces/FXDCPrint.i b/swig-interfaces/FXDCPrint.i
index 4983822289c484e335255bee9537ca10d8af1449..4668b15adfc4c216e5da47e1a7c4b8c28c2db3b8 100644
--- a/swig-interfaces/FXDCPrint.i
+++ b/swig-interfaces/FXDCPrint.i
@@ -91,25 +91,6 @@ struct FXPrinter {
/// Postscript Printer Device Context
class FXDCPrint : public FXDC {
-protected:
- void *psout; // File Stream for PS output
- FXFont *font;
- FXuint flags;
- FXint Xr,Yr;
- FXdouble mediawidth; // Media width
- FXdouble mediaheight; // Media height
- FXPSBounds mediabb; // Media bounding box
- FXPSBounds docbb; // Document bounding box
- FXPSBounds pagebb; // Page bounding box
- FXint pagecount; // Number of pages printed
- FXint nchars; // Number of characters on a line
- FXint pxmin; // min X coord in content
- FXint pymin; // min Y coord in content
- FXint pxmax; // max X coord in content
- FXint pymax; // max Y coord in content
-protected:
- void bbox(FXfloat x,FXfloat y);
- void tfm(FXfloat& xo,FXfloat& yo,FXfloat xi,FXfloat yi);
public:
%extend {
/// Construct
diff --git a/swig-interfaces/FXDataTarget.i b/swig-interfaces/FXDataTarget.i
index a49e4244d51f9e5dd123e7379d7f9c4af89c55bf..8fecffc83bfe0b5be28362306a756fc8c92d819f 100644
--- a/swig-interfaces/FXDataTarget.i
+++ b/swig-interfaces/FXDataTarget.i
@@ -34,11 +34,6 @@
* by subtracting ID_OPTION from the message ID.
*/
class FXDataTarget : public FXObject {
-protected:
- FXObject *target; // Target object
- void *data; // Associated data
- FXSelector message; // Message ID
- FXuint type; // Type of data
public:
long onCmdValue(FXObject*,FXSelector,void* PTR_IGNORE);
long onUpdValue(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXDebugTarget.i b/swig-interfaces/FXDebugTarget.i
index 0454418e46795a6c5e0224499cd749ae33f8c0a6..18ff16135f1da3d66ee54c195d590f8b4bd04c41 100644
--- a/swig-interfaces/FXDebugTarget.i
+++ b/swig-interfaces/FXDebugTarget.i
@@ -27,10 +27,6 @@
* whose messages you want to see,
*/
class FXDebugTarget : public FXObject {
-protected:
- FXObject *lastsender;
- FXSelector lastsel;
- FXuint count;
public:
#ifdef SWIGRUBY
%extend {
diff --git a/swig-interfaces/FXDelegator.i b/swig-interfaces/FXDelegator.i
index b59385823686d405e8a689015068379ebf648a05..7bbea2b052709a555d13f8284bb2f7dca67c99d0 100644
--- a/swig-interfaces/FXDelegator.i
+++ b/swig-interfaces/FXDelegator.i
@@ -31,8 +31,6 @@
* new target.
*/
class FXDelegator : public FXObject {
-protected:
- FXObject *delegate;
public:
%extend {
/// Construct a delegator
diff --git a/swig-interfaces/FXDial.i b/swig-interfaces/FXDial.i
index c47bd953684df7c663764a0a11905962a72c8237..c6458429f72b2ca260901f7cb2d48d6aa6485d35 100644
--- a/swig-interfaces/FXDial.i
+++ b/swig-interfaces/FXDial.i
@@ -32,20 +32,6 @@ enum {
/// Dial
class FXDial : public FXFrame {
-protected:
- FXint range[2]; // Reported data range
- FXColor notchColor; // Main notch color
- FXint notchangle; // Angle of main notch
- FXint notchspacing; // Angle between notches
- FXint notchoffset; // Notch offset
- FXint dragpoint; // Place where clicked
- FXint dragpos; // Value where clicked
- FXint incr; // Rate of change/revolution
- FXint pos; // Reported data position
- FXString help; // Help string
- FXString tip; // Tip string
-protected:
- FXDial(){}
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onMotion(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXDialogBox.i b/swig-interfaces/FXDialogBox.i
index 586350d70a844daf7b11e3606cbf0ae50bf40224..f6ea0fa15916fe390bf0b11cf47c074ef97d6d5f 100644
--- a/swig-interfaces/FXDialogBox.i
+++ b/swig-interfaces/FXDialogBox.i
@@ -27,8 +27,6 @@
* To close the DialogBox when not running modally, simply send it ID_HIDE.
*/
class FXDialogBox : public FXTopWindow {
-protected:
- FXDialogBox(){}
public:
long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXDict.i b/swig-interfaces/FXDict.i
index a397e8092c1ffd410dff87b29ede0d20a634b7e5..951d5c248763004a9f38d3f5d4135b17bc48ceaa 100644
--- a/swig-interfaces/FXDict.i
+++ b/swig-interfaces/FXDict.i
@@ -37,33 +37,6 @@
* be indexed by strings.
*/
class FXDict : public FXObject {
-protected:
- struct FXDictEntry {
- FXchar *key; // Key string
- void *data; // Data
- FXint hash; // Hash value of key
- bool mark; // Entry is marked
- };
-protected:
- FXDictEntry *dict; // Dictionary
- FXint total; // Dictionary size
- FXint number; // Number of entries
-protected:
-
- /**
- * Overload this function in a derived class to return the
- * data pointer given an input pointer; the default implementation
- * just returns the input pointer.
- */
- virtual void *createData(const void*);
-
- /**
- * Overload this function in a derived class to delete the pointer
- * previously returned by createData(); the default implementation
- * does nothing.
- */
- virtual void deleteData(void*);
-
public:
%extend {
/**
diff --git a/swig-interfaces/FXDirDialog.i b/swig-interfaces/FXDirDialog.i
index 1a329cb2104f4146234d39c1c3ce19c001771d8d..c68dfbeed1e6976f39223decb4a7e51ba54ce62e 100644
--- a/swig-interfaces/FXDirDialog.i
+++ b/swig-interfaces/FXDirDialog.i
@@ -32,11 +32,6 @@ class FXDirSelector;
/// Directory selection dialog
class FXDirDialog : public FXDialogBox {
-protected:
- FXDirSelector *dirbox; // Directory selection widget
-protected:
- FXDirDialog(){}
- void initdialog();
public:
%extend {
/// Construct Directory Dialog Box
diff --git a/swig-interfaces/FXDirList.i b/swig-interfaces/FXDirList.i
index 7d04d5d3d4b96ea46acf941eb21d6ba574f19f29..d2113747e8f1616870dc756f1777b7a719d770cc 100644
--- a/swig-interfaces/FXDirList.i
+++ b/swig-interfaces/FXDirList.i
@@ -35,14 +35,6 @@ enum {
/// Directory item
class FXDirItem : public FXTreeItem {
-protected:
- FXFileAssoc *assoc; // File association
- FXDirItem *link; // Link to next item
- FXDirItem *list; // List of child items
- FXlong size; // File size (if a file)
- FXTime date; // Time of item
-protected:
- FXDirItem():assoc(NULL),link(NULL),list(NULL),size(0L),date(0){}
public:
enum {
FOLDER = 512, // Directory item
@@ -118,29 +110,6 @@ DECLARE_FXTREEITEM_VIRTUALS(FXDirItem)
* The Directory list widget supports drags and drops of files.
*/
class FXDirList : public FXTreeList {
-protected:
- FXFileDict *associations; // Association table
- FXDirItem *list; // Root item list
- FXString dropdirectory; // Drop directory
- FXDragAction dropaction; // Drop action
- FXString dragfiles; // Dragged files
- FXString pattern; // Pattern of file names
- FXuint matchmode; // File wildcard match mode
- FXuint counter; // Refresh counter
- FXIcon *open_folder; // Open folder icon
- FXIcon *closed_folder; // Closed folder icon
- FXIcon *mini_doc; // Document icon
- FXIcon *mini_app; // Application icon
- FXIcon *cdromicon;
- FXIcon *harddiskicon;
- FXIcon *networkicon;
- FXIcon *floppyicon;
- FXIcon *zipdiskicon;
-protected:
- FXDirList();
- void listRootItems();
- void listChildItems(FXDirItem *par);
- virtual FXTreeItem* createItem(const FXString& text,FXIcon* oi,FXIcon* ci,void* ptr);
public:
long onRefreshTimer(FXObject*,FXSelector,void* PTR_IGNORE);
long onBeginDrag(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXDirSelector.i b/swig-interfaces/FXDirSelector.i
index d681f28333392dfced402605cf81ddbc10699c78..8d7db94256e8becc1b1124a07daa5cedcd1e0451 100644
--- a/swig-interfaces/FXDirSelector.i
+++ b/swig-interfaces/FXDirSelector.i
@@ -35,25 +35,6 @@ class FXDriveBox;
/// Directory selection widget
class FXDirSelector : public FXPacker {
-protected:
- FXDirList *dirbox; // Directory list widget
- FXDriveBox *drivebox; // Drive selection widget
- FXTextField *dirname; // Directory name entry field
- FXButton *accept; // Accept button
- FXButton *cancel; // Cancel button
- FXIcon *updiricon; // Up directory icon
- FXIcon *homeicon; // Go home icon
- FXIcon *workicon; // Go home icon
- FXIcon *markicon; // Book mark icon
- FXIcon *clearicon; // Book clear icon
- FXIcon *newicon; // New directory icon
- FXIcon *deleteicon; // Delete file icon
- FXIcon *moveicon; // Rename file icon
- FXIcon *copyicon; // Copy file icon
- FXIcon *linkicon; // Link file icon
- FXRecentFiles mrufiles; // Recently visited places
-protected:
- FXDirSelector(){}
public:
long onCmdName(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdOpened(FXObject*,FXSelector,void* PTR_TREEITEM);
diff --git a/swig-interfaces/FXDockBar.i b/swig-interfaces/FXDockBar.i
index 0a8e74050acc685667c423da714ed403b0c671f3..d7a49d732eb0dc6f1b125741f2d3ab048f4ec8c0 100644
--- a/swig-interfaces/FXDockBar.i
+++ b/swig-interfaces/FXDockBar.i
@@ -37,14 +37,6 @@
* in the void* pointer argument of the message.
*/
class FXDockBar : public FXPacker {
-protected:
- FXComposite *drydock; // Parent when docked
- FXComposite *wetdock; // Parent when floating
- FXint gripx; // Grip offset x
- FXint gripy; // Grip offset y
- FXuchar allowed; // Where we're allowed to dock
-protected:
- FXDockBar();
public:
long onCmdUndock(FXObject*,FXSelector,void* PTR_IGNORE);
long onUpdUndock(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXDockHandler.i b/swig-interfaces/FXDockHandler.i
index 60cb1f844950ff5915456f4c3d94bbf935badd7f..2220b6f9c5e3a73657be3f9afbfb4853656084a6 100644
--- a/swig-interfaces/FXDockHandler.i
+++ b/swig-interfaces/FXDockHandler.i
@@ -30,14 +30,6 @@
* and dock title.
*/
class FXDockHandler : public FXFrame {
-protected:
- FXString tip; // Tool tip
- FXString help; // Help string
-protected:
- FXDockHandler();
-private:
- FXDockHandler(const FXDockHandler&);
- FXDockHandler& operator=(const FXDockHandler&);
public:
long onLeftBtnPress(FXObject*,FXSelector,void*);
long onLeftBtnRelease(FXObject*,FXSelector,void*);
@@ -50,8 +42,6 @@ public:
long onCmdGetTip(FXObject*,FXSelector,void*);
long onCmdSetHelp(FXObject*,FXSelector,void*);
long onCmdGetHelp(FXObject*,FXSelector,void*);
-protected:
- FXDockHandler(FXComposite* p,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb);
public:
/// Set the status line help text for grip
diff --git a/swig-interfaces/FXDockSite.i b/swig-interfaces/FXDockSite.i
index 6db2be693c3ca6662c7a45e3f6733f897ec6a71c..3332b873c95851c3c021c8af8f4939f0d46e5e66 100644
--- a/swig-interfaces/FXDockSite.i
+++ b/swig-interfaces/FXDockSite.i
@@ -53,13 +53,6 @@ enum {
* vertically oriented if placed with LAYOUT_SIDE_LEFT or LAYOUT_SIDE_RIGHT.
*/
class FXDockSite : public FXPacker {
-protected:
- FXDockSite(){}
-protected:
- void moveVerBar(FXWindow* bar,FXWindow *begin,FXWindow* end,FXint bx,FXint by);
- void moveHorBar(FXWindow* bar,FXWindow *begin,FXWindow* end,FXint bx,FXint by);
- FXint galleyWidth(FXWindow *begin,FXWindow*& end,FXint space,FXint& require,FXint& expand) const;
- FXint galleyHeight(FXWindow *begin,FXWindow*& end,FXint space,FXint& require,FXint& expand) const;
public:
%extend {
diff --git a/swig-interfaces/FXDockTitle.i b/swig-interfaces/FXDockTitle.i
index 087a6379e6021786e54d16d0210d0bf9e4174410..7769b00119c330484c9d7098aae653142c98b4b7 100644
--- a/swig-interfaces/FXDockTitle.i
+++ b/swig-interfaces/FXDockTitle.i
@@ -35,12 +35,6 @@
* caption above the dock bar.
*/
class FXDockTitle : public FXDockHandler {
-protected:
- FXString caption; // Caption text
- FXFont *font; // Caption font
- FXColor captionColor; // Caption color
-protected:
- FXDockTitle();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onCmdSetValue(FXObject*,FXSelector,void*); // FIXME
diff --git a/swig-interfaces/FXDragCorner.i b/swig-interfaces/FXDragCorner.i
index 6f45f2ce27d3016c8e66b4f6b725c8e0e72e16bd..bd4da286c9aac55141286cd7adfcb99fc847d99b 100644
--- a/swig-interfaces/FXDragCorner.i
+++ b/swig-interfaces/FXDragCorner.i
@@ -26,15 +26,6 @@
* so as to allow the window to be resized more easily.
*/
class FXDragCorner : public FXWindow {
-protected:
- FXColor hiliteColor;
- FXColor shadowColor;
- FXint oldw;
- FXint oldh;
- FXint xoff;
- FXint yoff;
-protected:
- FXDragCorner();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXDrawable.i b/swig-interfaces/FXDrawable.i
index 5b29e2919385865f9db7d1b2005c468ba477d276..fe3f17cb2c62d5b30c5f494941024f3724f49b53 100644
--- a/swig-interfaces/FXDrawable.i
+++ b/swig-interfaces/FXDrawable.i
@@ -28,13 +28,6 @@ class FXVisual;
* drawn upon, such as a FXWindow, or FXImage.
*/
class FXDrawable : public FXId {
-protected:
- FXVisual *visual; // Visual for this window
- FXint width; // Width
- FXint height; // Height
-protected:
- FXDrawable();
- FXDrawable(FXApp* a,FXint w,FXint h);
public:
%extend {
// Construct with this width and height
diff --git a/swig-interfaces/FXFileDialog.i b/swig-interfaces/FXFileDialog.i
index 0c8d5ceaadc5afda376ff485d5ec3c19f70c34a9..e65d2643d347c1faae31d1c8b16106e59af579ad 100644
--- a/swig-interfaces/FXFileDialog.i
+++ b/swig-interfaces/FXFileDialog.i
@@ -38,11 +38,6 @@ class FXFileSelector;
/// File selection dialog
class FXFileDialog : public FXDialogBox {
-protected:
- FXFileSelector *filebox;
-protected:
- FXFileDialog(){}
- void initdialog();
public:
%extend {
/// Construct file dialog box
diff --git a/swig-interfaces/FXFileDict.i b/swig-interfaces/FXFileDict.i
index faf867abe1afe7b989fe5d2eda0d52cf43247562..87a7f2818d7ec25964815c75397e504cf6125b79 100644
--- a/swig-interfaces/FXFileDict.i
+++ b/swig-interfaces/FXFileDict.i
@@ -38,11 +38,6 @@ struct FXFileAssoc {
/// File Association dictionary
class FXFileDict : public FXDict {
-protected:
- FXFileDict(){}
- virtual void *createData(const void*);
- virtual void deleteData(void*);
-
public:
%extend {
/// Registry key used to find fallback executable icons
diff --git a/swig-interfaces/FXFileList.i b/swig-interfaces/FXFileList.i
index b5aa437ae6f48aad250af67b88570e224be78df9..786bb6c65dd65eaa2819eb65527f121194027e56 100644
--- a/swig-interfaces/FXFileList.i
+++ b/swig-interfaces/FXFileList.i
@@ -126,29 +126,6 @@ DECLARE_FXICONITEM_VIRTUALS(FXFileItem)
* The File list widget supports drags and drops of files.
*/
class FXFileList : public FXIconList {
-protected:
- FXString directory; // Current directory
- FXString orgdirectory; // Original directory
- FXString dropdirectory; // Drop directory
- FXDragAction dropaction; // Drop action
- FXString dragfiles; // Dragged files
- FXFileDict *associations; // Association table
- FXFileItem *list; // File item list
- FXString pattern; // Pattern of file names
- FXuint matchmode; // File wildcard match mode
- FXuint counter; // Refresh counter
- FXint imagesize; // Image size
- FXTime timestamp; // Time when last refreshed
- FXIcon *big_folder; // Big folder icon
- FXIcon *mini_folder; // Mini folder icon
- FXIcon *big_doc; // Big document icon
- FXIcon *mini_doc; // Mini document icon
- FXIcon *big_app; // Big application icon
- FXIcon *mini_app; // Mini application icon
-protected:
- FXFileList();
- virtual FXIconItem *createItem(const FXString& text,FXIcon *big,FXIcon* mini,void* ptr);
- void listItems(FXbool force);
public:
long onOpenTimer(FXObject*,FXSelector,void* PTR_IGNORE);
long onRefreshTimer(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXFileSelector.i b/swig-interfaces/FXFileSelector.i
index 89cbd4e721d4471297a61fe92b3720e646f68c98..3a0a59cc37cc531592bb900b82ec17a86d8056d3 100644
--- a/swig-interfaces/FXFileSelector.i
+++ b/swig-interfaces/FXFileSelector.i
@@ -60,39 +60,6 @@ enum {
/// File selection widget
class FXFileSelector : public FXPacker {
-protected:
- FXFileList *filebox; // File list widget
- FXTextField *filename; // File name entry field
- FXComboBox *filefilter; // Combobox for pattern list
- FXMenuPane *bookmarkmenu; // Menu for bookmarks
- FXHorizontalFrame *navbuttons; // Navigation buttons
- FXHorizontalFrame *fileboxframe; // Frame around file list
- FXMatrix *entryblock; // Entry block
- FXCheckButton *readonly; // Open file as read only
- FXDirBox *dirbox; // Directory hierarchy list
- FXButton *accept; // Accept button
- FXButton *cancel; // Cancel button
- FXIcon *updiricon; // Up directory icon
- FXIcon *listicon; // List mode icon
- FXIcon *detailicon; // Detail mode icon
- FXIcon *iconsicon; // Icon mode icon
- FXIcon *homeicon; // Go home icon
- FXIcon *workicon; // Go home icon
- FXIcon *shownicon; // Files shown icon
- FXIcon *hiddenicon; // Files hidden icon
- FXIcon *markicon; // Book mark icon
- FXIcon *clearicon; // Book clear icon
- FXIcon *newicon; // New directory icon
- FXIcon *deleteicon; // Delete file icon
- FXIcon *moveicon; // Rename file icon
- FXIcon *copyicon; // Copy file icon
- FXIcon *linkicon; // Link file icon
- FXRecentFiles bookmarks; // Bookmarked places
- FXuint selectmode; // Select mode
-protected:
- FXFileSelector(){}
- FXString *getSelectedFiles() const;
- FXString *getSelectedFilesOnly() const;
public:
long onCmdAccept(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdFilter(FXObject*,FXSelector,void* PTR_CSTRING);
diff --git a/swig-interfaces/FXFoldingList.i b/swig-interfaces/FXFoldingList.i
index cbefbd491df3b47f7bb282fac9fef8031668a645..891e3db1050b941eb709f0c2ca2736385c5ff626 100644
--- a/swig-interfaces/FXFoldingList.i
+++ b/swig-interfaces/FXFoldingList.i
@@ -38,10 +38,6 @@ enum {
/// Tree list Item
class FXFoldingItem : public FXObject {
-protected:
- FXFoldingItem():parent(NULL),prev(NULL),next(NULL),first(NULL),last(NULL),openIcon(NULL),closedIcon(NULL),data(NULL),state(0),x(0),y(0){}
- virtual void draw(const FXFoldingList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
- virtual FXint hitItem(const FXFoldingList* list,FXint x,FXint y) const;
public:
enum{
SELECTED = 1,
@@ -168,15 +164,6 @@ DECLARE_FXFOLDINGITEM_VIRTUALS(FXFoldingItem)
* 3rd argument of the message.
*/
class FXFoldingList : public FXScrollArea {
-protected:
- FXFoldingList();
- void recompute();
- void mergesort(FXFoldingItem*& list);
- void sort(FXFoldingItem*& f1,FXFoldingItem*& t1,FXFoldingItem*& f2,FXFoldingItem*& t2,int n);
- virtual void moveContents(FXint x,FXint y);
- virtual FXFoldingItem* createItem(const FXString& text,FXIcon* oi,FXIcon* ci,void* ptr);
- static FXint compareSection(const FXchar *p,const FXchar* q,FXint s);
- static FXint compareSectionCase(const FXchar *p,const FXchar* q,FXint s);
public:
long onPaint(FXObject*,FXSelector,void*);
long onEnter(FXObject*,FXSelector,void*);
diff --git a/swig-interfaces/FXFont.i b/swig-interfaces/FXFont.i
index a4acefcd9a019dfcdf2edd17c69b582df2a25712..b0907a12a741b12d2c60ae0042fafcbf8b5e41f1 100644
--- a/swig-interfaces/FXFont.i
+++ b/swig-interfaces/FXFont.i
@@ -125,26 +125,6 @@ struct FXFontDesc {
/// Font class
class FXFont : public FXId {
-protected:
- FXString wantedName; // Desired font font name
- FXString actualName; // Matched font font name
- FXushort wantedSize; // Font size (points*10)
- FXushort actualSize; // Actual size that was matched
- FXushort wantedWeight; // Font weight
- FXushort actualWeight; // Font weight
- FXushort wantedSlant; // Font slant
- FXushort actualSlant; // Font slant
- FXushort wantedSetwidth; // Relative setwidth
- FXushort actualSetwidth; // Relative setwidth
- FXushort wantedEncoding; // Character set encoding
- FXushort actualEncoding; // Character set encoding
- FXushort hints; // Matching hint flags
- FXushort flags; // Actual flags
- FXshort angle; // Angle
- void *font; // Info about the font
-protected:
- FXFont();
- void* match(const FXString& wantfamily,const FXString& wantforge,FXuint wantsize,FXuint wantweight,FXuint wantslant,FXuint wantsetwidth,FXuint wantencoding,FXuint wanthints,FXint res);
public:
/// Font pitch hints
diff --git a/swig-interfaces/FXFontDialog.i b/swig-interfaces/FXFontDialog.i
index 4b44654cff7652bd71117978075c3bb968a162e6..1f94258f21e0de8b270bad8d7202716f20d4d143 100644
--- a/swig-interfaces/FXFontDialog.i
+++ b/swig-interfaces/FXFontDialog.i
@@ -25,10 +25,6 @@ class FXFontSelector;
/// Font selection dialog
class FXFontDialog : public FXDialogBox {
-protected:
- FXFontSelector *fontbox;
-protected:
- FXFontDialog(){}
public:
%extend {
/// Constructor
@@ -43,9 +39,9 @@ public:
%extend {
/// Get the current font selection
FXFontDesc getFontSelection() const {
- FXFontDesc fontdesc;
- self->getFontSelection(fontdesc);
- return fontdesc;
+ FXFontDesc fontdesc;
+ self->getFontSelection(fontdesc);
+ return fontdesc;
}
}
diff --git a/swig-interfaces/FXFontSelector.i b/swig-interfaces/FXFontSelector.i
index c1707e10b784ed6923ed6f3430e68ff611d8b062..6b1e0f9e9ec7635d55efd191b78ad38b47da04d9 100644
--- a/swig-interfaces/FXFontSelector.i
+++ b/swig-interfaces/FXFontSelector.i
@@ -31,32 +31,6 @@ class FXFont;
/// Font selection widget
class FXFontSelector : public FXPacker {
-protected:
- FXTextField *family;
- FXList *familylist;
- FXTextField *weight;
- FXList *weightlist;
- FXTextField *style;
- FXList *stylelist;
- FXTextField *size;
- FXList *sizelist;
- FXComboBox *charset;
- FXComboBox *setwidth;
- FXComboBox *pitch;
- FXCheckButton *scalable;
- FXCheckButton *allfonts;
- FXButton *accept;
- FXButton *cancel;
- FXLabel *preview;
- FXFont *previewfont;
- FXFontDesc selected;
-protected:
- FXFontSelector(){}
- void listFontFaces();
- void listWeights();
- void listSlants();
- void listFontSizes();
- void previewFont();
public:
long onCmdFamily(FXObject*,FXSelector,void* PTR_INT);
long onCmdWeight(FXObject*,FXSelector,void* PTR_INT);
@@ -109,9 +83,9 @@ public:
%extend {
/// Get font selection
FXFontDesc getFontSelection() const {
- FXFontDesc fontdesc;
- self->getFontSelection(fontdesc);
- return fontdesc;
+ FXFontDesc fontdesc;
+ self->getFontSelection(fontdesc);
+ return fontdesc;
}
}
diff --git a/swig-interfaces/FXFrame.i b/swig-interfaces/FXFrame.i
index 9c9f0acc8c0e25e2f1dbb88efc6cae213365c529..6d04bfa0f24058c2cd2d0408e4f43c423830acff 100644
--- a/swig-interfaces/FXFrame.i
+++ b/swig-interfaces/FXFrame.i
@@ -40,26 +40,6 @@ enum { DEFAULT_PAD = 2 };
/// Base Frame
class FXFrame : public FXWindow {
-protected:
- FXColor baseColor; // Base color
- FXColor hiliteColor; // Highlight color
- FXColor shadowColor; // Shadow color
- FXColor borderColor; // Border color
- FXint padtop; // Top padding
- FXint padbottom; // Bottom padding
- FXint padleft; // Left padding
- FXint padright; // right padding
- FXint border; // Border size
-protected:
- FXFrame();
- void drawBorderRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawRidgeRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawGrooveRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawDoubleRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawDoubleSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawFrame(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
diff --git a/swig-interfaces/FXGIFIcon.i b/swig-interfaces/FXGIFIcon.i
index 2719adb261e80103917900e465a519c1ba2de953..24f1f6ffd02468181ac5b02018221daf0f836bf0 100644
--- a/swig-interfaces/FXGIFIcon.i
+++ b/swig-interfaces/FXGIFIcon.i
@@ -23,8 +23,6 @@
/// GIF Icon class
class FXGIFIcon : public FXIcon {
-protected:
- FXGIFIcon(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXGIFImage.i b/swig-interfaces/FXGIFImage.i
index 965570601f8ce5a74a154707b899f8cb9da8b4ae..cb01c2ba58c36ebfddab9e80692fe47fd851b549 100644
--- a/swig-interfaces/FXGIFImage.i
+++ b/swig-interfaces/FXGIFImage.i
@@ -23,8 +23,6 @@
/// GIF Image class
class FXGIFImage : public FXImage {
-protected:
- FXGIFImage(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXGLCanvas.i b/swig-interfaces/FXGLCanvas.i
index 4c9162dc07577fdad1ff5bef686a321a6de58a75..8bb89d719bbe29a19244a5298a8fdfc89875740b 100644
--- a/swig-interfaces/FXGLCanvas.i
+++ b/swig-interfaces/FXGLCanvas.i
@@ -24,10 +24,6 @@
/// GLCanvas, an area drawn by another object
class FXGLCanvas : public FXCanvas {
-protected:
- void *ctx; // GL Context
-protected:
- FXGLCanvas();
public:
%extend {
/**
diff --git a/swig-interfaces/FXGLContext.i b/swig-interfaces/FXGLContext.i
index 700e63606b42f37b442c09b5567a12817230625f..d50569036466f9fe7f1371f092573485238888d5 100644
--- a/swig-interfaces/FXGLContext.i
+++ b/swig-interfaces/FXGLContext.i
@@ -36,10 +36,6 @@ class FXGLVisual;
* However, display lists may be shared between different GL contexts.
*/
class FXGLContext : public FXId {
-protected:
- void *ctx; // GL Context
-protected:
- FXGLContext();
public:
%extend {
/**
diff --git a/swig-interfaces/FXGLShape.i b/swig-interfaces/FXGLShape.i
index 0ba32c6c4885b30dae2d10cb49a0b831524aa93c..5e9861ac41fb5bcdf57954e78f2525f1f6d823d2 100644
--- a/swig-interfaces/FXGLShape.i
+++ b/swig-interfaces/FXGLShape.i
@@ -43,17 +43,6 @@ enum {
/// OpenGL Shape Object
class FXGLShape : public FXGLObject {
-protected:
- FXVec3f position; // Middle of the Bounding Box
- FXMaterial material[2]; // Front and back material properties
- FXRangef range; // Range box
- FXuint options; // Drawing options
- FXString tip;
-protected:
- FXGLShape();
- virtual void drawshape(FXGLViewer*){} // To be overloaded by derived class
- void drawbox();
- void drawhandles();
public:
long onDNDDrop(FXObject*,FXSelector,void*);
long onDNDMotion(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXGLViewer.i b/swig-interfaces/FXGLViewer.i
index c5d58a01fa3eeb05954fb5903ed2d577efcacd73..111451626a381f510378ef4e71d05fe11ee8b8e6 100644
--- a/swig-interfaces/FXGLViewer.i
+++ b/swig-interfaces/FXGLViewer.i
@@ -83,76 +83,11 @@ struct FXMaterial {
/// Canvas, an area drawn by another object
class FXGLViewer : public FXGLCanvas {
-protected:
- FXViewport wvt; // Window viewport transform
- FXMat4f transform; // Current transformation matrix
- FXMat4f itransform; // Inverse of current transformation matrix
- FXuint projection; // Projection mode
- FXQuatf rotation; // Viewer orientation
- FXdouble fov; // Field of view
- FXdouble zoom; // Zoom factor
- FXVec3f center; // Model center
- FXVec3f scale; // Model scale
- FXdouble worldpx; // Pixel size in world
- FXdouble modelpx; // Pixel size in model
- FXint maxhits; // Maximum number of hits
- FXdouble ax,ay; // Quick view->world coordinate mapping
- FXdouble diameter; // Size of model diameter ( always > 0)
- FXdouble distance; // Distance of PRP to target
- FXVec4f background[2]; // Background colors
- FXVec4f ambient; // Global ambient light
- FXLight light; // Light source
- FXMaterial material; // Base material properties
- FXint dial[3]; // Dial positions
- FXString help; // Status help
- FXString tip; // Tooltip for background
- FXGLObject *dropped; // Object being dropped on
- FXGLObject *selection; // Current object
- FXZSortFunc zsortfunc; // Routine to sort feedback buffer
- FXGLObject *scene; // What we're looking at
- FXbool doesturbo; // Doing turbo mode
- FXbool turbomode; // Turbo mode
- FXuchar mode; // Mode the widget is in
public:
// Common DND types
static FXDragType objectType; // GL Object type
-protected:
-
- // Mouse actions when in viewing window
- enum {
- HOVERING, // Hovering mouse w/o doing anything
- PICKING, // Pick mode
- ROTATING, // Rotating camera around target
- POSTING, // Posting right-mouse menu
- TRANSLATING, // Translating camera
- ZOOMING, // Zooming
- FOVING, // Change field-of-view
- DRAGGING, // Dragging objects
- TRUCKING, // Trucking camera
- GYRATING, // Rotation of camera around eye
- DO_LASSOSELECT, // Lasso select when mouse pressed
- LASSOSELECT, // Anchor of lasso rectangle
- DO_LASSOZOOM, // Zoom when mouse pressed
- LASSOZOOM // Zoom rectangle
- };
-
-protected:
- FXGLViewer();
- void glsetup();
- virtual void updateProjection();
- virtual void updateTransform();
- FXVec3fspherePoint(FXint px,FXint py);
- FXQuatf turn(FXint fx,FXint fy,FXint tx,FXint ty);
- void drawWorld(FXViewport& wv);
- void drawAnti(FXViewport& wv);
- void drawLasso(FXint x0,FXint y0,FXint x1,FXint y1);
- // FXint selectHits(FXuint*& hits,FXint& nhits,FXint x,FXint y,FXint w,FXint h);
- FXint renderFeedback(FXfloat *buffer,FXint x,FXint y,FXint w,FXint h,FXint maxbuffer);
- void drawFeedback(FXDCPrint& pdc,const FXfloat* buffer,FXint used);
- virtual FXGLObject* processHits(FXuint *pickbuffer,FXint nhits);
- void setOp(FXuint o);
public:
// Events
diff --git a/swig-interfaces/FXGroupBox.i b/swig-interfaces/FXGroupBox.i
index 0d3bef18b393574f4da0cc1a638ee2607209f5f9..45d77ed2ecc6d48e82bf27700ab9925c2726c793 100644
--- a/swig-interfaces/FXGroupBox.i
+++ b/swig-interfaces/FXGroupBox.i
@@ -39,12 +39,6 @@ enum {
* be checked at any one time.
*/
class FXGroupBox : public FXPacker {
-protected:
- FXString label;
- FXFont *font;
- FXColor textColor;
-protected:
- FXGroupBox();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onCmdSetValue(FXObject*,FXSelector,void* PTR_IGNORE); // FIXME
diff --git a/swig-interfaces/FXHeader.i b/swig-interfaces/FXHeader.i
index 608c809eb1e90a685bf6827d63d7b82ec56e262a..12935fe4a49265f043d57b0e5aab96e378e27e53 100644
--- a/swig-interfaces/FXHeader.i
+++ b/swig-interfaces/FXHeader.i
@@ -39,16 +39,6 @@ enum {
/// Header item
class FXHeaderItem : public FXObject {
-protected:
- FXString label; // Text of item
- FXIcon *icon; // Icon of item
- void *data; // Item user data pointer
- FXint size; // Item size
- FXint pos; // Item position
- FXuint state; // Item state flags
-protected:
- FXHeaderItem(){}
- virtual void draw(const FXHeader* header,FXDC& dc,FXint x,FXint y,FXint w,FXint h);
public:
enum{
ARROW_NONE = 0, /// No arrow
@@ -164,20 +154,6 @@ DECLARE_FXHEADERITEM_VIRTUALS(FXHeaderItem)
* The contents may be scrolled by calling setPosition().
*/
class FXHeader : public FXFrame {
-protected:
- FXHeaderItemList items; // Item list
- FXColor textColor; // Text color
- FXFont *font; // Text font
- FXString help; // Help text
- FXint pos; // Scroll position
- FXint active; // Active button
- FXint activepos; // Position of active item
- FXint activesize; // Size of active item
- FXint offset; // Offset where split grabbed
-protected:
- FXHeader();
- void drawSplit(FXint pos);
- virtual FXHeaderItem *createItem(const FXString& text,FXIcon* icon,FXint size,void* ptr);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXHorizontalFrame.i b/swig-interfaces/FXHorizontalFrame.i
index 8f27b0537fe40bef112eb2c2eacf0095afb22046..b8e920861c5ffe985f4cb52f47423d0c55ec8753 100644
--- a/swig-interfaces/FXHorizontalFrame.i
+++ b/swig-interfaces/FXHorizontalFrame.i
@@ -27,8 +27,6 @@
* depending on the child window's layout hints.
*/
class FXHorizontalFrame : public FXPacker {
-protected:
- FXHorizontalFrame(){}
public:
%extend {
/// Construct a horizontal frame layout manager
diff --git a/swig-interfaces/FXICOIcon.i b/swig-interfaces/FXICOIcon.i
index a7e1a82b38bd369f4534f6913ef09ca676f0db13..101617baa4be82b0ed15ad572ffd7516e7a9ec1f 100644
--- a/swig-interfaces/FXICOIcon.i
+++ b/swig-interfaces/FXICOIcon.i
@@ -23,8 +23,6 @@
/// ICO icon
class FXICOIcon : public FXIcon {
-protected:
- FXICOIcon(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXICOImage.i b/swig-interfaces/FXICOImage.i
index 89dbb6ccdd2de85a4ec1b4ce0e2f5d17ff51faab..de763f17d58d3df5bdb8591d83db3d59d84ee567 100644
--- a/swig-interfaces/FXICOImage.i
+++ b/swig-interfaces/FXICOImage.i
@@ -23,8 +23,6 @@
/// ICO graphics file
class FXICOImage : public FXImage {
-protected:
- FXICOImage(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXIcon.i b/swig-interfaces/FXIcon.i
index 57ef65edbfb876477daa8438197d49e45553be73..38a9376ff1072fde2d21d27278bafdf4a77894be 100644
--- a/swig-interfaces/FXIcon.i
+++ b/swig-interfaces/FXIcon.i
@@ -23,13 +23,6 @@
/// Icon class
class FXIcon : public FXImage {
-protected:
- FXID shape; // Shape pixmap
- FXID etch; // Etch pixmap
- FXColor transp; // Transparency color
-protected:
- FXIcon(){}
- FXColor guesstransp();
public:
%extend {
/**
diff --git a/swig-interfaces/FXIconList.i b/swig-interfaces/FXIconList.i
index 4d3bac02728abc4aa783c1c4b39dcb0728e7ef28..29ac6ac77ca65997d7880eefc483380ec103195d 100644
--- a/swig-interfaces/FXIconList.i
+++ b/swig-interfaces/FXIconList.i
@@ -45,20 +45,6 @@ class FXIconList;
/// Icon item
class FXIconItem : public FXObject {
-protected:
- FXString label;
- FXIcon *bigIcon;
- FXIcon *miniIcon;
- void *data;
- FXuint state;
-protected:
- FXIconItem():bigIcon(NULL),miniIcon(NULL),data(NULL),state(0){}
- virtual void draw(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
- virtual FXint hitItem(const FXIconList* list,FXint rx,FXint ry,FXint rw=1,FXint rh=1) const;
-protected:
- virtual void drawBigIcon(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
- virtual void drawMiniIcon(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
- virtual void drawDetails(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
public:
enum {
SELECTED = 1, /// Selected
@@ -158,43 +144,6 @@ DYNAMIC_CAST(SWIGTYPE_p_FXIconItem, FXIconItem_dynamic_cast);
* 3rd argument of the message.
*/
class FXIconList : public FXScrollArea {
-protected:
- FXHeader *header; // Header control
- FXIconItem **items; // Item list
- FXint nitems; // Number of items
- FXint nrows; // Number of rows
- FXint ncols; // Number of columns
- FXint anchor; // Anchor item
- FXint current; // Current item
- FXint extent; // Extent item
- FXint cursor; // Cursor item
- FXint viewable; // Visible item
- FXFont *font; // Font
- FXColor textColor; // Text color
- FXColor selbackColor; // Selected back color
- FXColor seltextColor; // Selected text color
- FXint itemWidth; // Item width
- FXint itemHeight; // Item height
- FXint itemSpace; // Space for item label
- FXint anchorx; // Rectangular selection
- FXint anchory;
- FXint currentx;
- FXint currenty;
- FXint grabx; // Grab point x
- FXint graby; // Grab point y
- FXString lookup; // Lookup string
- FXString help; // Help text
- FXbool state; // State of item
-protected:
- FXIconList();
- void recompute();
- void getrowscols(FXint& nr,FXint& nc,FXint w,FXint h) const;
- void drawLasso(FXint x0,FXint y0,FXint x1,FXint y1);
- void lassoChanged(FXint ox,FXint oy,FXint ow,FXint oh,FXint nx,FXint ny,FXint nw,FXint nh,FXbool notify);
- virtual void moveContents(FXint x,FXint y);
- virtual FXIconItem *createItem(const FXString& text,FXIcon *big,FXIcon* mini,void* ptr);
- static FXint compareSection(const FXchar *p,const FXchar* q,FXint s);
- static FXint compareSectionCase(const FXchar *p,const FXchar* q,FXint s);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXIconSource.i b/swig-interfaces/FXIconSource.i
index 3b54a2e0b90be61b1cb116c414f38fb96eeba8d0..3c1cc2de325742582fb0b280b265daebfd2d26ca 100644
--- a/swig-interfaces/FXIconSource.i
+++ b/swig-interfaces/FXIconSource.i
@@ -33,10 +33,6 @@
* realizing the icons.
*/
class FXIconSource : public FXObject {
-protected:
- FXApp *app;
-protected:
- FXIconSource(){}
public:
%extend {
diff --git a/swig-interfaces/FXId.i b/swig-interfaces/FXId.i
index 9816b2c2d0f9b33f7236982c06f32039e3a8b42b..d5b3486eac9c078fc0a99e8bfa98416f9ca9f353 100644
--- a/swig-interfaces/FXId.i
+++ b/swig-interfaces/FXId.i
@@ -28,10 +28,6 @@ class FXApp;
/// Encapsulates server side resource
class FXId : public FXObject {
-protected:
- FXID xid;
-protected:
- FXId(FXApp* a);
public:
/// Get application
diff --git a/swig-interfaces/FXImageFrame.i b/swig-interfaces/FXImageFrame.i
index 13524e06f6ac6903aa44119b96599863c26466af..6d474ca820d8246b17033a30b8601e65d46886b4 100644
--- a/swig-interfaces/FXImageFrame.i
+++ b/swig-interfaces/FXImageFrame.i
@@ -26,13 +26,6 @@
* it must be explicitly deleted elsewhere.
*/
class FXImageFrame : public FXFrame {
-protected:
- FXImage* image; // The image being displayed
-protected:
- FXImageFrame();
-private:
- FXImageFrame(const FXImageFrame&);
- FXImageFrame &operator=(const FXImageFrame&);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
diff --git a/swig-interfaces/FXImageView.i b/swig-interfaces/FXImageView.i
index e623bdb39e5950766933faf3b224fca67dcda592..0eb4b06dc89aa2c2977968c05925b72a8e422061 100644
--- a/swig-interfaces/FXImageView.i
+++ b/swig-interfaces/FXImageView.i
@@ -39,12 +39,6 @@ enum {
* The Image View widget display a scrollable view of an image.
*/
class FXImageView : public FXScrollArea {
-protected:
- FXImage *image; // Image to view
- FXint grabx; // Grab point x
- FXint graby; // Grab point y
-protected:
- FXImageView();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onMotion(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXInputDialog.i b/swig-interfaces/FXInputDialog.i
index 872d7003a3670deb9704acb0fc60764563dd351b..29215e223ddd7a5a1018563f94c185308362a0dc 100644
--- a/swig-interfaces/FXInputDialog.i
+++ b/swig-interfaces/FXInputDialog.i
@@ -38,14 +38,6 @@ class FXTextField;
* A password mode allows the key-in to remain hidden.
*/
class FXInputDialog : public FXDialogBox {
-protected:
- FXTextField *input; // Text field widget
- FXdouble limlo; // Lower limit
- FXdouble limhi; // Upper limit
-protected:
- FXInputDialog(){}
-private:
- FXInputDialog(const FXInputDialog&);
public:
long onCmdAccept(FXObject*,FXSelector,void* PTR_IGNORE);
public:
diff --git a/swig-interfaces/FXJPGIcon.i b/swig-interfaces/FXJPGIcon.i
index 4983c56c0d3fb3b0a6bb3b48f9554b6526651dd8..40fcf2a0e662522b2d3302edfd6b9e76ed361b8b 100644
--- a/swig-interfaces/FXJPGIcon.i
+++ b/swig-interfaces/FXJPGIcon.i
@@ -24,10 +24,6 @@
/// JPG Icon class
class FXJPGIcon : public FXIcon {
-protected:
- FXint quality;
-protected:
- FXJPGIcon(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXJPGImage.i b/swig-interfaces/FXJPGImage.i
index a054b796112bae8545d8d1f83c910b420e875406..15e496730656839a67be49739cb9e2812b4c1b43 100644
--- a/swig-interfaces/FXJPGImage.i
+++ b/swig-interfaces/FXJPGImage.i
@@ -24,10 +24,6 @@
/// JPG Image class
class FXJPGImage : public FXImage {
-protected:
- FXint quality;
-protected:
- FXJPGImage(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXKnob.i b/swig-interfaces/FXKnob.i
index fd56a1f937ee6ef68b4ba7b5142a6913c52e0008..23845d175af64eb1be33d1a8cdeb9d51526cdf8c 100644
--- a/swig-interfaces/FXKnob.i
+++ b/swig-interfaces/FXKnob.i
@@ -52,18 +52,6 @@ enum {
* The message data represents the current knob value, of type FXint.
*/
class FXKnob : public FXFrame {
-protected:
- FXint range[2]; // Reported data range
- FXdouble limits[2]; // Starting and ending positions
- FXColor lineColor; // Color of indicator needle
- FXint pos; // Reported data position
- FXint incr; // Increment when auto-sliding
- FXint delta; // Interval between ticks
- FXString help; // Help string
- FXString tip; // Tip string
-protected:
- FXKnob();
- FXint calcValue(FXint x,FXint y);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXLabel.i b/swig-interfaces/FXLabel.i
index 407bf482dedf0a3ed471112e9556489a14fb868d..01086c4a7367739d041c9689aa7f8b2c100c12a8 100644
--- a/swig-interfaces/FXLabel.i
+++ b/swig-interfaces/FXLabel.i
@@ -51,22 +51,6 @@ class FXFont;
* and/or help string.
*/
class FXLabel : public FXFrame {
-protected:
- FXString label;
- FXIcon* icon;
- FXFont* font;
- FXHotKey hotkey;
- FXint hotoff;
- FXColor textColor;
- FXString tip;
- FXString help;
-protected:
- FXLabel();
- FXint labelHeight(const FXString& text) const;
- FXint labelWidth(const FXString& text) const;
- void drawLabel(FXDCWindow& dc,const FXString& text,FXint hot,FXint tx,FXint ty,FXint tw,FXint th);
- void just_x(FXint& tx,FXint& ix,FXint tw,FXint iw);
- void just_y(FXint& ty,FXint& iy,FXint th,FXint ih);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onHotKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXList.i b/swig-interfaces/FXList.i
index a4832ef0cf52914d7a5caa506bf9d358328f6e12..447e11ebc7e28f1c590cd1745015b1403cca58fa 100644
--- a/swig-interfaces/FXList.i
+++ b/swig-interfaces/FXList.i
@@ -39,16 +39,6 @@ class FXList;
/// List item
class FXListItem : public FXObject {
-protected:
- FXString label;
- FXIcon *icon;
- void *data;
- FXuint state;
- FXint x,y;
-protected:
- FXListItem();
- virtual void draw(const FXList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h);
- virtual FXint hitItem(const FXList* list,FXint x,FXint y) const;
public:
enum {
SELECTED = 1,
@@ -127,29 +117,6 @@ DYNAMIC_CAST(SWIGTYPE_p_FXListItem, FXListItem_dynamic_cast);
* 3rd argument of the message.
*/
class FXList : public FXScrollArea {
-protected:
- FXListItemList items; // Item list
- FXint anchor; // Anchor item
- FXint current; // Current item
- FXint extent; // Extent item
- FXint cursor; // Cursor item
- FXint viewable; // Viewable item
- FXFont *font; // Font
- FXColor textColor; // Text color
- FXColor selbackColor; // Selected back color
- FXColor seltextColor; // Selected text color
- FXint listWidth; // List width
- FXint listHeight; // List height
- FXint visible; // Number of rows high
- FXString help; // Help text
- FXint grabx; // Grab point x
- FXint graby; // Grab point y
- FXString lookup; // Lookup string
- FXbool state; // State of item
-protected:
- FXList();
- void recompute();
- virtual FXListItem *createItem(const FXString& text,FXIcon* icon,void* ptr);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXListBox.i b/swig-interfaces/FXListBox.i
index 9cb673c32882598e9a041194e3784ff88dfe1fe9..76d0b031bb0bada186f52efbfbe866b77f4bb5ee 100644
--- a/swig-interfaces/FXListBox.i
+++ b/swig-interfaces/FXListBox.i
@@ -42,13 +42,6 @@ class FXPopup;
/// List Box
class FXListBox : public FXPacker {
-protected:
- FXButton *field;
- FXMenuButton *button;
- FXList *list;
- FXPopup *pane;
-protected:
- FXListBox(){}
public:
long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXMDIButton.i b/swig-interfaces/FXMDIButton.i
index c1cefb10ce0c1700787916111a05d1f91e83ffeb..5e40bbef5967d1c47c98dc4d4ac2faccece01ad1 100644
--- a/swig-interfaces/FXMDIButton.i
+++ b/swig-interfaces/FXMDIButton.i
@@ -25,8 +25,6 @@ class FXIcon;
/// MDI Delete button
class FXMDIDeleteButton : public FXButton {
-protected:
- FXMDIDeleteButton(){}
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
@@ -50,8 +48,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXMDIDeleteButton)
/// MDI Restore button
class FXMDIRestoreButton : public FXButton {
-protected:
- FXMDIRestoreButton(){}
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
@@ -75,8 +71,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXMDIRestoreButton)
/// MDI Maximize button
class FXMDIMaximizeButton : public FXButton {
-protected:
- FXMDIMaximizeButton(){}
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
@@ -100,8 +94,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXMDIMaximizeButton)
/// MDI Minimize button
class FXMDIMinimizeButton : public FXButton {
-protected:
- FXMDIMinimizeButton(){}
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
@@ -125,8 +117,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXMDIMinimizeButton)
/// MDI Window button
class FXMDIWindowButton : public FXMenuButton {
-protected:
- FXMDIWindowButton(){}
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
@@ -150,8 +140,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXMDIWindowButton)
/// MDI Window Menu
class FXMDIMenu : public FXMenuPane {
-protected:
- FXMDIMenu(){}
public:
%extend {
/// Construct MDI menu
diff --git a/swig-interfaces/FXMDIChild.i b/swig-interfaces/FXMDIChild.i
index 876014bf5d789053f755d190b865609a6b9a696b..b55aeee55c4563ec7daeb19680986c46067a9881 100644
--- a/swig-interfaces/FXMDIChild.i
+++ b/swig-interfaces/FXMDIChild.i
@@ -60,57 +60,6 @@ enum {
* ID_SETSTRINGVALUE), and window icon (via ID_SETICONVALUE).
*/
class FXMDIChild : public FXComposite {
-protected:
- FXString title; // Window title
- FXMenuButton *windowbtn; // Window button
- FXButton *minimizebtn; // Minimize button
- FXButton *restorebtn; // Restore button
- FXButton *maximizebtn; // Maximize buton
- FXButton *deletebtn; // Close button
- FXFont *font; // Title font
- FXColor baseColor; // Colors
- FXColor hiliteColor;
- FXColor shadowColor;
- FXColor borderColor;
- FXColor titleColor;
- FXColor titleBackColor;
- FXint iconPosX; // Saved icon position
- FXint iconPosY;
- FXint iconWidth;
- FXint iconHeight;
- FXint normalPosX; // Saved normal position
- FXint normalPosY;
- FXint normalWidth;
- FXint normalHeight;
- FXint spotx; // Grab-spot of mouse on window
- FXint spoty;
- FXint xoff; // Mouse offset to add
- FXint newx; // New location of window
- FXint newy;
- FXint neww;
- FXint newh;
- FXuchar mode; // Dragging mode
-protected:
- FXMDIChild();
- void drawRubberBox(FXint x,FXint y,FXint w,FXint h);
- void animateRectangles(FXint ox,FXint oy,FXint ow,FXint oh,FXint nx,FXint ny,FXint nw,FXint nh);
- FXuchar where(FXint x,FXint y);
- void changeCursor(FXint x,FXint y);
- void revertCursor();
-protected:
- enum {
- DRAG_NONE = 0,
- DRAG_TOP = 1,
- DRAG_BOTTOM = 2,
- DRAG_LEFT = 4,
- DRAG_RIGHT = 8,
- DRAG_TOPLEFT = (DRAG_TOP|DRAG_LEFT),
- DRAG_TOPRIGHT = (DRAG_TOP|DRAG_RIGHT),
- DRAG_BOTTOMLEFT = (DRAG_BOTTOM|DRAG_LEFT),
- DRAG_BOTTOMRIGHT = (DRAG_BOTTOM|DRAG_RIGHT),
- DRAG_INVERTED = 16,
- DRAG_TITLE = 32
- };
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusSelf(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXMDIClient.i b/swig-interfaces/FXMDIClient.i
index 0c6d0308a2c995a7d118266a6378f26d82f496ef..523deec723dff06d5c7ecacf8db229330ca7027e 100644
--- a/swig-interfaces/FXMDIClient.i
+++ b/swig-interfaces/FXMDIClient.i
@@ -41,12 +41,6 @@ class FXMDIChild;
* automatically grayed out if there are less than X MDI child windows.
*/
class FXMDIClient : public FXComposite {
-protected:
- FXMDIChild *active; // Active child
- FXint cascadex; // Cascade offset X
- FXint cascadey; // Cascade offset Y
-protected:
- FXMDIClient();
public:
long onCmdActivateNext(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdActivatePrev(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXMainWindow.i b/swig-interfaces/FXMainWindow.i
index d4caba9b783b8f29d1891858b13d774e8b8cdda2..1d220bb6944e1422a3efd49b40b100a28c6b4adc 100644
--- a/swig-interfaces/FXMainWindow.i
+++ b/swig-interfaces/FXMainWindow.i
@@ -30,8 +30,6 @@
* raised, the MainWindow will delete itself.
*/
class FXMainWindow : public FXTopWindow {
-protected:
- FXMainWindow(){}
public:
%extend {
/// Construct a main window
diff --git a/swig-interfaces/FXMat3d.i b/swig-interfaces/FXMat3d.i
index 448dd48fb4b82a10d8d6e64213ebe779bcb19e4b..e68982cb6b6cdfb126ac398a33e5973229283f35 100644
--- a/swig-interfaces/FXMat3d.i
+++ b/swig-interfaces/FXMat3d.i
@@ -22,8 +22,6 @@
/// Double-precision 3x3 matrix
class FXMat3d {
-protected:
- FXVec3d m[3];
public:
/// Default constructor
diff --git a/swig-interfaces/FXMat3f.i b/swig-interfaces/FXMat3f.i
index df069dc88c2e8555064964b62d04e5fd4d82e2a1..43555aabd18e96f1fb4840052a0e6d2e7f45d156 100644
--- a/swig-interfaces/FXMat3f.i
+++ b/swig-interfaces/FXMat3f.i
@@ -22,8 +22,6 @@
/// Single-precision 3x3 matrix
class FXMat3f {
-protected:
- FXVec3f m[3];
public:
/// Default constructor
diff --git a/swig-interfaces/FXMat4d.i b/swig-interfaces/FXMat4d.i
index e4859e3b62c493214ab901daca763f14c10bf4d2..519acc100273813aa145ac99ccc08fa0f7a903de 100644
--- a/swig-interfaces/FXMat4d.i
+++ b/swig-interfaces/FXMat4d.i
@@ -22,8 +22,6 @@
/// Double-precision 4x4 matrix
class FXMat4d {
-protected:
- FXVec4d m[4];
public:
/// Constructors
FXMat4d();
diff --git a/swig-interfaces/FXMat4f.i b/swig-interfaces/FXMat4f.i
index d3f3e39213acad963ea98c8a510c027497687ef1..714bd5a6c94d397955e6bb19c9b5d1bcd4748691 100644
--- a/swig-interfaces/FXMat4f.i
+++ b/swig-interfaces/FXMat4f.i
@@ -23,8 +23,6 @@
// Single-precision 4x4 matrix
class FXMat4f {
-protected:
- FXVec4f m[4];
public:
/// Constructors
FXMat4f();
diff --git a/swig-interfaces/FXMatrix.i b/swig-interfaces/FXMatrix.i
index 7edc4e6fcb4214826c0c656f26ebc8aaea2989b3..03878b4c72ae2c0985453550eff96bf2e580f43a 100644
--- a/swig-interfaces/FXMatrix.i
+++ b/swig-interfaces/FXMatrix.i
@@ -45,10 +45,6 @@ enum {
* as a space-holder.
*/
class FXMatrix : public FXPacker {
-protected:
- FXint num;
-protected:
- FXMatrix(){}
public:
long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXMemoryStream.i b/swig-interfaces/FXMemoryStream.i
index 82c4209d25b716cf483771ff5c095947042a2980..36257dedd42ac1d5b75155278f83fdba94af620c 100644
--- a/swig-interfaces/FXMemoryStream.i
+++ b/swig-interfaces/FXMemoryStream.i
@@ -22,7 +22,6 @@
/// Memory Store Definition
class FXMemoryStream : public FXStream {
-protected:
public:
/// Create memory store
diff --git a/swig-interfaces/FXMenuBar.i b/swig-interfaces/FXMenuBar.i
index a345e6ac7d75bae6c87d9b938ffdb6258e04ca30..4fb5a99d19918ae2e9a842fea89535e463814f10 100644
--- a/swig-interfaces/FXMenuBar.i
+++ b/swig-interfaces/FXMenuBar.i
@@ -22,8 +22,6 @@
/// Menu bar
class FXMenuBar : public FXToolBar {
-protected:
- FXMenuBar(){}
public:
long onFocusLeft(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusRight(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXMenuButton.i b/swig-interfaces/FXMenuButton.i
index fe5fc5b611414b2e4ecbe232373ff50862613cec..d9c31fa93016ac9860a13d67696565c1ee43dd46 100644
--- a/swig-interfaces/FXMenuButton.i
+++ b/swig-interfaces/FXMenuButton.i
@@ -58,13 +58,6 @@ enum {
* MENUBUTTON_NOARROWS.
*/
class FXMenuButton : public FXLabel {
-protected:
- FXPopup *pane; // Pane to pop up
- FXint offsetx; // Shift attachment point x
- FXint offsety; // Shift attachment point y
- FXbool state; // Pane was popped
-protected:
- FXMenuButton();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXMenuCaption.i b/swig-interfaces/FXMenuCaption.i
index 1aa0bf6d3e231dce9dd459aef537d06fcbb7f74a..6fcd1c98eabfe8065f0e2640e9aa3a55a3d04d81 100644
--- a/swig-interfaces/FXMenuCaption.i
+++ b/swig-interfaces/FXMenuCaption.i
@@ -38,21 +38,6 @@ class FXFont;
* above a number of menu commands in a menu.
*/
class FXMenuCaption : public FXWindow {
-protected:
- FXString label;
- FXString help;
- FXString tip;
- FXIcon *icon;
- FXFont *font;
- FXint hotoff;
- FXHotKey hotkey;
- FXColor textColor;
- FXColor selbackColor;
- FXColor seltextColor;
- FXColor hiliteColor;
- FXColor shadowColor;
-protected:
- FXMenuCaption();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXMenuCascade.i b/swig-interfaces/FXMenuCascade.i
index 38798b65c755846bc39763b4f606b56ed7a30083..16b6fce6cd5b881be276cb265337d868eb31fe58 100644
--- a/swig-interfaces/FXMenuCascade.i
+++ b/swig-interfaces/FXMenuCascade.i
@@ -28,11 +28,6 @@ class FXPopup;
* pull down menu.
*/
class FXMenuCascade : public FXMenuCaption {
-protected:
- FXPopup *pane;
-protected:
- FXMenuCascade(){}
- void drawTriangle(FXDCWindow& dc,FXint l,FXint t,FXint r,FXint b);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXMenuCheck.i b/swig-interfaces/FXMenuCheck.i
index f87a01a99187fa1e58773d957f2d8acf966fa352..ec00ea6b7be6f496b08e9d7825e540e7a7c0a3f9 100644
--- a/swig-interfaces/FXMenuCheck.i
+++ b/swig-interfaces/FXMenuCheck.i
@@ -29,14 +29,6 @@
* the void* argument of the message contains the new state.
*/
class FXMenuCheck : public FXMenuCommand {
-protected:
- FXuchar check; // State of menu
- FXColor boxColor; // Box color
-protected:
- FXMenuCheck();
-private:
- FXMenuCheck(const FXMenuCheck&);
- FXMenuCheck &operator=(const FXMenuCheck&);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onButtonPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXMenuCommand.i b/swig-interfaces/FXMenuCommand.i
index 6df80253edf91925c89ac364d5d83cd8c624d3a2..44d876961d725bac3eeedad66040054a95253682 100644
--- a/swig-interfaces/FXMenuCommand.i
+++ b/swig-interfaces/FXMenuCommand.i
@@ -27,11 +27,6 @@
* When activated, a menu command sends a SEL_COMMAND to its target.
*/
class FXMenuCommand : public FXMenuCaption {
-protected:
- FXString accel; // Accelerator string
- FXHotKey acckey; // Accelerator key
-protected:
- FXMenuCommand(){}
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXMenuPane.i b/swig-interfaces/FXMenuPane.i
index a0ed4e958b494bdb2fb6905b2d671c03b1608dd4..24c0251d9ab84f43a9d4d1b5000fc05638b7a971 100644
--- a/swig-interfaces/FXMenuPane.i
+++ b/swig-interfaces/FXMenuPane.i
@@ -23,8 +23,6 @@
/// Popup menu pane
class FXMenuPane : public FXPopup {
-protected:
- FXMenuPane(){}
public:
%extend {
/// Construct menu pane
diff --git a/swig-interfaces/FXMenuRadio.i b/swig-interfaces/FXMenuRadio.i
index 664c4f04409c42b63a6b7999dbfbbb3f063a122d..146220037ad248bb69ae4bb76584e9d375117bbf 100644
--- a/swig-interfaces/FXMenuRadio.i
+++ b/swig-interfaces/FXMenuRadio.i
@@ -32,14 +32,6 @@
* properly maintain the state between them.
*/
class FXMenuRadio : public FXMenuCommand {
-protected:
- FXuchar check; // State of menu
- FXColor radioColor; // Color of the radio
-protected:
- FXMenuRadio();
-private:
- FXMenuRadio(const FXMenuRadio&);
- FXMenuRadio &operator=(const FXMenuRadio&);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onButtonPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXMenuSeparator.i b/swig-interfaces/FXMenuSeparator.i
index 2e5b9bdf4d73beadfdd4cd8abceeecadf8241d7a..c2afd2c631c04596431541c1f03dde020fd108a4 100644
--- a/swig-interfaces/FXMenuSeparator.i
+++ b/swig-interfaces/FXMenuSeparator.i
@@ -26,11 +26,6 @@
* used to delineate items in a popup menu.
*/
class FXMenuSeparator : public FXWindow {
-protected:
- FXColor hiliteColor;
- FXColor shadowColor;
-protected:
- FXMenuSeparator();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
diff --git a/swig-interfaces/FXMenuTitle.i b/swig-interfaces/FXMenuTitle.i
index a052ea70cbc6d22e83c2a02ae40ad91337f82214..1ef27e688f423fb3f5d430cde066882bd3b79cc4 100644
--- a/swig-interfaces/FXMenuTitle.i
+++ b/swig-interfaces/FXMenuTitle.i
@@ -28,10 +28,6 @@ class FXPopup;
* for popping up a pulldown menu.
*/
class FXMenuTitle : public FXMenuCaption {
-protected:
- FXPopup *pane;
-protected:
- FXMenuTitle(){}
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXMessageBox.i b/swig-interfaces/FXMessageBox.i
index 89aa8ab53d31a5afa353c535cd546cc0c53bc490..5b37d7eef924ec24eee9b888d04445ca12d10f6e 100644
--- a/swig-interfaces/FXMessageBox.i
+++ b/swig-interfaces/FXMessageBox.i
@@ -60,8 +60,6 @@ enum {
* before the program may continue.
*/
class FXMessageBox : public FXDialogBox {
-protected:
- FXMessageBox(){}
public:
long onCmdClicked(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdCancel(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXOptionMenu.i b/swig-interfaces/FXOptionMenu.i
index 7e59b4259d4bcf4d44489392ad4b5229a92d8886..63394dbf67dbc9f6f049fc7785c1a06d906a1726 100644
--- a/swig-interfaces/FXOptionMenu.i
+++ b/swig-interfaces/FXOptionMenu.i
@@ -30,8 +30,6 @@ class FXPopup;
/// Option Menu Button
class FXOption : public FXLabel {
-protected:
- FXOption();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
@@ -75,11 +73,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXOption)
/// Option Menu
class FXOptionMenu : public FXLabel {
-protected:
- FXPopup *pane;
- FXOption *current;
-protected:
- FXOptionMenu();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXPCXIcon.i b/swig-interfaces/FXPCXIcon.i
index b4bd7aff340b2c56be86e080e90333f6f0b4fd98..f218c4ce79f807117542231f67e5caf437efa664 100644
--- a/swig-interfaces/FXPCXIcon.i
+++ b/swig-interfaces/FXPCXIcon.i
@@ -23,8 +23,6 @@
/// PCX icon
class FXPCXIcon : public FXIcon {
-protected:
- FXPCXIcon(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXPCXImage.i b/swig-interfaces/FXPCXImage.i
index a3a31e1c5a2b893a89e744303cc99f314ac002f5..91d7d067b799d526c95c0d9be3413ce61d4ba26e 100644
--- a/swig-interfaces/FXPCXImage.i
+++ b/swig-interfaces/FXPCXImage.i
@@ -23,8 +23,6 @@
/// PCX graphics file
class FXPCXImage : public FXImage {
-protected:
- FXPCXImage(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXPNGIcon.i b/swig-interfaces/FXPNGIcon.i
index 4efb29f8dab7f8f1927f9e549332c9bd8219a08f..3f4e40c7ac3b5c942628a9f0bdc13dba18b341af 100644
--- a/swig-interfaces/FXPNGIcon.i
+++ b/swig-interfaces/FXPNGIcon.i
@@ -24,8 +24,6 @@
/// Portable Network Graphics (PNG) Icon
class FXPNGIcon : public FXIcon {
-protected:
- FXPNGIcon(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXPNGImage.i b/swig-interfaces/FXPNGImage.i
index e474071ce94011d6c3e39b5e9d83c0245bf503e9..156efbed92769fb339ade78259d0940b2e5da375 100644
--- a/swig-interfaces/FXPNGImage.i
+++ b/swig-interfaces/FXPNGImage.i
@@ -24,8 +24,6 @@
/// Portable Network Graphics (PNG) Image
class FXPNGImage : public FXImage {
-protected:
- FXPNGImage(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXPPMIcon.i b/swig-interfaces/FXPPMIcon.i
index 0f7c735230fa7d47a11f70ea2d6fef5481c3903e..7f554331e26c613eff7e9bd6a4b54dcee4ac0202 100644
--- a/swig-interfaces/FXPPMIcon.i
+++ b/swig-interfaces/FXPPMIcon.i
@@ -23,8 +23,6 @@
/// Portable Pixmap icon
class FXPPMIcon : public FXIcon {
-protected:
- FXPPMIcon(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXPPMImage.i b/swig-interfaces/FXPPMImage.i
index 6121492e041d07675ddb6e1f826c762bee2b49c7..aa4a2b0ca4ff8085c45c4fefd8adc8ddc893d2d3 100644
--- a/swig-interfaces/FXPPMImage.i
+++ b/swig-interfaces/FXPPMImage.i
@@ -23,8 +23,6 @@
/// Portable Pixmap Image
class FXPPMImage : public FXImage {
-protected:
- FXPPMImage(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXPacker.i b/swig-interfaces/FXPacker.i
index 1697f537ac4dddb8342534768e3536e8833e025e..f66a8605e821242dd776254411b1737f7ebbccb2 100644
--- a/swig-interfaces/FXPacker.i
+++ b/swig-interfaces/FXPacker.i
@@ -37,29 +37,6 @@ enum { DEFAULT_SPACING = 4 };
* case it will be placed to take all remaining space.
*/
class FXPacker : public FXComposite {
-protected:
- FXColor baseColor; // Base color
- FXColor hiliteColor; // Highlight color
- FXColor shadowColor; // Shadow color
- FXColor borderColor; // Border color
- FXint padtop; // Top margin
- FXint padbottom; // Bottom margin
- FXint padleft; // Left margin
- FXint padright; // Right margin
- FXint hspacing; // Horizontal child spacing
- FXint vspacing; // Vertical child spacing
- FXint border; // Border width
-protected:
- FXPacker();
- void drawBorderRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawRidgeRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawGrooveRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawDoubleRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawDoubleSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawFocusRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawFrame(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXPicker.i b/swig-interfaces/FXPicker.i
index 51046ef18593741d414b655468c69d78b96d6948..9e74deb9fb3adcaa2764240d46709742f0abf3ea 100644
--- a/swig-interfaces/FXPicker.i
+++ b/swig-interfaces/FXPicker.i
@@ -26,8 +26,6 @@
* location on the screen.
*/
class FXPicker : public FXButton {
-protected:
- FXPicker(){}
public:
long onMotion(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXPopup.i b/swig-interfaces/FXPopup.i
index 16ae9c599360b3a4fc712f077c068aed84a23430..ca8624d4dc4593ad0211b228e82b860d5570ac63 100644
--- a/swig-interfaces/FXPopup.i
+++ b/swig-interfaces/FXPopup.i
@@ -30,24 +30,6 @@ enum {
/// Popup window
class FXPopup : public FXShell {
-protected:
- FXWindow *grabowner; // Window which will get grabbed when outside
- FXColor baseColor;
- FXColor hiliteColor;
- FXColor shadowColor;
- FXColor borderColor;
- FXint border;
-protected:
- FXPopup();
- virtual FXbool doesOverrideRedirect() const;
- void drawBorderRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawRidgeRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawGrooveRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawDoubleRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawDoubleSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawFrame(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXPrintDialog.i b/swig-interfaces/FXPrintDialog.i
index 8d167acd26efa75fe810b30dfa0bffaba601b60d..772365f565ad8db0281a7395fbc45ee0f189145d 100644
--- a/swig-interfaces/FXPrintDialog.i
+++ b/swig-interfaces/FXPrintDialog.i
@@ -30,37 +30,6 @@ class FXIcon;
/// Printer selection dialog
class FXPrintDialog : public FXDialogBox {
-protected:
- FXRadioButton *sendtoprinter;
- FXComboBox *printername;
- FXRadioButton *sendtofile;
- FXTextField *filename;
- FXRadioButton *printall;
- FXRadioButton *printeven;
- FXRadioButton *printodd;
- FXRadioButton *printrange;
- FXRadioButton *firstpagefirst;
- FXRadioButton *lastpagefirst;
- FXRadioButton *printincolor;
- FXRadioButton *printinblacknwhite;
- FXRadioButton *orientportrait;
- FXRadioButton *orientlanscape;
- FXListBox *media;
- FXRadioButton *sizeletter;
- FXRadioButton *sizelegal;
- FXRadioButton *sizeA4;
- FXRadioButton *sizeenvelope;
- FXRadioButton *sizecustom;
- FXTextField *sizewidth;
- FXTextField *sizeheight;
- FXSpinner *firstpage;
- FXSpinner *lastpage;
- FXSpinner *numberofcopies;
- FXIcon *landscapeIcon;
- FXIcon *portraitIcon;
- FXPrinter printer;
-protected:
- FXPrintDialog(){}
public:
long onCmdToPrinter(FXObject*,FXSelector,void* PTR_IGNORE);
long onUpdToPrinter(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXProgressBar.i b/swig-interfaces/FXProgressBar.i
index 6fe11cf6bedbbf6119edd0cb59e321c5be3a417f..73074a451671cd23434cefdbbd04b3b3626df590 100644
--- a/swig-interfaces/FXProgressBar.i
+++ b/swig-interfaces/FXProgressBar.i
@@ -32,18 +32,6 @@ enum {
/// Progress bar widget
class FXProgressBar : public FXFrame {
-protected:
- FXuint progress; // Integer percentage number
- FXuint total; // Amount for completion
- FXint barsize; // Bar size
- FXFont* font;
- FXColor barBGColor;
- FXColor barColor;
- FXColor textNumColor;
- FXColor textAltColor;
-protected:
- FXProgressBar(){}
- void drawInterior(FXDCWindow& dc);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onCmdSetValue(FXObject*,FXSelector,void* PTR_UINT);
diff --git a/swig-interfaces/FXProgressDialog.i b/swig-interfaces/FXProgressDialog.i
index 6a5d691223b007ad2d1308769be91ebb813e3dfc..23640be91da78206c4190129c61d4ae2dcfad154 100644
--- a/swig-interfaces/FXProgressDialog.i
+++ b/swig-interfaces/FXProgressDialog.i
@@ -34,14 +34,6 @@ enum {
* in a program and that the program is in fact still working.
*/
class FXProgressDialog : public FXDialogBox {
-protected:
- FXProgressBar *progress; // Progress bar
- FXLabel *message; // Message
- FXHorizontalSeparator *separator; // Separator
- FXButton *cancel; // Cancel button
- FXbool cancelled; // User hit cancel
-protected:
- FXProgressDialog();
public:
long onCmdSetValue(FXObject*,FXSelector,void* PTR_INT);
long onCmdSetIntValue(FXObject*,FXSelector,void* PTR_PINT);
diff --git a/swig-interfaces/FXRGBIcon.i b/swig-interfaces/FXRGBIcon.i
index 6a06374849c3c2700c699ffc2e472a604a41ef7d..09d244064fe91bdae94ea5c587bd29730e77a165 100644
--- a/swig-interfaces/FXRGBIcon.i
+++ b/swig-interfaces/FXRGBIcon.i
@@ -23,8 +23,6 @@
/// IRIS RGB icon
class FXRGBIcon : public FXIcon {
-protected:
- FXRGBIcon(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXRGBImage.i b/swig-interfaces/FXRGBImage.i
index 60f115ddc175390f23fd58bf98ad00f52fc559d3..7c9334d618a1be2d161d33219f4acf1ed3638ff0 100644
--- a/swig-interfaces/FXRGBImage.i
+++ b/swig-interfaces/FXRGBImage.i
@@ -23,8 +23,6 @@
/// IRIS RGB image
class FXRGBImage : public FXImage {
-protected:
- FXRGBImage(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXRadioButton.i b/swig-interfaces/FXRadioButton.i
index cf81549513eb24ea87f1b42ad71eab5eefeae6dd..8683ca39772d1bd58c061710430b6181cd8fb9a3 100644
--- a/swig-interfaces/FXRadioButton.i
+++ b/swig-interfaces/FXRadioButton.i
@@ -39,13 +39,6 @@ enum {
* common SEL_UPDATED handler to check and uncheck radio buttons as appropriate.
*/
class FXRadioButton : public FXLabel {
-protected:
- FXColor radioColor; // Color of radio ball
- FXColor diskColor; // Color of radio disk
- FXbool check; // Radio state
- FXbool oldcheck; // Old radio state
-protected:
- FXRadioButton();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
diff --git a/swig-interfaces/FXRecentFiles.i b/swig-interfaces/FXRecentFiles.i
index ac5a2728dd3daf2e9d472d13da267fa752ea266d..bcd700af8642df30e33582360755dbd6237b43e3 100644
--- a/swig-interfaces/FXRecentFiles.i
+++ b/swig-interfaces/FXRecentFiles.i
@@ -27,12 +27,6 @@
* means of the standard system registry.
*/
class FXRecentFiles : public FXObject {
-protected:
- FXObject *target; // Target object to send message
- FXSelector message; // Message to send
- FXint maxfiles; // Maximum number of files to track
-protected:
- FXRecentFiles(const FXRecentFiles&);
public:
long onCmdClear(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdFile(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXRegion.i b/swig-interfaces/FXRegion.i
index 08c4d1f9fb6edaff7aaa48d50095789146c7df05..c69c9d92927026cf6103fdfae1fd25f9dd14db52 100644
--- a/swig-interfaces/FXRegion.i
+++ b/swig-interfaces/FXRegion.i
@@ -29,8 +29,6 @@
class FXRegion {
friend class FXDC;
friend class FXDCWindow;
-private:
- void *region;
public:
/// Construct new empty region
diff --git a/swig-interfaces/FXRegistry.i b/swig-interfaces/FXRegistry.i
index 37bedd333be9e89ce974a7ff79510cad28f6f5cf..f8a3e1207f5d69a34b7a4842725794d14d6f0115 100644
--- a/swig-interfaces/FXRegistry.i
+++ b/swig-interfaces/FXRegistry.i
@@ -43,18 +43,6 @@
* system when FXApp::exit() is called.
*/
class FXRegistry : public FXSettings {
-protected:
- FXString applicationkey; // Application key
- FXString vendorkey; // Vendor key
- bool ascii; // ASCII file-based registry
-protected:
- bool readFromDir(const FXchar* dirname,FXbool mark);
-#ifdef WIN32
- bool readFromRegistry(void* hRootKey,FXbool mark);
- bool writeToRegistry(void* hRootKey);
- bool readFromRegistryGroup(void* org,const char* groupname,FXbool mark=FALSE);
- bool writeToRegistryGroup(void* org,const char* groupname);
-#endif
public:
/**
diff --git a/swig-interfaces/FXReplaceDialog.i b/swig-interfaces/FXReplaceDialog.i
index 1931958a354bba9e76177061c549ac987eb8775f..e89cfab5b1a9e65c28c3cf22b9bd05944da88963 100644
--- a/swig-interfaces/FXReplaceDialog.i
+++ b/swig-interfaces/FXReplaceDialog.i
@@ -25,21 +25,6 @@ class FXTextField;
/// Text replace dialog
class FXReplaceDialog : public FXDialogBox {
-protected:
- FXLabel *searchlabel;
- FXTextField *searchtext;
- FXHorizontalFrame *searchbox;
- FXLabel *replacelabel;
- FXTextField *replacetext;
- FXHorizontalFrame *replacebox;
- FXButton *accept;
- FXButton *cancel;
- FXButton *every;
- FXuint searchmode;
- FXuint current;
-protected:
- FXReplaceDialog(){}
- void appendHistory(const FXString& search,const FXString& replace,FXuint mode);
public:
long onCmdAll(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdNext(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXRootWindow.i b/swig-interfaces/FXRootWindow.i
index adba515741a30d2bbaa747cdce2dec7be306e9e9..2f9347e49e6e6475c7d1da7ebc3d41997ccbe8b3 100644
--- a/swig-interfaces/FXRootWindow.i
+++ b/swig-interfaces/FXRootWindow.i
@@ -23,12 +23,6 @@
/// Root window
class FXRootWindow : public FXComposite {
-protected:
- FXRootWindow(){}
-#ifdef WIN32
- virtual FXID GetDC() const;
- virtual int ReleaseDC(FXID) const;
-#endif
public:
/// Construct root window
diff --git a/swig-interfaces/FXRuler.i b/swig-interfaces/FXRuler.i
index 6e4954a51837d50ae0a227d09fbaad05606ba795..703dbb98cf7be7a8ee1106bbc40d1b23d4693d85 100644
--- a/swig-interfaces/FXRuler.i
+++ b/swig-interfaces/FXRuler.i
@@ -57,51 +57,6 @@ class FXFont;
* and size of entities within the document.
*/
class FXRuler : public FXFrame {
-protected:
- FXFont *font; // Font for numbers
- FXint documentSize; // Size of document
- FXint edgeSpacing; // Edge spacing around document
- FXint marginLower; // Lower margin
- FXint marginUpper; // Upper margin
- FXint indentFirst; // First line paragraph indent
- FXint indentLower; // Lower paragraph indent
- FXint indentUpper; // Upper paragraph indent
- FXdouble pixelPerTick; // Number of pixels per tick increment
- FXint numberTicks; // Tick increments between numbers
- FXint majorTicks; // Tick increments between major ticks
- FXint mediumTicks; // Tick increments between medium ticks
- FXint tinyTicks; // Tick increments between tiny ticks
- FXint arrowPos; // Arrow position
- FXColor textColor; // Color for numbers and ticks
- FXint shift; // Left edge of content
- FXint pos; // Scroll position
- FXint off; // Offset item was grabbed
- FXString tip; // Tooltip text
- FXString help; // Help text
- FXuchar mode; // Mode widget is in
-protected:
- FXRuler();
- FXint picked(FXint x,FXint y);
- void drawLeftArrow(FXDCWindow& dc,FXint x,FXint y);
- void drawRightArrow(FXDCWindow& dc,FXint x,FXint y);
- void drawUpArrow(FXDCWindow& dc,FXint x,FXint y);
- void drawDownArrow(FXDCWindow& dc,FXint x,FXint y);
- void drawLeftMarker(FXDCWindow& dc,FXint x,FXint y);
- void drawRightMarker(FXDCWindow& dc,FXint x,FXint y);
- void drawUpMarker(FXDCWindow& dc,FXint x,FXint y);
- void drawDownMarker(FXDCWindow& dc,FXint x,FXint y);
-protected:
- enum{
- MOUSE_NONE, // No mouse operation
- MOUSE_MARG_LOWER, // Drag lower margin
- MOUSE_MARG_UPPER, // Drag upper margin
- MOUSE_PARA_FIRST, // Drag first indent
- MOUSE_PARA_LOWER, // Drag lower indent
- MOUSE_PARA_UPPER // Drag upper indent
- };
-private:
- FXRuler(const FXRuler&);
- FXRuler &operator=(const FXRuler&);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXScrollArea.i b/swig-interfaces/FXScrollArea.i
index 1e6bb0c07d52b8e5a047ec2eb42f6376d006116e..8fbfc5b61c51bcb68abf381ff0e215d5c45f4027 100644
--- a/swig-interfaces/FXScrollArea.i
+++ b/swig-interfaces/FXScrollArea.i
@@ -55,18 +55,6 @@ class FXScrollCorner;
* scrolling may be turned off.
*/
class FXScrollArea : public FXComposite {
-protected:
- FXScrollBar *horizontal; // Horizontal scroll bar
- FXScrollBar *vertical; // Vertical scroll bar
- FXScrollCorner *corner; // Scroll corner
- FXint viewport_w; // Viewport width
- FXint viewport_h; // Viewport height
- FXint pos_x; // X scroll position (pos_x<=0)
- FXint pos_y; // Y scroll position (pos_y<=0)
-protected:
- FXScrollArea();
- FXbool startAutoScroll(FXEvent* event,FXbool onlywheninside=FALSE);
- void stopAutoScroll();
public:
long onHMouseWheel(FXObject*,FXSelector,void* PTR_EVENT);
long onVMouseWheel(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXScrollBar.i b/swig-interfaces/FXScrollBar.i
index 1e2bb634248361c43025402c69b3491d8d8f2aab..e643b05796f041a24afb1e4ca9d00971eeba6b5c 100644
--- a/swig-interfaces/FXScrollBar.i
+++ b/swig-interfaces/FXScrollBar.i
@@ -154,8 +154,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXScrollBar)
/// Corner between scroll bars
class FXScrollCorner : public FXWindow {
-protected:
- FXScrollCorner();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
diff --git a/swig-interfaces/FXScrollPane.i b/swig-interfaces/FXScrollPane.i
index 3ed05e8b3598f9da156b0c4dd7e0e4584e55336d..3738d9118b534a72282136482bb71ee1af722039 100644
--- a/swig-interfaces/FXScrollPane.i
+++ b/swig-interfaces/FXScrollPane.i
@@ -31,16 +31,6 @@ class FXArrowButton;
* known in advance how many entries will be added.
*/
class FXScrollPane : public FXMenuPane {
-protected:
- FXArrowButton *dn; // Button to scroll down
- FXArrowButton *up; // Button to scroll up
- FXint visible; // Visible entries
- FXint top; // Top visible entry
-protected:
- FXScrollPane();
-private:
- FXScrollPane(const FXScrollPane&);
- FXScrollPane &operator=(const FXScrollPane&);
public:
long onCmdIncrement(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdDecrement(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXScrollWindow.i b/swig-interfaces/FXScrollWindow.i
index 162c7036a3356f1468de505ad49e0bd33b079c01..f1017449264272717a0c4cfa90bb598b0cab8dd3 100644
--- a/swig-interfaces/FXScrollWindow.i
+++ b/swig-interfaces/FXScrollWindow.i
@@ -36,8 +36,6 @@
* necessarily equal to the scroll position of the scroll window!
*/
class FXScrollWindow : public FXScrollArea {
-protected:
- FXScrollWindow(){}
public:
long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXSearchDialog.i b/swig-interfaces/FXSearchDialog.i
index 43feae0acadcf07f4ede8bfbd47d32302c7d0605..f06af47197f1f848018a86b76d39cd0b194cb7dc 100644
--- a/swig-interfaces/FXSearchDialog.i
+++ b/swig-interfaces/FXSearchDialog.i
@@ -23,8 +23,6 @@
/// Text search dialog
class FXSearchDialog : public FXReplaceDialog {
-protected:
- FXSearchDialog(){}
public:
/// Construct search dialog box
diff --git a/swig-interfaces/FXSeparator.i b/swig-interfaces/FXSeparator.i
index 94abbdf9e6d4be8390a5671b0967d2eec2d8f730..74683f52c5c882f58e56b8386f35e3f611694836 100644
--- a/swig-interfaces/FXSeparator.i
+++ b/swig-interfaces/FXSeparator.i
@@ -37,11 +37,6 @@ enum {
* it can also have the frame's border styles.
*/
class FXSeparator : public FXFrame {
-protected:
- FXSeparator(){}
-private:
- FXSeparator(const FXSeparator&);
- FXSeparator &operator=(const FXSeparator&);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
@@ -91,8 +86,6 @@ DYNAMIC_CAST(SWIGTYPE_p_FXSeparator, FXSeparator_dynamic_cast);
/// Horizontal separator
class FXHorizontalSeparator : public FXSeparator {
-protected:
- FXHorizontalSeparator(){}
public:
/// Constructor
@@ -115,8 +108,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXHorizontalSeparator)
/// Vertical separator
class FXVerticalSeparator : public FXSeparator {
-protected:
- FXVerticalSeparator(){}
public:
/// Constructor
diff --git a/swig-interfaces/FXSettings.i b/swig-interfaces/FXSettings.i
index a210d6443b7e14d56ac6767c3d4a8e81d08da80d..caf2e8691879463a12d8f7fb06fd1ba9e7526878 100644
--- a/swig-interfaces/FXSettings.i
+++ b/swig-interfaces/FXSettings.i
@@ -37,17 +37,6 @@ class FXStringDict;
* to the file.
*/
class FXSettings : public FXDict {
-protected:
- bool modified;
-protected:
- virtual void *createData(const void*);
- virtual void deleteData(void*);
- FXchar* dequote(FXchar* text) const;
- FXchar* enquote(FXchar* result,const FXchar* text);
- FXStringDict* insert(const FXchar* ky);
- FXStringDict* replace(const FXchar* ky,FXStringDict* section);
- FXStringDict* remove(const FXchar* ky);
- FXStringDict* find(const FXchar* ky);
public:
/// Construct settings database.
diff --git a/swig-interfaces/FXShell.i b/swig-interfaces/FXShell.i
index 6149e726f55063596e497dd5b2ac946cf61ab67c..53170f80cec73b4e603a63870454db4bbfd2d37a 100644
--- a/swig-interfaces/FXShell.i
+++ b/swig-interfaces/FXShell.i
@@ -26,8 +26,6 @@
* windows which are direct children of the root window.
*/
class FXShell : public FXComposite {
-protected:
- FXShell(){}
public:
long onLayout(FXObject*,FXSelector,void* PTR_IGNORE);
long onConfigure(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXShutter.i b/swig-interfaces/FXShutter.i
index 56bd1dae5f7ff916342ce4ab76f55495fa500144..de5a6b9804036ad3e0bb130e88c2cd5c5c4d956e 100644
--- a/swig-interfaces/FXShutter.i
+++ b/swig-interfaces/FXShutter.i
@@ -31,12 +31,6 @@ class FXScrollWindow;
* window to allow unlimited room for all the contents.
*/
class FXShutterItem : public FXVerticalFrame {
-protected:
- FXButton *button;
- FXScrollWindow *scrollWindow;
- FXVerticalFrame *content;
-protected:
- FXShutterItem(){}
public:
long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
@@ -90,14 +84,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXShutterItem)
* A sub panel can be unfolded by pressing on that panel's button.
*/
class FXShutter : public FXVerticalFrame {
-protected:
- FXint current; // Item currently open
- FXint closing; // Item closing down
- FXint heightIncrement; // Height delta
- FXint closingHeight; // Closing items current height
- FXbool closingHadScrollbar; // Closing item had a scroll bar
-protected:
- FXShutter(){}
public:
long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXSlider.i b/swig-interfaces/FXSlider.i
index 67bf29fb07b9d0f2ba7db2ac1c61f1182ef8ef72..b698d9a5c269545ab33ace4d926b026d4fcb1963 100644
--- a/swig-interfaces/FXSlider.i
+++ b/swig-interfaces/FXSlider.i
@@ -39,25 +39,6 @@ enum {
/// Slider Control
class FXSlider : public FXFrame {
-protected:
- FXint range[2]; // Reported data range
- FXint pos; // Reported data position
- FXint incr; // Increment when auto-sliding
- FXint delta; // Interval between ticks
- FXint headpos; // Head position
- FXint headsize; // Head size
- FXint slotsize; // Slot size
- FXColor slotColor; // Color of slot the head moves in
- FXint dragpoint; // Where the head is grabbed
- FXString help; // Help string
- FXString tip; // Tip string
-protected:
- FXSlider();
- FXint headPos(FXint v) const;
- FXint headVal(FXint p) const;
- void drawSliderHead(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawHorzTicks(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawVertTicks(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onMotion(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXSpinner.i b/swig-interfaces/FXSpinner.i
index c7086b5913fbc9e0903f3eee1f78f9817b28f4dc..baf7e7c7d087290b5d82d3fee6c66e216cc74150 100644
--- a/swig-interfaces/FXSpinner.i
+++ b/swig-interfaces/FXSpinner.i
@@ -37,15 +37,6 @@ class FXArrowButton;
/// Spinner control
class FXSpinner : public FXPacker {
-protected:
- FXTextField *textField; // Text field
- FXArrowButton *upButton; // The up button
- FXArrowButton *downButton; // The down button
- FXint range[2]; // Reported data range
- FXint incr; // Increment
- FXint pos; // Current position
-protected:
- FXSpinner();
public:
long onUpdIncrement(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdIncrement(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXSplashWindow.i b/swig-interfaces/FXSplashWindow.i
index 6ce14633487cc04cfcda79b0c5517fa275a1a7d2..e3da7f874890f24d15b8be8fd94e25b3f6b4f7f2 100644
--- a/swig-interfaces/FXSplashWindow.i
+++ b/swig-interfaces/FXSplashWindow.i
@@ -40,14 +40,6 @@ enum {
* with the SPLASH_SIMPLE option the window will be simply rectangular.
*/
class FXSplashWindow : public FXTopWindow {
-protected:
- FXIcon *icon; // Really big icon
- FXuint delay; // Delay before hiding
-protected:
- FXSplashWindow();
-private:
- FXSplashWindow(const FXSplashWindow&);
- FXSplashWindow &operator=(const FXSplashWindow&);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
diff --git a/swig-interfaces/FXSplitter.i b/swig-interfaces/FXSplitter.i
index 3ffd4abb46bbe712ff1e5473d0d77d4f0247f43e..0bc0418de5ace8bfcebd9c641c5fb2d4f5f80e24 100644
--- a/swig-interfaces/FXSplitter.i
+++ b/swig-interfaces/FXSplitter.i
@@ -58,16 +58,6 @@ enum {
* LAYOUT_FIX_HEIGHT behave analogously.
*/
class FXSplitter : public FXComposite {
-protected:
- FXSplitter();
- void adjustHLayout();
- void adjustVLayout();
- void moveHSplit(FXint amount);
- void moveVSplit(FXint amount);
- void drawHSplit(FXint pos);
- void drawVSplit(FXint pos);
- FXWindow* findHSplit(FXint pos);
- FXWindow* findVSplit(FXint pos);
public:
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXSpring.i b/swig-interfaces/FXSpring.i
index 416c67d1b2c0c114825b1d1bb970cf7e5af4a012..b5584ad77b512f8bb5e0f76364c20faf3b0cd824 100644
--- a/swig-interfaces/FXSpring.i
+++ b/swig-interfaces/FXSpring.i
@@ -42,14 +42,6 @@
* it provides the same layout behavior as packer.
*/
class FXSpring : public FXPacker {
-protected:
- FXint relWidth; // Relative width
- FXint relHeight; // Relative height
-protected:
- FXSpring(){}
-private:
- FXSpring(const FXSpring&);
- FXSpring &operator=(const FXSpring&);
public:
%extend {
diff --git a/swig-interfaces/FXStatusBar.i b/swig-interfaces/FXStatusBar.i
index bd62788c5c5067fb35ce85cca4e54ec48e1dc1e9..e527f58719e39f332e31ed05ae03b0e2dc3650dc 100644
--- a/swig-interfaces/FXStatusBar.i
+++ b/swig-interfaces/FXStatusBar.i
@@ -31,11 +31,6 @@ class FXStatusLine;
/// Status bar
class FXStatusBar : public FXHorizontalFrame {
-protected:
- FXDragCorner *corner;
- FXStatusLine *status;
-protected:
- FXStatusBar(){}
public:
%extend {
/// Construct status bar with or without a drag corner
diff --git a/swig-interfaces/FXStatusLine.i b/swig-interfaces/FXStatusLine.i
index d910657fea457949dfcdec0b4b7c721ebe313a48..33f3467674852543979b14c2f956a4860b9c4dcc 100644
--- a/swig-interfaces/FXStatusLine.i
+++ b/swig-interfaces/FXStatusLine.i
@@ -36,14 +36,6 @@
*/
class FXStatusLine : public FXFrame {
-protected:
- FXString status; // Current status message
- FXString normal; // Normally displayed message
- FXFont *font; // Font
- FXColor textColor; // Status text color
- FXColor textHighlightColor; // Status text highlight color
-protected:
- FXStatusLine();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
diff --git a/swig-interfaces/FXStringDict.i b/swig-interfaces/FXStringDict.i
index b6e605be7acf452b3b86dbb25a5c829929785b40..9b8734ba133c7348097f46cbb327e92768cbaa03 100644
--- a/swig-interfaces/FXStringDict.i
+++ b/swig-interfaces/FXStringDict.i
@@ -26,9 +26,6 @@
* The inserted strings are copied when they're inserted.
*/
class FXStringDict : public FXDict {
-protected:
- virtual void *createData(const void*);
- virtual void deleteData(void*);
public:
%extend {
/// Construct a string dictionary
diff --git a/swig-interfaces/FXSwitcher.i b/swig-interfaces/FXSwitcher.i
index b5626d6f5e0d0fbb04d5aec04b2fab29c0206153..4a574faf28a5aa957c380a1bbe005a9f688874d4 100644
--- a/swig-interfaces/FXSwitcher.i
+++ b/swig-interfaces/FXSwitcher.i
@@ -50,10 +50,6 @@ enum {
* or height of all of the children.
*/
class FXSwitcher : public FXPacker {
-protected:
- FXint current;
-protected:
- FXSwitcher(){}
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onCmdSetValue(FXObject*,FXSelector,void* PTR_INT);
diff --git a/swig-interfaces/FXTGAIcon.i b/swig-interfaces/FXTGAIcon.i
index a05aabab2cbbc19b34dfea99c0cf3d8d2a3d5e21..f24ff11b562254fcacfea8853ac5245f5cfa3a0f 100644
--- a/swig-interfaces/FXTGAIcon.i
+++ b/swig-interfaces/FXTGAIcon.i
@@ -23,8 +23,6 @@
/// Targa Icon class
class FXTGAIcon : public FXIcon {
-protected:
- FXTGAIcon(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXTGAImage.i b/swig-interfaces/FXTGAImage.i
index 550315db27721184cb324d3aea63888f1bb11ef4..4f693f283edc42cfe95d5e6a9b3fce1ebcbd7eda 100644
--- a/swig-interfaces/FXTGAImage.i
+++ b/swig-interfaces/FXTGAImage.i
@@ -23,8 +23,6 @@
/// TGA Image class
class FXTGAImage : public FXImage {
-protected:
- FXTGAImage(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXTIFIcon.i b/swig-interfaces/FXTIFIcon.i
index cd9dcde58f2de3da3ba559b046b2815ff3556ce6..a79d4ff62e7cb40e185e0304eb08fc4546d45c62 100644
--- a/swig-interfaces/FXTIFIcon.i
+++ b/swig-interfaces/FXTIFIcon.i
@@ -24,10 +24,6 @@
/// TIFF Icon class
class FXTIFIcon : public FXIcon {
-protected:
- FXushort codec;
-protected:
- FXTIFIcon(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXTIFImage.i b/swig-interfaces/FXTIFImage.i
index cb1265ba2ad1e805316bb4fe5476e934fa74f76f..4181cd1c12930abb459adaf44e1cbe4c11f48e38 100644
--- a/swig-interfaces/FXTIFImage.i
+++ b/swig-interfaces/FXTIFImage.i
@@ -24,10 +24,6 @@
/// TIFF Image class
class FXTIFImage : public FXImage {
-protected:
- FXushort codec;
-protected:
- FXTIFImage(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXTabBar.i b/swig-interfaces/FXTabBar.i
index ebfc8537f0754f25fd47434e6e3b67df7fbaf3b6..c089ca6a3fe83cdd4561c3ef1e9a80ecfdc5d118 100644
--- a/swig-interfaces/FXTabBar.i
+++ b/swig-interfaces/FXTabBar.i
@@ -42,11 +42,6 @@ enum {
* SEL_COMMAND message to its target.
*/
class FXTabBar : public FXPacker {
-protected:
- FXint current; // Current tab index
- FXint shift; // Shift amount
-protected:
- FXTabBar(){}
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusNext(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXTabBook.i b/swig-interfaces/FXTabBook.i
index a44659adff2a782ddcf7b2d9a335c6cebd2b28c9..66c68dfc1acb5c527714dd30be5969d8604d451d 100644
--- a/swig-interfaces/FXTabBook.i
+++ b/swig-interfaces/FXTabBook.i
@@ -38,8 +38,6 @@
* SEL_COMMAND message to its target.
*/
class FXTabBook : public FXTabBar {
-protected:
- FXTabBook(){}
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusNext(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXTabItem.i b/swig-interfaces/FXTabItem.i
index 9bcf60176bac4e3a3b68b1e164e6368d37e50d14..a54bee0d2da5cdd5c5e77a59a5968f2a68c804ff 100644
--- a/swig-interfaces/FXTabItem.i
+++ b/swig-interfaces/FXTabItem.i
@@ -42,8 +42,6 @@ enum {
* the corresponding panel to be raised to the top.
*/
class FXTabItem : public FXLabel {
-protected:
- FXTabItem();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusIn(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXTable.i b/swig-interfaces/FXTable.i
index 5b1da2879c6557261f8a474b981fe7d18277012b..a43b7b917d771d1a74988bbd67fba0536babf92d 100644
--- a/swig-interfaces/FXTable.i
+++ b/swig-interfaces/FXTable.i
@@ -55,25 +55,8 @@ struct FXTableRange {
~FXTableRange();
};
-
/// Item in table
class FXTableItem : public FXObject {
-protected:
- FXString label;
- FXIcon *icon;
- void *data;
- FXuint state;
-protected:
- FXTableItem():icon(NULL),data(NULL),state(0){}
- FXint textWidth(const FXTable* table) const;
- FXint textHeight(const FXTable* table) const;
- virtual void draw(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
- virtual void drawBorders(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
- virtual void drawContent(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
- virtual void drawPattern(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
- virtual void drawBackground(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
-protected:
- FXTableItem();
public:
enum{
SELECTED = 0x00000001, /// Selected
diff --git a/swig-interfaces/FXToggleButton.i b/swig-interfaces/FXToggleButton.i
index 1cabd0acf8370d9074ba3add0f2363c05b493548..f4b70a1f502fcbc63452a45080648ecc459697d0 100644
--- a/swig-interfaces/FXToggleButton.i
+++ b/swig-interfaces/FXToggleButton.i
@@ -32,18 +32,6 @@ enum {
/// Toggle Button
class FXToggleButton : public FXLabel {
-protected:
- FXString altlabel;
- FXIcon *alticon;
- FXHotKey althotkey;
- FXint althotoff;
- FXString alttip;
- FXString althelp;
- FXbool state;
- FXbool down;
-protected:
- FXToggleButton();
- void press(FXbool dn);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
diff --git a/swig-interfaces/FXToolBarGrip.i b/swig-interfaces/FXToolBarGrip.i
index c1b49ff7243e5ad84c88a1d4fd805861d2dee228..05a0405df5bb72e6853668d784fc3a3b37f6f1f8 100644
--- a/swig-interfaces/FXToolBarGrip.i
+++ b/swig-interfaces/FXToolBarGrip.i
@@ -42,10 +42,6 @@ class FXToolBar;
*/
class FXToolBarGrip : public FXDockHandler {
-protected:
- FXColor activeColor; // Color when active
-protected:
- FXToolBarGrip();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXToolBarShell.i b/swig-interfaces/FXToolBarShell.i
index 27e901ae67211fcdb66d7dfc1387ebb0f6a8a480..d968ea9aded785b6a1f3d463a667cabe5ac11ab0 100644
--- a/swig-interfaces/FXToolBarShell.i
+++ b/swig-interfaces/FXToolBarShell.i
@@ -26,22 +26,6 @@
*/
class FXToolBarShell : public FXTopWindow {
-protected:
- FXColor baseColor;
- FXColor hiliteColor;
- FXColor shadowColor;
- FXColor borderColor;
- FXint border;
-protected:
- FXToolBarShell(){}
- void drawBorderRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawRidgeRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawGrooveRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawDoubleRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawDoubleSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
- void drawFrame(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
diff --git a/swig-interfaces/FXToolBarTab.i b/swig-interfaces/FXToolBarTab.i
index c2e97530f05dd6043c4910e406dd0f1251e7a3ef..ece904f215dfc4bc986772e436b12097f31899da 100644
--- a/swig-interfaces/FXToolBarTab.i
+++ b/swig-interfaces/FXToolBarTab.i
@@ -34,19 +34,6 @@ enum {
*/
class FXToolBarTab : public FXFrame {
-protected:
- FXColor activeColor; // Color when active
- FXString tip; // Tooltip
- FXbool collapsed; // Is collapsed flat
- FXbool down; // Button down
-protected:
- FXToolBarTab();
- void drawUpArrow(FXDCWindow& dc);
- void drawDownArrow(FXDCWindow& dc);
- void drawRightArrow(FXDCWindow& dc);
- void drawLeftArrow(FXDCWindow& dc);
- void drawHSpeckles(FXDCWindow& dc,FXint x,FXint w);
- void drawVSpeckles(FXDCWindow& dc,FXint y,FXint h);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
diff --git a/swig-interfaces/FXToolTip.i b/swig-interfaces/FXToolTip.i
index ba1c87d5790def0c0e5ef8d753057e7e8d68ce1f..d25c02913823a537551486a3f08d021439abdc89 100644
--- a/swig-interfaces/FXToolTip.i
+++ b/swig-interfaces/FXToolTip.i
@@ -32,16 +32,6 @@ class FXFont;
/// Hopefully Helpful Hint message
class FXToolTip : public FXShell {
-protected:
- FXString label; // Text in the tip
- FXFont *font; // Font of the tip
- FXColor textColor; // Text color
- FXbool popped; // Is currently popped up
-protected:
- FXToolTip();
- virtual FXbool doesOverrideRedirect() const;
- void place(FXint x,FXint y);
- void autoplace();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
diff --git a/swig-interfaces/FXTopWindow.i b/swig-interfaces/FXTopWindow.i
index 8678071a7d507804604b3b458c2a98905e8a32c4..cca09763506f84e70f925e3f8719deaf4e6b88f2 100644
--- a/swig-interfaces/FXTopWindow.i
+++ b/swig-interfaces/FXTopWindow.i
@@ -78,21 +78,6 @@ class FXToolBar;
* the owner.
*/
class FXTopWindow : public FXShell {
-protected:
- FXString title; // Window title
- FXIcon *icon; // Window icon (big)
- FXIcon *miniIcon; // Window icon (small)
- FXint padtop; // Top margin
- FXint padbottom; // Bottom margin
- FXint padleft; // Left margin
- FXint padright; // Right margin
- FXint hspacing; // Horizontal child spacing
- FXint vspacing; // Vertical child spacing
-protected:
- FXTopWindow();
- void settitle();
- void seticons();
- void setdecorations();
public:
long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXTranslator.i b/swig-interfaces/FXTranslator.i
index 243ee1e141f14e506c0e8521cbfa646ed0243236..c203935f3dcc138307f0f73091131efc7f9b888c 100644
--- a/swig-interfaces/FXTranslator.i
+++ b/swig-interfaces/FXTranslator.i
@@ -28,8 +28,6 @@
* The translator class translates a message to another language.
*/
class FXTranslator : public FXObject {
-protected:
- FXTranslator();
public:
%extend {
diff --git a/swig-interfaces/FXTreeList.i b/swig-interfaces/FXTreeList.i
index 43bc2dcc9e7559b1328afed44316adf995d83602..eccbfdaff64d3df6e89aecb6efc24b772488ca9b 100644
--- a/swig-interfaces/FXTreeList.i
+++ b/swig-interfaces/FXTreeList.i
@@ -42,22 +42,6 @@ class FXTreeList;
%rename("hasItems=") FXTreeItem::setHasItems(FXbool);
class FXTreeItem : public FXObject {
-protected:
- FXTreeItem *parent; // Parent item
- FXTreeItem *prev; // Previous item
- FXTreeItem *next; // Next item
- FXTreeItem *first; // First child item
- FXTreeItem *last; // Last child item
- FXString label; // Text of item
- FXIcon *openIcon; // Icon of item
- FXIcon *closedIcon; // Icon of item
- void *data; // Item user data pointer
- FXuint state; // Item state flags
- FXint x,y;
-protected:
- FXTreeItem();
- virtual void draw(const FXTreeList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
- virtual FXint hitItem(const FXTreeList* list,FXint x,FXint y) const;
public:
enum{
SELECTED = 1, /// Selected
@@ -169,33 +153,6 @@ DYNAMIC_CAST(SWIGTYPE_p_FXTreeItem, FXTreeItem_dynamic_cast);
* 3rd argument of the message.
*/
class FXTreeList : public FXScrollArea {
-protected:
- FXTreeItem *firstitem; // First root item
- FXTreeItem *lastitem; // Last root item
- FXTreeItem *anchoritem; // Selection anchor item
- FXTreeItem *currentitem; // Current item
- FXTreeItem *extentitem; // Selection extent
- FXTreeItem *cursoritem; // Item under cursor
- FXTreeItem *viewableitem; // Visible item
- FXFont *font; // Font
- FXColor textColor; // Text color
- FXColor selbackColor; // Selected background color
- FXColor seltextColor; // Selected text color
- FXColor lineColor; // Line color
- FXint treeWidth; // Tree width
- FXint treeHeight; // Tree height
- FXint visible; // Number of visible items
- FXint indent; // Parent to child indentation
- FXint grabx; // Grab point x
- FXint graby; // Grab point y
- FXString lookup; // Lookup string
- FXString help; // Help string
- FXbool state; // State of item
-protected:
- FXTreeList();
- virtual FXTreeItem* createItem(const FXString& text,FXIcon* oi,FXIcon* ci,void* ptr);
- // void sort(FXTreeItem*& f1,FXTreeItem*& t1,FXTreeItem*& f2,FXTreeItem*& t2,int n); FIXME
- void recompute();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXTreeListBox.i b/swig-interfaces/FXTreeListBox.i
index 0eb0cf648f56bc7cbaec8727fcbfa673b26e3dc2..d419d41c82fe362940f14865416b666261fe2ac3 100644
--- a/swig-interfaces/FXTreeListBox.i
+++ b/swig-interfaces/FXTreeListBox.i
@@ -40,13 +40,6 @@ class FXPopup;
* SEL_CHANGED messages to indicate which item the cursor is hovering over.
*/
class FXTreeListBox : public FXPacker {
-protected:
- FXButton *field;
- FXMenuButton *button;
- FXTreeList *tree;
- FXPopup *pane;
-protected:
- FXTreeListBox(){}
public:
long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
diff --git a/swig-interfaces/FXVerticalFrame.i b/swig-interfaces/FXVerticalFrame.i
index 82d0442703d8c62c41dc2b2b355a27133cacbadb..889c89923018a65b056a7bb53332284cfc7f8069 100644
--- a/swig-interfaces/FXVerticalFrame.i
+++ b/swig-interfaces/FXVerticalFrame.i
@@ -27,8 +27,6 @@
* depending on the child window's layout hints.
*/
class FXVerticalFrame : public FXPacker {
-protected:
- FXVerticalFrame(){}
public:
/// Construct a vertical frame layout manager
diff --git a/swig-interfaces/FXVisual.i b/swig-interfaces/FXVisual.i
index a5db70975b200bf127634ac37ba6d4e8857b370d..1c5bdf8ebf845bbc97961a85c18d9c3266c68896 100644
--- a/swig-interfaces/FXVisual.i
+++ b/swig-interfaces/FXVisual.i
@@ -52,44 +52,6 @@ enum FXVisualType {
/// Visual describes pixel format of a drawable
class FXVisual : public FXId {
-protected:
- FXuint flags; // Visual flags
- FXuint hint; // Depth Hint
- FXuint depth; // Visual depth, significant bits/pixel
- FXuint numred; // Number of reds
- FXuint numgreen; // Number of greens
- FXuint numblue; // Number of blues
- FXuint numcolors; // Total number of colors
- FXuint maxcolors; // Maximum number of colors
- FXVisualType type; // Visual type
- void *info; // Opaque data
- FXID colormap; // Color map, if any
- FXbool freemap; // We allocated the map
-#ifndef WIN32
-protected:
- void *visual; // Application visual [Visual]
- void* gc; // Drawing GC
- void* scrollgc; // Scrolling GC
- FXPixel rpix[16][256]; // Mapping from red -> pixel
- FXPixel gpix[16][256]; // Mapping from green -> pixel
- FXPixel bpix[16][256]; // Mapping from blue -> pixel
- FXPixel lut[256]; // Color lookup table
-protected:
- void* setupgc(FXbool);
- void setuptruecolor();
- void setupdirectcolor();
- void setuppseudocolor();
- void setupstaticcolor();
- void setupgrayscale();
- void setupstaticgray();
- void setuppixmapmono();
- void setupcolormap();
-#else
-protected:
- int pixelformat; // PIXELFORMAT number
-#endif
-protected:
- FXVisual();
public:
/// Construct default visual
diff --git a/swig-interfaces/FXWindow.i b/swig-interfaces/FXWindow.i
index 81d8e2e22c95bc89a74c3be2d67e09ba7bd043b2..0adb8f23cc6f6172477431f7f6151ec16795a6f9 100644
--- a/swig-interfaces/FXWindow.i
+++ b/swig-interfaces/FXWindow.i
@@ -99,19 +99,6 @@ class FXComposite;
/// Base class for all windows
class FXWindow : public FXDrawable {
-protected:
- FXComposeContext *composeContext; // Compose context
- FXCursor *defaultCursor; // Normal Cursor
- FXCursor *dragCursor; // Cursor during drag
- FXAccelTable *accelTable; // Accelerator table
- FXObject *target; // Target object
- FXSelector message; // Message ID
- FXint xpos; // Window X Position
- FXint ypos; // Window Y Position
- FXColor backColor; // Window background color
- FXString tag; // Help tag
- FXuint flags; // Window state flags
- FXuint options; // Window options
public:
// Common DND types
@@ -125,43 +112,6 @@ public:
static const FXDragType stringType; // Clipboard text type (pre-registered)
static const FXDragType imageType; // Clipboard image type (pre-registered)
-protected:
- FXWindow();
- FXWindow(FXApp* a,FXVisual *vis);
- FXWindow(FXApp* a,FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h);
- static FXWindow* findDefault(FXWindow* window);
- static FXWindow* findInitial(FXWindow* window);
- virtual FXbool doesOverrideRedirect() const;
-
-protected:
-
- // Window state flags
- enum {
- FLAG_SHOWN = 0x00000001, // Is shown
- FLAG_ENABLED = 0x00000002, // Able to receive input
- FLAG_UPDATE = 0x00000004, // Is subject to GUI update
- FLAG_DROPTARGET = 0x00000008, // Drop target
- FLAG_FOCUSED = 0x00000010, // Has focus
- FLAG_DIRTY = 0x00000020, // Needs layout
- FLAG_RECALC = 0x00000040, // Needs recalculation
- FLAG_TIP = 0x00000080, // Show tip
- FLAG_HELP = 0x00000100, // Show help
- FLAG_DEFAULT = 0x00000200, // Default widget
- FLAG_INITIAL = 0x00000400, // Initial widget
- FLAG_SHELL = 0x00000800, // Shell window
- FLAG_ACTIVE = 0x00001000, // Window is active
- FLAG_PRESSED = 0x00002000, // Button has been pressed
- FLAG_KEY = 0x00004000, // Keyboard key pressed
- FLAG_CARET = 0x00008000, // Caret is on
- FLAG_CHANGED = 0x00010000, // Window data changed
- FLAG_LASSO = 0x00020000, // Lasso mode
- FLAG_TRYDRAG = 0x00040000, // Tentative drag mode
- FLAG_DODRAG = 0x00080000, // Doing drag mode
- FLAG_SCROLLINSIDE = 0x00100000, // Scroll only when inside
- FLAG_SCROLLING = 0x00200000, // Right mouse scrolling
- FLAG_OWNED = 0x00400000
- };
-
public:
// Message handlers
diff --git a/swig-interfaces/FXWizard.i b/swig-interfaces/FXWizard.i
index 8f3fce2dacacf3f6156aa7c84b12ec6500956f8c..ea16039e162a73662b23b348ab68614abad7f84c 100644
--- a/swig-interfaces/FXWizard.i
+++ b/swig-interfaces/FXWizard.i
@@ -28,23 +28,6 @@
* and ask various questions at each step in the installation.
*/
class FXWizard : public FXDialogBox {
-protected:
- FXHorizontalFrame *buttons; // Button frame
- FXImageFrame *sidebar; // Sidebar comprising image
- FXButton *advance; // Advance to next stage
- FXButton *retreat; // Retreat to last stage
- FXButton *finish; // Finish panel
- FXButton *cancel; // Cancel button
- FXSwitcher *panels; // Sub panels
- FXIcon *finishicon;
- FXIcon *nexticon;
- FXIcon *backicon;
-protected:
- FXWizard(){}
- void construct();
-private:
- FXWizard(const FXWizard&);
- FXWizard &operator=(const FXWizard&);
public:
long onUpdFinish(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdNext(FXObject*,FXSelector,void* PTR_IGNORE);
diff --git a/swig-interfaces/FXXBMIcon.i b/swig-interfaces/FXXBMIcon.i
index 6ff7947dfc5a8c296693c1e285556e1dd86f0401..9acafddeee61d9a82783da87ce1ccb98c52e792d 100644
--- a/swig-interfaces/FXXBMIcon.i
+++ b/swig-interfaces/FXXBMIcon.i
@@ -23,8 +23,6 @@
/// X Bitmap icon
class FXXBMIcon : public FXIcon {
-protected:
- FXXBMIcon(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXXBMImage.i b/swig-interfaces/FXXBMImage.i
index bf85f030f4ca6e4fce92b646c2c6778ac8e4eea9..0e3e842a18ae023132df0d779fa7a371d83ed1f7 100644
--- a/swig-interfaces/FXXBMImage.i
+++ b/swig-interfaces/FXXBMImage.i
@@ -23,8 +23,6 @@
/// X Bitmap image
class FXXBMImage : public FXImage {
-protected:
- FXXBMImage(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXXPMIcon.i b/swig-interfaces/FXXPMIcon.i
index f22b124dc9f38e7d0ea865e0a81f1425857ab87d..8c5899784daa7726223c743fdc7f8765cb97a49b 100644
--- a/swig-interfaces/FXXPMIcon.i
+++ b/swig-interfaces/FXXPMIcon.i
@@ -23,8 +23,6 @@
/// X Pixmap icon
class FXXPMIcon : public FXIcon {
-protected:
- FXXPMIcon(){}
public:
%extend {
static VALUE fileExt() {
diff --git a/swig-interfaces/FXXPMImage.i b/swig-interfaces/FXXPMImage.i
index c333197b2e382608e33b2d38ab4f3cfc3e53f5da..b0a93704df8fb1d15ff2759f408009e7434f95cc 100644
--- a/swig-interfaces/FXXPMImage.i
+++ b/swig-interfaces/FXXPMImage.i
@@ -23,8 +23,6 @@
/// X Pixmap image
class FXXPMImage : public FXImage {
-protected:
- FXXPMImage(){}
public:
%extend {
static VALUE fileExt() {