[Fxruby-commits] CVS: FXRuby/swig-interfaces FXGradientBar.i,NONE,1.1 FXMenuBar.i,NONE,1.1 FXScrollB

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv30500/swig-interfaces

Modified Files:
	FXAccelTable.i FXApp.i FXColorBar.i FXComboBox.i FXDialogBox.i 
	FXDirList.i FXGIFCursor.i FXIconList.i FXList.i FXListBox.i 
	FXMDIChild.i FXMDIClient.i FXMainWindow.i FXMatrix.i 
	FXObject.i FXPopup.i FXProgressBar.i FXProgressDialog.i 
	FXRegion.i FXScrollArea.i FXSeparator.i FXStream.i FXTable.i 
	FXText.i FXTextField.i FXTopWindow.i FXTreeList.i 
	FXTreeListBox.i FXWindow.i freefuncs.i fxdefs.i layout.i 
	markfuncs.i renames.i stubs.i typemaps.i ui.i 
Added Files:
	FXGradientBar.i FXMenuBar.i FXScrollBar.i FXStatusBar.i 
	FXStatusLine.i FXToolBar.i FXToolBarGrip.i FXToolBarShell.i 
	FXToolBarTab.i FXToolTip.i 
Removed Files:
	FXMenubar.i 
Log Message:
Many, many changes for the fox-1.1 update.

--- NEW FILE: FXGradientBar.i ---
/***********************************************************************
 * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
 * Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * For further information please contact the author by e-mail
 * at "ly...@us...".
 ***********************************************************************/

%exception FXGradientBar::FXGradientBar {
  $action
  FXRbRegisterRubyObj(self, result);
}

%include "FXGradientBar.h"

%exception FXRbGradientBar::FXRbGradientBar {
  $action
  FXRbRegisterRubyObj(self, result);
}

class FXRbGradientBar : public FXGradientBar {
public:

  /// Construct a gradient bar
  FXRbGradientBar(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=FRAME_NORMAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=DEFAULT_PAD,FXint pr=DEFAULT_PAD,FXint pt=DEFAULT_PAD,FXint pb=DEFAULT_PAD);

  /// Destructor
  virtual ~FXGradientBar();
  };

--- NEW FILE: FXMenuBar.i ---
/***********************************************************************
 * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
 * Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * For further information please contact the author by e-mail
 * at "ly...@us...".
 ***********************************************************************/

%exception FXMenuBar::FXMenuBar "$action FXRbRegisterRubyObj(self, result);";

/// Menu bar 
class FXMenuBar : public FXToolBar {
protected:
  FXMenuBar(){}
public:
  long onFocusLeft(FXObject*,FXSelector,void* PTR_EVENT);
  long onFocusRight(FXObject*,FXSelector,void* PTR_EVENT);
  long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
  long onLeave(FXObject*,FXSelector,void* PTR_EVENT);
  long onMotion(FXObject*,FXSelector,void* PTR_EVENT);
  long onButtonPress(FXObject*,FXSelector,void* PTR_IGNORE);
  long onButtonRelease(FXObject*,FXSelector,void* PTR_EVENT);
  long onCmdUnpost(FXObject*,FXSelector,void* PTR_IGNORE);
public:

  /**
  * Construct a floatable menubar 
  * Normally, the menubar is docked under window p.
  * When floated, the menubar can be docked under window q, which is
  * typically an FXToolBarShell window.
  */
  FXMenuBar(FXComposite* p,FXComposite* q,FXuint opts=LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2,FXint hs=DEFAULT_SPACING,FXint vs=DEFAULT_SPACING);

  /**
  * Construct a non-floatable menubar.
  * The menubar can not be undocked.
  */
  FXMenuBar(FXComposite* p,FXuint opts=LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2,FXint hs=DEFAULT_SPACING,FXint vs=DEFAULT_SPACING);
  };

%exception FXRbMenuBar::FXRbMenuBar "$action FXRbRegisterRubyObj(self, result);";

class FXRbMenuBar : public FXMenuBar {
public:
  /**
  * Construct a floatable menubar 
  * Normally, the menubar is docked under window p.
  * When floated, the menubar can be docked under window q, which is
  * typically an FXToolBarShell window.
  */
  FXRbMenuBar(FXComposite* p,FXComposite* q,FXuint opts=LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2,FXint hs=DEFAULT_SPACING,FXint vs=DEFAULT_SPACING);

  /**
  * Construct a non-floatable menubar.
  * The menubar can not be undocked.
  */
  FXRbMenuBar(FXComposite* p,FXuint opts=LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2,FXint hs=DEFAULT_SPACING,FXint vs=DEFAULT_SPACING);

  // Destructor
  virtual ~FXRbMenuBar();

public:
  DECLARE_FXOBJECT_VIRTUALS
  DECLARE_FXID_VIRTUALS
  DECLARE_FXDRAWABLE_VIRTUALS
  DECLARE_FXWINDOW_VIRTUALS
  DECLARE_FXTOOLBAR_VIRTUALS
  };

--- NEW FILE: FXScrollBar.i ---
/***********************************************************************
 * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
 * Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * For further information please contact the author by e-mail
 * at "ly...@us...".
 ***********************************************************************/

/// ScrollBar styles
enum {
  SCROLLBAR_HORIZONTAL = 0x00020000,      /// Horizontally oriented
  SCROLLBAR_VERTICAL   = 0                /// Vertically oriented
  };

%exception FXScrollBar::FXScrollBar "$action FXRbRegisterRubyObj(self, result);";

/// Scroll bar
class FXScrollBar : public FXWindow {
protected:
  FXint      range;           // Scrollable range
  FXint      page;            // Page size
  FXint      line;            // Line size
  FXint      pos;             // Position
  FXint      thumbsize;       // Thumb size
  FXint      thumbpos;        // Thumb position
  FXColor    hiliteColor;     // Hightlight color
  FXColor    shadowColor;     // Shadow color
  FXColor    borderColor;     // Border color
  FXTimer   *timer;           // Autoscroll timer
  FXint      dragpoint;       // Point where grabbed
  FXint      dragjump;        // Jump this much
  FXuchar    pressed;         // Action being undertaken
protected:
  FXScrollBar();
  void drawButton(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
  void drawLeftArrow(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
  void drawRightArrow(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
  void drawUpArrow(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
  void drawDownArrow(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
  virtual void layout();
public:
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
  long onMotion(FXObject*,FXSelector,void* PTR_EVENT);
  long onMouseWheel(FXObject*,FXSelector,void* PTR_EVENT);
  long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
  long onLeftBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
  long onMiddleBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
  long onMiddleBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
  long onRightBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
  long onRightBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
  long onUngrabbed(FXObject*,FXSelector,void* PTR_EVENT);
  long onTimeIncPix(FXObject*,FXSelector,void* PTR_IGNORE);
  long onTimeIncLine(FXObject*,FXSelector,void* PTR_IGNORE);
  long onTimeIncPage(FXObject*,FXSelector,void* PTR_IGNORE);
  long onTimeDecPix(FXObject*,FXSelector,void* PTR_IGNORE);
  long onTimeDecLine(FXObject*,FXSelector,void* PTR_IGNORE);
  long onTimeDecPage(FXObject*,FXSelector,void* PTR_IGNORE);
  long onTimeWheel(FXObject*,FXSelector,void* PTR_IGNORE);
  long onCmdSetValue(FXObject*,FXSelector,void* PTR_INT);
  long onCmdSetIntValue(FXObject*,FXSelector,void* PTR_PINT);
  long onCmdGetIntValue(FXObject*,FXSelector,void* PTR_IGNORE); // FIXME
  long onCmdSetIntRange(FXObject*,FXSelector,void* PTR_INTRANGE_IN);
  long onCmdGetIntRange(FXObject*,FXSelector,void* PTR_INTRANGE_OUT);
public:
  enum{
    ID_TIMEWHEEL=FXWindow::ID_LAST,
    ID_AUTOINC_LINE,
    ID_AUTODEC_LINE,
    ID_AUTOINC_PAGE,
    ID_AUTODEC_PAGE,
    ID_AUTOINC_PIX,
    ID_AUTODEC_PIX,
    ID_LAST
    };
public:

  /// Construct scroll bar
  FXScrollBar(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=SCROLLBAR_VERTICAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0);

  /// Set content size range
  void setRange(FXint r);

  /// Return content size range
  FXint getRange() const;

  /// Set viewport page size
  void setPage(FXint p);

  /// Return page size
  FXint getPage() const;

  /// Set scroll increment for line
  void setLine(FXint l);

  /// Return line increment
  FXint getLine() const;

  /// Change current scroll position
  void setPosition(FXint p);

  /// return scroll position
  FXint getPosition() const;

  /// Change highlight color
  void setHiliteColor(FXColor clr);

  /// Return highlight color
  FXColor getHiliteColor() const;

  /// Change shadow color
  void setShadowColor(FXColor clr);

  /// Return shadow color
  FXColor getShadowColor() const;

  /// Return border color
  FXColor getBorderColor() const;

  /// Change border color
  void setBorderColor(FXColor clr);

  /// Change the scrollbar style
  FXuint getScrollbarStyle() const;

  /// Get the current scrollbar style
  void setScrollbarStyle(FXuint style);

  /// Destructor
  virtual ~FXScrollBar();
  };

%exception FXRbScrollBar::FXRbScrollBar "$action FXRbRegisterRubyObj(self, result);";

class FXRbScrollBar : public FXScrollBar {
public:
  // Construct scroll bar
  FXRbScrollBar(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=SCROLLBAR_VERTICAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0);

  // Destructor
  virtual ~FXRbScrollBar();

public:
  DECLARE_FXOBJECT_VIRTUALS
  DECLARE_FXID_VIRTUALS
  DECLARE_FXDRAWABLE_VIRTUALS
  DECLARE_FXWINDOW_VIRTUALS
  };

/// Corner between scroll bars
class FXScrollCorner : public FXWindow {
protected:
  FXScrollCorner();
public:
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:

  /// Constructor
  FXScrollCorner(FXComposite* p);
  };

class FXRbScrollCorner : public FXScrollCorner {
public:
  // Constructor
  FXRbScrollCorner(FXComposite* p);

  // Destructor
  virtual ~FXRbScrollCorner();

public:
  DECLARE_FXOBJECT_VIRTUALS
  DECLARE_FXID_VIRTUALS
  DECLARE_FXDRAWABLE_VIRTUALS
  DECLARE_FXWINDOW_VIRTUALS
  };

--- NEW FILE: FXStatusBar.i ---
/***********************************************************************
 * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
 * Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * For further information please contact the author by e-mail
 * at "ly...@us...".
 ***********************************************************************/

/// StatusBar options
enum {
  STATUSBAR_WITH_DRAGCORNER = 0x00020000    /// Causes the DragCorner to be shown
  };

class FXDragCorner;
class FXStatusLine;

%exception FXStatusBar::FXStatusBar "$action FXRbRegisterRubyObj(self, result);";

/// Status bar
class FXStatusBar : public FXHorizontalFrame {
protected:
  FXDragCorner *corner;
  FXStatusLine *status;
protected:
  FXStatusBar(){}
  virtual void layout();
public:

  /// Construct status bar with or without a drag corner
  FXStatusBar(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2,FXint hs=4,FXint vs=0);

  /// Show or hide the drag corner
  void setCornerStyle(FXbool withcorner=TRUE);

  /// Return TRUE if drag corner shown
  FXbool getCornerStyle() const;

  /// Acess the status line widget
  FXStatusLine *getStatusLine() const;

  /// Access the drag corner widget
  FXDragCorner *getDragCorner() const;

  /// Destructor
  virtual ~FXStatusBar();
  };

%exception FXRbStatusBar::FXRbStatusBar "$action FXRbRegisterRubyObj(self, result);";

class FXRbStatusBar : public FXStatusBar {
public:
  // Construct status bar with or without a drag corner
  FXRbStatusBar(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2,FXint hs=4,FXint vs=0);

  // Destructor
  virtual ~FXRbStatusBar();

public:
  DECLARE_FXOBJECT_VIRTUALS
  DECLARE_FXID_VIRTUALS
  DECLARE_FXDRAWABLE_VIRTUALS
  DECLARE_FXWINDOW_VIRTUALS
  };

--- NEW FILE: FXStatusLine.i ---
/***********************************************************************
 * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
 * Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * For further information please contact the author by e-mail
 * at "ly...@us...".
 ***********************************************************************/

%exception FXStatusLine::FXStatusLine "$action FXRbRegisterRubyObj(self, result);";

/**
* The status line normally shows its permanent message; when
* moving the mouse over a Widget which has status-line help, the status line
* temporarily replaces its normal message with the help information; the status
* line obtains the help message by sending the Widget a ID_QUERY_HELP message
* with type SEL_UPDATE.
* If this query does not result in a new status string, the target of
* the status line is tried via an ordinary SEL_UPDATE message.
* If none of the above work then the status line will display the normal text,
* i.e. the string set via setNormalText().
* If the message contains a newline (\n), then the part before the newline
* will be displayed in the highlight color, while the part after the newline
* is shown using the normal text color.
*/
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();
#ifdef 0
  %extend {
    static VALUE defaultMessage(){
      return to_ruby(FXStatusLine::defaultMessage);
      }
  }
#endif
public:
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
  long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
  long onCmdGetStringValue(FXObject*,FXSelector,void* PTR_IGNORE); // FIXME
  long onCmdSetStringValue(FXObject*,FXSelector,void* PTR_STRING);
public:

  /// Constructor
  FXStatusLine(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0);

  /// Change the temporary status message
  void setText(const FXString& text);

  /// Return the temporary status message
  FXString getText() const;

  /// Change the permanent status message
  void setNormalText(const FXString& text);

  /// Return the permanent status message
  FXString getNormalText() const;

  /// Change the font
  void setFont(FXFont* fnt);

  /// Return the current font
  FXFont* getFont() const;

  /// Return the text color
  FXColor getTextColor() const;

  /// Change the text color
  void setTextColor(FXColor clr);

  /// Return the highlight text color
  FXColor getTextHighlightColor() const;

  /// Change the highlight text color
  void setTextHighlightColor(FXColor clr);

  /// Destroy
  virtual ~FXStatusLine();
  };

%exception FXRbStatusLine::FXRbStatusLine "$action FXRbRegisterRubyObj(self, result);";

class FXRbStatusLine : public FXStatusLine {
public:
  // Constructor
  FXRbStatusLine(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0);

  // Destructor
  virtual ~FXRbStatusLine();

public:
  DECLARE_FXOBJECT_VIRTUALS
  DECLARE_FXID_VIRTUALS
  DECLARE_FXDRAWABLE_VIRTUALS
  DECLARE_FXWINDOW_VIRTUALS
  };

--- NEW FILE: FXToolBar.i ---
/***********************************************************************
 * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
 * Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * For further information please contact the author by e-mail
 * at "ly...@us...".
 ***********************************************************************/

%exception FXToolBar::FXToolBar "$action FXRbRegisterRubyObj(self, result);";

/**
* ToolBar control.
*/
class FXToolBar : public FXPacker {
protected:
  FXComposite   *drydock;     // Parent when docked
  FXComposite   *wetdock;     // Parent when floating
  FXRectangle    outline;     // Outline shown while dragging
  FXWindow      *dockafter;   // Dock after this window
  FXuint         dockside;    // Dock on this side
  FXbool         docking;     // Dock it
protected:
  FXToolBar();
  virtual void layout();
public:
  long onCmdUndock(FXObject*,FXSelector,void* PTR_IGNORE);
  long onUpdUndock(FXObject*,FXSelector,void* PTR_IGNORE);
  long onCmdDockTop(FXObject*,FXSelector,void* PTR_IGNORE);
  long onUpdDockTop(FXObject*,FXSelector,void* PTR_IGNORE);
  long onCmdDockBottom(FXObject*,FXSelector,void* PTR_IGNORE);
  long onUpdDockBottom(FXObject*,FXSelector,void* PTR_IGNORE);
  long onCmdDockLeft(FXObject*,FXSelector,void* PTR_IGNORE);
  long onUpdDockLeft(FXObject*,FXSelector,void* PTR_IGNORE);
  long onCmdDockRight(FXObject*,FXSelector,void* PTR_IGNORE);
  long onUpdDockRight(FXObject*,FXSelector,void* PTR_IGNORE);
  long onBeginDragGrip(FXObject*,FXSelector,void* PTR_EVENT);
  long onEndDragGrip(FXObject*,FXSelector,void* PTR_EVENT);
  long onDraggedGrip(FXObject*,FXSelector,void* PTR_EVENT);
public:
  enum {
    ID_UNDOCK=FXPacker::ID_LAST,  /// Undock the toolbar
    ID_DOCK_TOP,                  /// Dock on the top
    ID_DOCK_BOTTOM,               /// Dock on the bottom
    ID_DOCK_LEFT,                 /// Dock on the left
    ID_DOCK_RIGHT,                /// Dock on the right
    ID_TOOLBARGRIP,               /// Notifications from toolbar grip
    ID_LAST
    };
public:

  /**
  * Construct a floatable toolbar 
  * Normally, the toolbar is docked under window p.
  * When floated, the toolbar can be docked under window q, which is
  * typically an FXToolBarShell window.
  */
  FXToolBar(FXComposite* p,FXComposite* q,FXuint opts=LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2,FXint hs=DEFAULT_SPACING,FXint vs=DEFAULT_SPACING);

  /**
  * Construct a non-floatable toolbar.
  * The toolbar can not be undocked.
  */
  FXToolBar(FXComposite* p,FXuint opts=LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=2,FXint pr=3,FXint pt=3,FXint pb=2,FXint hs=DEFAULT_SPACING,FXint vs=DEFAULT_SPACING);

  /**
  * Set parent when docked.
  * If it was docked, reparent under the new docking window.
  */
  void setDryDock(FXComposite* dry);

  /**
  * Set parent when floating.
  * If it was undocked, then reparent under the new floating window.
  */
  void setWetDock(FXComposite* wet);

  /// Return parent when docked
  FXComposite* getDryDock() const;

  /// Return parent when floating
  FXComposite* getWetDock() const;

  /// Return true if toolbar is docked
  FXbool isDocked() const;

  /**
  * Dock the bar against the given side, after some other widget.
  * However, if after is -1, it will be docked as the innermost bar just before
  * the work-area, while if after is 0, if will be docked as the outermost bar.
  */
  // virtual void dock(FXuint side=LAYOUT_SIDE_TOP,FXWindow* after=(FXWindow*)-1);
  virtual void dock(FXuint side=LAYOUT_SIDE_TOP,FXWindow* after=NULL); // FIXME

  /**
  * Undock or float the bar.
  * The initial position of the wet dock is a few pixels
  * below and to the right of the original docked position.
  */
  virtual void undock();

  /// Set docking side 
  void setDockingSide(FXuint side=LAYOUT_SIDE_TOP);

  /// Return docking side
  FXuint getDockingSide() const;

  /// Destroy
  virtual ~FXToolBar();
  };

%exception FXRbToolBar::FXRbToolBar "$action FXRbRegisterRubyObj(self, result);";

class FXRbToolBar : public FXToolBar {
public:
  /**
  * Construct a floatable toolbar 
  * Normally, the toolbar is docked under window p.
  * When floated, the toolbar can be docked under window q, which is
  * typically an FXToolBarShell window.
  */
  FXRbToolBar(FXComposite* p,FXComposite* q,FXuint opts=LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2,FXint hs=DEFAULT_SPACING,FXint vs=DEFAULT_SPACING);

  /**
  * Construct a non-floatable toolbar.
  * The toolbar can not be undocked.
  */
  FXRbToolBar(FXComposite* p,FXuint opts=LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=2,FXint pr=3,FXint pt=3,FXint pb=2,FXint hs=DEFAULT_SPACING,FXint vs=DEFAULT_SPACING);

  // Destructor
  virtual ~FXRbToolBar();

public:
  DECLARE_FXOBJECT_VIRTUALS
  DECLARE_FXID_VIRTUALS
  DECLARE_FXDRAWABLE_VIRTUALS
  DECLARE_FXWINDOW_VIRTUALS
  DECLARE_FXTOOLBAR_VIRTUALS
  };

--- NEW FILE: FXToolBarGrip.i ---
/***********************************************************************
 * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
 * Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * For further information please contact the author by e-mail
 * at "ly...@us...".
 ***********************************************************************/

/// ToolBar Grip styles
enum {
  TOOLBARGRIP_SINGLE     = 0,             /// Single bar mode for movable toolbars
  TOOLBARGRIP_DOUBLE     = 0x00008000,    /// Double bar mode for dockable toolbars
  TOOLBARGRIP_SEPARATOR  = 0x00010000     /// Separator mode
  };

class FXToolBar;

%exception FXToolBarGrip::FXToolBarGrip "$action FXRbRegisterRubyObj(self, result);";

/**
* A toolbar grip is used to move its parent [an FXToolBar]. 
* The grip draws either a single or double bar; it is customary
* to use the single bar grip for toolbar-rearrangements only,
* and use the double-bar when the toolbar needs to be floated
* or docked.
* The toolbar grip is automatically oriented properly by the
* the toolbar widget.
*/
class FXToolBarGrip : public FXWindow {
protected:
  FXColor activeColor;                    // Color when active
  FXColor hiliteColor;                    // Highlight color
  FXColor shadowColor;                    // Shadow color
protected:
  FXToolBarGrip();
public:
  long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
  long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
  long onLeftBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
  long onMotion(FXObject*,FXSelector,void* PTR_EVENT);
  long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
  long onLeave(FXObject*,FXSelector,void* PTR_EVENT);
public:

  /// Construct toolbar grip 
  FXToolBarGrip(FXToolBar* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=TOOLBARGRIP_SINGLE,FXint x=0,FXint y=0,FXint w=0,FXint h=0);

  /// Change toolbar grip to double
  void setDoubleBar(FXbool dbl=TRUE);

  /// Return toolbar grip to double
  FXuint getDoubleBar() const;

  /// Change highlight color
  void setHiliteColor(FXColor clr);

  /// Get highlight color
  FXColor getHiliteColor() const;

  /// Change shadow color
  void setShadowColor(FXColor clr);

  /// Get shadow color
  FXColor getShadowColor() const;

  /// Set the active color
  void setActiveColor(FXColor clr);

  /// Get the active color
  FXColor getActiveColor() const;
  };

%exception FXRbToolBarGrip::FXRbToolBarGrip "$action FXRbRegisterRubyObj(self, result);";

class FXRbToolBarGrip : public FXToolBarGrip {
public:
  // Construct toolbar grip 
  FXRbToolBarGrip(FXToolBar* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=TOOLBARGRIP_SINGLE,FXint x=0,FXint y=0,FXint w=0,FXint h=0);

  // Destructor
  virtual ~FXRbToolBarGrip();

public:
  DECLARE_FXOBJECT_VIRTUALS
  DECLARE_FXID_VIRTUALS
  DECLARE_FXDRAWABLE_VIRTUALS
  DECLARE_FXWINDOW_VIRTUALS
  };

--- NEW FILE: FXToolBarShell.i ---
/***********************************************************************
 * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
 * Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * For further information please contact the author by e-mail
 * at "ly...@us...".
 ***********************************************************************/

%exception FXToolBarShell::FXToolBarShell "$action FXRbRegisterRubyObj(self, result);";

/**
* A Tool bar shell is a widget floating around over the Main Window.
* It typically contains an undocked tool bar.
*/
class FXToolBarShell : public FXTopWindow {
protected:
  FXColor   baseColor;
  FXColor   hiliteColor;
  FXColor   shadowColor;
  FXColor   borderColor;
  FXint     border;
protected:
  FXToolBarShell(){}
  virtual void layout();
  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:

  /// Construct a toolbar shell
  FXToolBarShell(FXWindow* owner,FXuint opts=FRAME_RAISED|FRAME_THICK,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint hs=4,FXint vs=4);

  /// Change frame style
  void setFrameStyle(FXuint style);

  /// Get current frame style
  FXuint getFrameStyle() const;

  /// Get border width
  FXint getBorderWidth() const;

  /// Change highlight color
  void setHiliteColor(FXColor clr);

  /// Get highlight color
  FXColor getHiliteColor() const;

  /// Change shadow color
  void setShadowColor(FXColor clr);

  /// Get shadow color
  FXColor getShadowColor() const;

  /// Change border color
  void setBorderColor(FXColor clr);

  /// Get border color
  FXColor getBorderColor() const;

  /// Change base gui color
  void setBaseColor(FXColor clr);

  /// Get base gui color
  FXColor getBaseColor() const;
  };

%exception FXRbToolBarShell::FXRbToolBarShell "$action FXRbRegisterRubyObj(self, result);";

class FXRbToolBarShell : public FXToolBarShell {
public:
  // Construct a toolbar shell
  FXRbToolBarShell(FXWindow* owner,FXuint opts=FRAME_RAISED|FRAME_THICK,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint hs=4,FXint vs=4);

  // Destructor
  virtual ~FXRbToolBarShell();

public:
  DECLARE_FXOBJECT_VIRTUALS
  DECLARE_FXID_VIRTUALS
  DECLARE_FXDRAWABLE_VIRTUALS
  DECLARE_FXWINDOW_VIRTUALS
  DECLARE_FXTOPWINDOW_VIRTUALS
  };

--- NEW FILE: FXToolBarTab.i ---
/***********************************************************************
 * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
 * Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * For further information please contact the author by e-mail
 * at "ly...@us...".
 ***********************************************************************/

/// ToolBar Tab styles
enum {
  TOOLBARTAB_HORIZONTAL = 0,              /// Default is for horizontal toolbar
  TOOLBARTAB_VERTICAL   = 0x00008000      /// For vertical toolbar
  };

%exception FXToolBarTab::FXToolBarTab "$action FXRbRegisterRubyObj(self, result);";

/**
* A toolbar tab is used to collapse or uncollapse a sibling
* widget.  The sibling affected is the widget immediately following
* the toolbar tab or, if the toolbar tab is the last widget in the list,
* the widget immediately preceding the toolbar tab.
*/
class FXToolBarTab : public FXFrame {
protected:
  FXColor activeColor;                    // Color when active
  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);
  long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
  long onLeave(FXObject*,FXSelector,void* PTR_EVENT);
  long onUngrabbed(FXObject*,FXSelector,void* PTR_EVENT);
  long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
  long onLeftBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
  long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
  long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);
  long onCmdCollapse(FXObject*,FXSelector,void* PTR_IGNORE);
  long onUpdCollapse(FXObject*,FXSelector,void* PTR_IGNORE);
  long onCmdUncollapse(FXObject*,FXSelector,void* PTR_IGNORE);
  long onUpdUncollapse(FXObject*,FXSelector,void* PTR_IGNORE);
public:
  enum {
    ID_COLLAPSE=FXFrame::ID_LAST,
    ID_UNCOLLAPSE,
    ID_LAST
    };
public:

  /// Construct toolbar tab 
  FXToolBarTab(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=FRAME_RAISED,FXint x=0,FXint y=0,FXint w=0,FXint h=0);

  /// Collapse or uncollapse the toolbar
  void collapse(FXbool c=TRUE);

  /// Return true if the toolbar is collapsed
  FXbool isCollapsed() const;

  /// Change the tab style
  void setTabStyle(FXuint style);

  /// Get current tab style
  FXuint getTabStyle() const;

  /// Get the active color
  FXColor getActiveColor() const;

  /// Set the active color
  void setActiveColor(FXColor clr);
  };

%exception FXRbToolBarTab::FXRbToolBarTab "$action FXRbRegisterRubyObj(self, result);";

class FXRbToolBarTab : public FXToolBarTab {
public:
  // Construct toolbar tab 
  FXRbToolBarTab(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=FRAME_RAISED,FXint x=0,FXint y=0,FXint w=0,FXint h=0);

  // Destructor
  virtual ~FXRbToolBarTab();

public:
  DECLARE_FXOBJECT_VIRTUALS
  DECLARE_FXID_VIRTUALS
  DECLARE_FXDRAWABLE_VIRTUALS
  DECLARE_FXWINDOW_VIRTUALS
  };

--- NEW FILE: FXToolTip.i ---
/***********************************************************************
 * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
 * Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * For further information please contact the author by e-mail
 * at "ly...@us...".
 ***********************************************************************/

/// ToolTip styles
enum {
  TOOLTIP_PERMANENT  = 0x00020000,      /// ToolTip stays up indefinitely
  TOOLTIP_VARIABLE   = 0x00040000,      /// ToolTip stays up variable time, depending on the length of the string
  TOOLTIP_NORMAL     = 0
  };

class FXFont;

%exception FXToolTip::FXToolTip "$action FXRbRegisterRubyObj(self, result);";

/// Hopefully Helpful Hint message
class FXToolTip : public FXShell {
protected:
  FXString  label; 
  FXFont   *font;
  FXColor   textColor;
  FXTimer  *timer;
  FXbool    popped;
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);
  long onTipShow(FXObject*,FXSelector,void* PTR_IGNORE);
  long onTipHide(FXObject*,FXSelector,void* PTR_IGNORE);
  long onCmdGetStringValue(FXObject*,FXSelector,void* PTR_IGNORE); // FIXME
  long onCmdSetStringValue(FXObject*,FXSelector,void* PTR_STRING);
public:
  enum {
    ID_TIP_SHOW=FXShell::ID_LAST,
    ID_TIP_HIDE,
    ID_LAST
    };
public:
  /// Construct a tool tip
  FXToolTip(FXApp* a,FXuint opts=TOOLTIP_NORMAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0);

  /// Set the text for this tip
  void setText(const FXString& text);

  /// Get the text for this tip
  FXString getText() const;

  /// Set the tip text font
  void setFont(FXFont *fnt);

  /// Get the tip text font
  FXFont* getFont() const;

  /// Get the current tip text color
  FXColor getTextColor() const;

  /// Set the current tip text color
  void setTextColor(FXColor clr);

  /// Destructor
  virtual ~FXToolTip();
  };

%exception FXRbToolTip::FXRbToolTip "$action FXRbRegisterRubyObj(self, result);";

class FXRbToolTip : public FXToolTip {
public:
  // Construct a tool tip
  FXRbToolTip(FXApp* a,FXuint opts=TOOLTIP_NORMAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0);

  // Destructor
  virtual ~FXRbToolTip();

public:
  DECLARE_FXOBJECT_VIRTUALS
  DECLARE_FXID_VIRTUALS
  DECLARE_FXDRAWABLE_VIRTUALS
  DECLARE_FXWINDOW_VIRTUALS
  };

Index: FXAccelTable.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXAccelTable.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXAccelTable.i	19 Mar 2002 23:18:40 -0000	1.11
--- FXAccelTable.i	12 Jul 2002 16:34:47 -0000	1.12
***************
*** 21,26 ****
   ***********************************************************************/

- struct FXAccelKey;
- 
  %exception FXAccelTable::FXAccelTable "$action FXRbRegisterRubyObj(self, result);";

--- 21,24 ----
***************
*** 31,34 ****
--- 29,39 ----
  */
  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);

Index: FXApp.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXApp.i,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** FXApp.i	11 Jul 2002 13:33:13 -0000	1.39
--- FXApp.i	12 Jul 2002 16:34:47 -0000	1.40
***************
*** 21,28 ****
   ***********************************************************************/

  class FXCursor;
  class FXFont;
  class FXVisual;
! class FXWindow;

  /// File input modes for addInput
--- 21,39 ----
   ***********************************************************************/

+ // Forward declarations
+ class FXWindow;
+ class FXIcon;
+ class FXBitmap;
  class FXCursor;
+ class FXRootWindow;
+ class FXMainWindow;
+ class FXPopup;
  class FXFont;
+ class FXDC;
+ class FXDCWindow;
  class FXVisual;
! class FXGLVisual;
! class FXGLContext;
! 

  /// File input modes for addInput
***************
*** 165,169 ****

    /// Connection to display; this is called by init()
!   FXbool openDisplay(const FXchar* dpyname=":0");

    /// Close connection to the display
--- 176,180 ----

    /// Connection to display; this is called by init()
!   FXbool openDisplay(const FXchar* dpyname=NULL);

    /// Close connection to the display
***************
*** 173,176 ****
--- 184,193 ----
    void* getDisplay() const;

+   /// Get argument count
+   FXint getArgc() const;
+ 
+   /// Get argument vector
+   const FXchar *const *getArgv() const; // FIXME
+ 
    /// Get default visual
    FXVisual* getDefaultVisual() const;
***************
*** 183,187 ****

    /// Get root Window
!   FXRootWindow* getRoot() const;

    /// Get the window under the cursor, if any  
--- 200,204 ----

    /// Get root Window
!   FXRootWindow* getRootWindow() const;

    /// Get the window under the cursor, if any  
***************
*** 191,196 ****
    FXWindow *getFocusWindow() const;

!   /// Get main window, if any
!   FXWindow *getMainWindow() const;

    /// Find window from id
--- 208,213 ----
    FXWindow *getFocusWindow() const;

!   /// Get current popup window, if any
!   FXPopup* getPopupWindow() const;

    /// Find window from id
***************
*** 343,350 ****

    /// Return window of current modal loop
!   FXWindow* modalWindow() const;

    /// Return mode of current modal loop
!   FXModality modalModality() const;

    /**
--- 360,367 ----

    /// Return window of current modal loop
!   FXWindow* getModalWindow() const;

    /// Return mode of current modal loop
!   FXModality getModality() const;

    /**

Index: FXColorBar.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXColorBar.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXColorBar.i	19 Mar 2002 23:18:40 -0000	1.3
--- FXColorBar.i	12 Jul 2002 16:34:47 -0000	1.4
***************
*** 82,95 ****
    void setBarStyle(FXuint style);

!   /// Set status line help text for this color well
    void setHelpText(const FXString& text);

!   /// Get status line help text for this color well
    FXString getHelpText() const;

!   /// Set tool tip message for this color well
    void setTipText(const FXString& text);

!   /// Get tool tip message for this color well
    FXString getTipText() const;

--- 82,95 ----
    void setBarStyle(FXuint style);

!   /// Set status line help text for this color bar
    void setHelpText(const FXString& text);

!   /// Get status line help text for this color bar
    FXString getHelpText() const;

!   /// Set tool tip message for this color bar
    void setTipText(const FXString& text);

!   /// Get tool tip message for this color bar
    FXString getTipText() const;

Index: FXComboBox.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXComboBox.i,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** FXComboBox.i	11 Jul 2002 13:33:14 -0000	1.24
--- FXComboBox.i	12 Jul 2002 16:34:47 -0000	1.25
***************
*** 54,57 ****
--- 54,58 ----
    long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
    long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
+   long onFocusSelf(FXObject*,FXSelector,void* PTR_EVENT);
    long onTextButton(FXObject*,FXSelector,void* PTR_IGNORE);
    long onTextChanged(FXObject*,FXSelector,void* PTR_CSTRING);

Index: FXDialogBox.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDialogBox.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** FXDialogBox.i	11 Jul 2002 13:33:14 -0000	1.18
--- FXDialogBox.i	12 Jul 2002 16:34:48 -0000	1.19
***************
*** 35,39 ****
    long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
    long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);
-   long onClose(FXObject*,FXSelector,void* PTR_IGNORE);
    long onCmdAccept(FXObject*,FXSelector,void* PTR_IGNORE);
    long onCmdCancel(FXObject*,FXSelector,void* PTR_IGNORE);
--- 35,38 ----

Index: FXDirList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDirList.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FXDirList.i	11 Jul 2002 13:33:14 -0000	1.21
--- FXDirList.i	12 Jul 2002 16:34:48 -0000	1.22
***************
*** 58,71 ****
  public:
    /// Constructor
!   FXDirItem(const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ptr=NULL);
    FXbool isDirectory() const;
    FXbool isExecutable() const;
    FXbool isSymlink() const;
    FXbool isChardev() const;
    FXbool isBlockdev() const;
    FXbool isFifo() const;
    FXbool isSocket() const;
    FXFileAssoc* getAssoc() const;
    unsigned long getSize() const;
    FXTime getDate() const;
    };
--- 58,94 ----
  public:
    /// Constructor
!   FXDirItem(const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ptr=NULL):FXTreeItem(text,oi,ci,ptr),iprev(NULL),inext(NULL),list(NULL),assoc(NULL),size(0),date(0){}
! 
!   /// Return true if this is a file item
!   FXbool isFile() const;
!   
!   /// Return true if this is a directory item
    FXbool isDirectory() const;
+ 
+   /// Return true if this is an executable item
    FXbool isExecutable() const;
+ 
+   /// Return true if this is a symbolic link item
    FXbool isSymlink() const;
+ 
+   /// Return true if this is a character device item
    FXbool isChardev() const;
+ 
+   /// Return true if this is a block device item
    FXbool isBlockdev() const;
+ 
+   /// Return true if this is an FIFO item
    FXbool isFifo() const;
+ 
+   /// Return true if this is a socket
    FXbool isSocket() const;
+ 
+   /// Return the file-association object for this item
    FXFileAssoc* getAssoc() const;
+ 
+   /// Return the file size for this item
    unsigned long getSize() const;
+ 
+   /// Return the date for this item
    FXTime getDate() const;
    };

Index: FXGIFCursor.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGIFCursor.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FXGIFCursor.i	11 Jul 2002 17:21:05 -0000	1.13
--- FXGIFCursor.i	12 Jul 2002 16:34:48 -0000	1.14
***************
*** 21,35 ****
   ***********************************************************************/

! %exception FXGIFCursor::FXGIFCursor "$action FXRbRegisterRubyObj(self, result);";

! %ignore ::fxloadGIF(FXStream& store,FXuchar*& data,FXColor& transp,FXint& width,FXint& height);

  %apply const FXuchar *PIXELS { const FXuchar *data };

! %include FXGIFCursor.h

  %exception FXRbGIFCursor::FXRbGIFCursor "$action FXRbRegisterRubyObj(self, result);";

! class FXRbGIFCursor : public FXGIFCursor {
  public:
    // Constructor
--- 21,35 ----
   ***********************************************************************/

! %exception FX::FXGIFCursor::FXGIFCursor "$action FXRbRegisterRubyObj(self, result);";

! %ignore FX::fxloadGIF(FXStream& store,FXuchar*& data,FXColor& transp,FXint& width,FXint& height);

  %apply const FXuchar *PIXELS { const FXuchar *data };

! %include "FXGIFCursor.h"

  %exception FXRbGIFCursor::FXRbGIFCursor "$action FXRbRegisterRubyObj(self, result);";

! class FXRbGIFCursor : public FX::FXGIFCursor {
  public:
    // Constructor
***************
*** 44,48 ****
    DECLARE_FXCURSOR_VIRTUALS
    };
- 

  %inline %{
--- 44,47 ----

Index: FXIconList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXIconList.i,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** FXIconList.i	11 Jul 2002 13:33:14 -0000	1.35
--- FXIconList.i	12 Jul 2002 16:34:48 -0000	1.36
***************
*** 451,455 ****

    /// Repaint item at index
!   void updateItem(FXint index);

    /// Select items in rectangle
--- 451,455 ----

    /// Repaint item at index
!   void updateItem(FXint index) const;

    /// Select items in rectangle

Index: FXList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXList.i,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** FXList.i	11 Jul 2002 13:33:14 -0000	1.37
--- FXList.i	12 Jul 2002 16:34:48 -0000	1.38
***************
*** 396,400 ****

    /// Repaint item
!   void updateItem(FXint index);

    /// Enable item
--- 396,400 ----

    /// Repaint item
!   void updateItem(FXint index) const;

    /// Enable item

Index: FXListBox.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXListBox.i,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** FXListBox.i	11 Jul 2002 13:33:14 -0000	1.24
--- FXListBox.i	12 Jul 2002 16:34:48 -0000	1.25
***************
*** 46,49 ****
--- 46,50 ----
    long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
    long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
+   long onFocusSelf(FXObject*,FXSelector,void* PTR_EVENT);
    long onFieldButton(FXObject*,FXSelector,void* PTR_IGNORE);
    long onListUpdate(FXObject*,FXSelector,void* PTR_IGNORE);

Index: FXMDIChild.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXMDIChild.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** FXMDIChild.i	19 Mar 2002 23:18:40 -0000	1.14
--- FXMDIChild.i	12 Jul 2002 16:34:48 -0000	1.15
***************
*** 96,102 ****
    long onSelected(FXObject*,FXSelector,void* PTR_MDICHILD);
    long onDeselected(FXObject*,FXSelector,void* PTR_MDICHILD);
-   long onMinimize(FXObject*,FXSelector,void* PTR_IGNORE);
-   long onRestore(FXObject*,FXSelector,void* PTR_IGNORE);
-   long onMaximize(FXObject*,FXSelector,void* PTR_IGNORE);
    long onCmdRestore(FXObject*,FXSelector,void* PTR_IGNORE);
    long onCmdMaximize(FXObject*,FXSelector,void* PTR_IGNORE);
--- 96,99 ----
***************
*** 114,117 ****
--- 111,115 ----
    long onUpdClose(FXObject*,FXSelector,void* PTR_IGNORE);
    long onCmdSetStringValue(FXObject*,FXSelector,void* PTR_STRING);
+   long onCmdGetStringValue(FXObject*,FXSelector,void* PTR_IGNORE); // FIXME
    virtual long onDefault(FXObject*,FXSelector,void* PTR_IGNORE); // FIXME
  public:
***************
*** 120,163 ****
    FXMDIChild(FXMDIClient* p,const FXString& name,FXIcon* ic=NULL,FXMenuPane* mn=NULL,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);

-   /// Get next MDI Child
-   FXMDIChild* getMDINext() const;
- 
-   /// Get previous MDI Child
-   FXMDIChild* getMDIPrev() const;
- 
    /// Change normal (restored) position
    void setNormalX(FXint x);
- 
    void setNormalY(FXint y);
- 
    void setNormalWidth(FXint w);
- 
    void setNormalHeight(FXint h);

    /// Return normal (restored) position
    FXint getNormalX() const;
- 
    FXint getNormalY() const;
- 
    FXint getNormalWidth() const;
- 
    FXint getNormalHeight() const;

    /// Change iconified position
    void setIconX(FXint x);
- 
    void setIconY(FXint y);
- 
    void setIconWidth(FXint w);
- 
    void setIconHeight(FXint h);

    /// Return iconified position
    FXint getIconX() const;
- 
    FXint getIconY() const;
- 
    FXint getIconWidth() const;
- 
    FXint getIconHeight() const;

--- 118,143 ----
***************
*** 173,214 ****
    /// Get colors
    FXColor getHiliteColor() const;
- 
    FXColor getShadowColor() const;
- 
    FXColor getBaseColor() const;
- 
    FXColor getBorderColor() const;
- 
    FXColor getTitleColor () const;
- 
    FXColor getTitleBackColor() const;

    /// Change colors
    void setHiliteColor(FXColor clr);
- 
    void setShadowColor(FXColor clr);
- 
    void setBaseColor(FXColor clr);
- 
    void setBorderColor(FXColor clr);
- 
    void setTitleColor(FXColor clr);
- 
    void setTitleBackColor(FXColor clr);

    /// Return TRUE if maximized
    FXbool isMaximized() const;
!   
    /// Return TRUE if minimized
    FXbool isMinimized() const;
-   
-   /// Maximize MDI Child
-   virtual void maximize(FXbool notify=FALSE);
-   
-   /// Minimize/iconify MDI Child
-   virtual void minimize(FXbool notify=FALSE);
-   
-   /// Restore MDI Child to normal
-   virtual void restore(FXbool notify=FALSE);

    /// Get window icon
--- 153,187 ----
    /// Get colors
    FXColor getHiliteColor() const;
    FXColor getShadowColor() const;
    FXColor getBaseColor() const;
    FXColor getBorderColor() const;
    FXColor getTitleColor () const;
    FXColor getTitleBackColor() const;

    /// Change colors
    void setHiliteColor(FXColor clr);
    void setShadowColor(FXColor clr);
    void setBaseColor(FXColor clr);
    void setBorderColor(FXColor clr);
    void setTitleColor(FXColor clr);
    void setTitleBackColor(FXColor clr);

+   /// Maximize MDI window, return TRUE if maximized
+   virtual FXbool maximize(FXbool notify=FALSE);
+ 
+   /// Minimize/iconify MDI window, return TRUE if minimized
+   virtual FXbool minimize(FXbool notify=FALSE);
+ 
+   /// Restore MDI window to normal, return TRUE if restored
+   virtual FXbool restore(FXbool notify=FALSE);
+ 
+   /// Close MDI window, return TRUE if actually closed
+   virtual FXbool close(FXbool notify=FALSE);
+ 
    /// Return TRUE if maximized
    FXbool isMaximized() const;
! 
    /// Return TRUE if minimized
    FXbool isMinimized() const;

    /// Get window icon

Index: FXMDIClient.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXMDIClient.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXMDIClient.i	19 Mar 2002 23:18:40 -0000	1.11
--- FXMDIClient.i	12 Jul 2002 16:34:48 -0000	1.12
***************
*** 38,52 ****
  * window by the MDI client.
  */
! class FXMDIClient : public FXScrollArea {
  protected:
    FXint       cascadex;           // Cascade offset X
    FXint       cascadey;           // Cascade offset Y
-   FXint       xmin;               // Space taken up by all children
-   FXint       xmax;
-   FXint       ymin;
-   FXint       ymax;
  protected:
    FXMDIClient();
-   void recompute();
    virtual void layout();
  public:
--- 38,48 ----
  * window by the MDI client.
  */
! class FXMDIClient : public FXComposite {
  protected:
+   FXMDIChild *active;             // Active child
    FXint       cascadex;           // Cascade offset X
    FXint       cascadey;           // Cascade offset Y
  protected:
    FXMDIClient();
    virtual void layout();
  public:
***************
*** 98,107 ****
    FXMDIClient(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);

-   /// Get first MDI Child
-   FXMDIChild* getMDIChildFirst() const;
- 
-   /// Get last MDI Child
-   FXMDIChild* getMDIChildLast() const;
- 
    /// Pass message to all MDI Child windows
    long forallWindows(FXObject* sender,FXSelector sel,void* ptr);
--- 94,97 ----
***************
*** 110,119 ****
    long forallDocWindows(FXObject* document,FXObject* sender,FXSelector sel,void* ptr);

    /// Get current active child; may be NULL!
    FXMDIChild* getActiveChild() const;

!   /// Set active MDI Child
!   FXbool setActiveChild(FXMDIChild* child=NULL,FXbool notify=TRUE);
! 
    /// Change cascade offset X
    void setCascadeX(FXint off);
--- 100,118 ----
    long forallDocWindows(FXObject* document,FXObject* sender,FXSelector sel,void* ptr);

+   /// Set active MDI Child
+   virtual FXbool setActiveChild(FXMDIChild* child=NULL,FXbool notify=TRUE);
+ 
    /// Get current active child; may be NULL!
    FXMDIChild* getActiveChild() const;

!   // Cascade windows
!   virtual void cascade(FXbool notify=FALSE);
!   
!   // Layout horizontally
!   virtual void horizontal(FXbool notify=FALSE);
!   
!   // Layout vertically
!   virtual void vertical(FXbool notify=FALSE);
!   
    /// Change cascade offset X
    void setCascadeX(FXint off);
***************
*** 147,151 ****
    DECLARE_FXDRAWABLE_VIRTUALS
    DECLARE_FXWINDOW_VIRTUALS
!   DECLARE_FXSCROLLAREA_VIRTUALS
    };

--- 146,150 ----
    DECLARE_FXDRAWABLE_VIRTUALS
    DECLARE_FXWINDOW_VIRTUALS
!   DECLARE_FXMDICLIENT_VIRTUALS
    };

Index: FXMainWindow.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXMainWindow.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FXMainWindow.i	19 Mar 2002 23:18:40 -0000	1.10
--- FXMainWindow.i	12 Jul 2002 16:34:48 -0000	1.11
***************
*** 23,36 ****
  %exception FXMainWindow::FXMainWindow "$action FXRbRegisterRubyObj(self, result);";

! /// Main application window 
  class FXMainWindow : public FXTopWindow {
  protected:
    FXMainWindow(){}
  public:
-   long onClose(FXObject*,FXSelector,void* PTR_IGNORE);
- public:

    /// Construct a main window
!   FXMainWindow(FXApp* a,const FXString& name,FXIcon *ic=NULL,FXIcon *mi=NULL,FXuint opts=DECOR_ALL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0,FXint hs=4,FXint vs=4);

    /// Destructor
--- 23,42 ----
  %exception FXMainWindow::FXMainWindow "$action FXRbRegisterRubyObj(self, result);";

! /**
! * Main application window.  There may be any number of
! * MainWindows in an application.
! * When a MainWindow is closed, it sends a SEL_CLOSE message to
! * its target; the target should return 0 if there is no objection
! * against proceeding with the close, and 1 otherwise.
! * After the SEL_CLOSE message has been sent and no objection was
! * raised, the MainWindow will delete itself.
! */
  class FXMainWindow : public FXTopWindow {
  protected:
    FXMainWindow(){}
  public:

    /// Construct a main window
!   FXMainWindow(FXApp* a,const FXString& name,FXIcon *ic=NULL,FXIcon *mi=NULL,FXuint opts=DECOR_ALL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0,FXint hs=0,FXint vs=0);

    /// Destructor
***************
*** 43,47 ****
  public:
    // Constructor
!   FXRbMainWindow(FXApp* a,const FXString& name,FXIcon *ic=NULL,FXIcon *mi=NULL,FXuint opts=DECOR_ALL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0,FXint hs=4,FXint vs=4);

    // Destructor
--- 49,53 ----
  public:
    // Constructor
!   FXRbMainWindow(FXApp* a,const FXString& name,FXIcon *ic=NULL,FXIcon *mi=NULL,FXuint opts=DECOR_ALL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0,FXint hs=0,FXint vs=0);

    // Destructor

Index: FXMatrix.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXMatrix.i,v
retrieving revision 1.14
retrieving revision 1.1...

[truncated message content]