update Rd files, use exports, not S3method as directed by devtools

DESCRIPTION

@@ -61,3 +61,4 @@ Collate:
     'gwindow.R'
     'icons.R'
     'startup.R'
+RoxygenNote: 5.0.1

NAMESPACE

@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 S3method(.addStockIcons,guiWidgetsToolkitRGtk2)
 S3method(.gaction,guiWidgetsToolkitRGtk2)

R/dialogs.R

@@ -102,7 +102,7 @@ GDialog <- setRefClass("GDialog",
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gmessage guiWidgetsToolkitRGtk2
-##' @S3method .gmessage guiWidgetsToolkitRGtk2
+## @export .gmessage guiWidgetsToolkitRGtk2
 .gmessage.guiWidgetsToolkitRGtk2 <- function(toolkit,
                                              msg,
                                              title = "message",
@@ -127,7 +127,7 @@ GMessage <- setRefClass("GMessage", contains="GDialog")
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gconfirm guiWidgetsToolkitRGtk2
-##' @S3method .gconfirm guiWidgetsToolkitRGtk2
+## @export .gconfirm guiWidgetsToolkitRGtk2
 .gconfirm.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                               msg,
                                               title = "Confirm",
@@ -156,7 +156,7 @@ GConfirm <- setRefClass("GConfirm",
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .ginput guiWidgetsToolkitRGtk2
-##' @S3method .ginput guiWidgetsToolkitRGtk2
+## @export .ginput guiWidgetsToolkitRGtk2
 .ginput.guiWidgetsToolkitRGtk2 <- function(toolkit,
                                            msg,
                                            text="",
@@ -200,7 +200,7 @@ GInput <- setRefClass("GInput",
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gbasicdialog guiWidgetsToolkitRGtk2
-##' @S3method .gbasicdialog guiWidgetsToolkitRGtk2
+## @export .gbasicdialog guiWidgetsToolkitRGtk2
 .gbasicdialog.guiWidgetsToolkitRGtk2 <- function(toolkit,
                                                  title = "Dialog",
                                                  parent=NULL,
@@ -339,7 +339,7 @@ GBasicDialog <- setRefClass("GBasicDialog",
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .galert guiWidgetsToolkitRGtk2
-##' @S3method .galert guiWidgetsToolkitRGtk2
+## @export .galert guiWidgetsToolkitRGtk2
 .galert.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                             msg,
                                             title = "message",

R/gaction.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gaction guiWidgetsToolkitRGtk2
-##' @S3method .gaction guiWidgetsToolkitRGtk2
+## @export .gaction guiWidgetsToolkitRGtk2
 .gaction.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                              label, tooltip=NULL, icon = NULL, key.accel = NULL,
                                              handler = NULL,action = NULL, parent = NULL, ... ) {

R/gbutton.R

@@ -8,7 +8,7 @@ NULL
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @seealso The documentation for this is found at \code{\link{gbutton}}.
 ##' @method .gbutton guiWidgetsToolkitRGtk2
-##' @S3method .gbutton guiWidgetsToolkitRGtk2
+## @export .gbutton guiWidgetsToolkitRGtk2
 .gbutton.guiWidgetsToolkitRGtk2 <- function(toolkit, text, handler, action, container, ...) {
   GButton$new(toolkit, text, handler, action, container, ...)
 }

R/gcalendar.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gcalendar guiWidgetsToolkitRGtk2
-##' @S3method .gcalendar guiWidgetsToolkitRGtk2
+## @export .gcalendar guiWidgetsToolkitRGtk2
 .gcalendar.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                                text="",
                                                format="%Y-%m-%d",

R/gcheckbox.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gcheckbox guiWidgetsToolkitRGtk2
-##' @S3method .gcheckbox guiWidgetsToolkitRGtk2
+## @export .gcheckbox guiWidgetsToolkitRGtk2
 .gcheckbox.guiWidgetsToolkitRGtk2 <- function(toolkit,
                                               text, checked = FALSE, use.togglebutton=FALSE, handler = NULL, action = NULL,
                                               container = NULL, ... ) {

R/gcheckboxgroup.R

@@ -9,7 +9,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gcheckboxgroup guiWidgetsToolkitRGtk2
-##' @S3method .gcheckboxgroup guiWidgetsToolkitRGtk2
+## @export .gcheckboxgroup guiWidgetsToolkitRGtk2
 .gcheckboxgroup.guiWidgetsToolkitRGtk2 <-  function(toolkit=NULL,
                                                     items, checked = FALSE, horizontal = FALSE,
                                                     use.table=FALSE, handler = NULL,

R/gcombobox.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gcombobox guiWidgetsToolkitRGtk2
-##' @S3method .gcombobox guiWidgetsToolkitRGtk2
+## @export .gcombobox guiWidgetsToolkitRGtk2
 .gcombobox.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                                items, selected = 1, editable = FALSE, coerce.with = NULL,
                                                handler = NULL,action = NULL, container = NULL, ... ) {

R/gdf.R

@@ -15,7 +15,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gdf guiWidgetsToolkitRGtk2
-##' @S3method .gdf guiWidgetsToolkitRGtk2
+## @export .gdf guiWidgetsToolkitRGtk2
 .gdf.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                          items = NULL,
                     handler = NULL,action = NULL, container = NULL, ... ) {
@@ -34,7 +34,7 @@ NULL
 ensure_type <- function(x, value) UseMethod("ensure_type")
 ensure_type.default <- function(x, value) value
 ensure_type.character <- function(x, value) as.character(value)
-ensure_type.factor <- function(x, value) {x[length(x) + 1] <- value; tail(x, n=1)}
+ensure_type.factor <- function(x, value) {x[length(x) + 1] <- value; utils::tail(x, n=1)}
 ensure_type.numeric <- function(x, value) as.numeric(value)
 ensure_type.integer <- function(x, value) as.integer(value)
 ensure_type.logical <- function(x, value) as.logical(value)

R/gedit.R

@@ -8,7 +8,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gedit guiWidgetsToolkitRGtk2
-##' @S3method .gedit guiWidgetsToolkitRGtk2
+## @export .gedit guiWidgetsToolkitRGtk2
 .gedit.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                            text = "", width = 25, coerce.with = NULL, initial.msg=initial.msg,
                     handler = NULL,action = NULL, container = NULL, ... ) {

R/gexpandgroup.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gexpandgroup guiWidgetsToolkitRGtk2
-##' @S3method .gexpandgroup guiWidgetsToolkitRGtk2
+## @export .gexpandgroup guiWidgetsToolkitRGtk2
 .gexpandgroup.guiWidgetsToolkitRGtk2 <- function(toolkit,
                                                  text, markup,  horizontal=TRUE,
                                                  handler=NULL, action=NULL,

R/gfile.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gfile guiWidgetsToolkitRGtk2
-##' @S3method .gfile guiWidgetsToolkitRGtk2
+## @export .gfile guiWidgetsToolkitRGtk2
 .gfile.guiWidgetsToolkitRGtk2 <- function(toolkit,
                                           text = "",
                                           type = c("open","save","selectdir"),
@@ -106,7 +106,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gfilebrowse guiWidgetsToolkitRGtk2
-##' @S3method .gfilebrowse guiWidgetsToolkitRGtk2
+## @export .gfilebrowse guiWidgetsToolkitRGtk2
 .gfilebrowse.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                                  text = "",
                                                  type = c("open","save","selectdir"),

R/gformlayout.R

@@ -8,7 +8,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gformlayout guiWidgetsToolkitRGtk2
-##' @S3method .gformlayout guiWidgetsToolkitRGtk2
+## @export .gformlayout guiWidgetsToolkitRGtk2
 .gformlayout.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                              align="left",
                                              spacing=5,

R/gframe.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gframe guiWidgetsToolkitRGtk2
-##' @S3method .gframe guiWidgetsToolkitRGtk2
+## @export .gframe guiWidgetsToolkitRGtk2
 .gframe.guiWidgetsToolkitRGtk2 <- function(toolkit, text, markup, pos, horizontal=TRUE, spacing=5,container=NULL, ...) {
   GFrame$new(toolkit, text, markup, pos, horizontal, spacing, container, ...)
 }

R/ggraphics.R

@@ -10,7 +10,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .ggraphics guiWidgetsToolkitRGtk2
-##' @S3method .ggraphics guiWidgetsToolkitRGtk2
+## @export .ggraphics guiWidgetsToolkitRGtk2
 .ggraphics.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                                width = dpi*6, height = dpi*6, dpi = 75, ps = 12,    
                                                handler = NULL,action = NULL, container = NULL, ... ) {

R/ggroup.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .ggroup guiWidgetsToolkitRGtk2
-##' @S3method .ggroup guiWidgetsToolkitRGtk2
+## @export .ggroup guiWidgetsToolkitRGtk2
 .ggroup.guiWidgetsToolkitRGtk2 <- function(toolkit, horizontal=TRUE, spacing=5, use.scrollwindow=FALSE, container=NULL, ...) {
   GGroup$new(toolkit, horizontal, spacing=spacing, use.scrollwindow=use.scrollwindow, container, ...)
 }

R/gimage.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gimage guiWidgetsToolkitRGtk2
-##' @S3method .gimage guiWidgetsToolkitRGtk2
+## @export .gimage guiWidgetsToolkitRGtk2
 .gimage.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                          filename = "", dirname = "", stock.id=NULL, size = "",
                                          handler = NULL,action = NULL, container = NULL, ... ) {

R/glabel.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .glabel guiWidgetsToolkitRGtk2
-##' @S3method .glabel guiWidgetsToolkitRGtk2
+## @export .glabel guiWidgetsToolkitRGtk2
 .glabel.guiWidgetsToolkitRGtk2 <- function(toolkit, text="", markup=FALSE, editable=FALSE,
                                            handler=NULL, action=NULL, container=NULL,
                                            ...) {

R/glayout.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .glayout guiWidgetsToolkitRGtk2
-##' @S3method .glayout guiWidgetsToolkitRGtk2
+## @export .glayout guiWidgetsToolkitRGtk2
 .glayout.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                              homogeneous = FALSE, spacing = 10,
                                              container = NULL, ... ) {

R/gmenu.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gmenu guiWidgetsToolkitRGtk2
-##' @S3method .gmenu guiWidgetsToolkitRGtk2
+## @export .gmenu guiWidgetsToolkitRGtk2
 .gmenu.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                            menu.list=list(),
                                            popup=FALSE,

R/gnotebook.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gnotebook guiWidgetsToolkitRGtk2
-##' @S3method .gnotebook guiWidgetsToolkitRGtk2
+## @export .gnotebook guiWidgetsToolkitRGtk2
 .gnotebook.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                                tab.pos = 3, 
                                                container = NULL, ... ) {

R/gpanedgroup.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gpanedgroup guiWidgetsToolkitRGtk2
-##' @S3method .gpanedgroup guiWidgetsToolkitRGtk2
+## @export .gpanedgroup guiWidgetsToolkitRGtk2
 .gpanedgroup.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                                 horizontal = TRUE, 
                                                 container = NULL, ... ) {

R/gprogressbar.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gprogressbar guiWidgetsToolkitRGtk2
-##' @S3method .gprogressbar guiWidgetsToolkitRGtk2
+## @export .gprogressbar guiWidgetsToolkitRGtk2
 .gprogressbar.guiWidgetsToolkitRGtk2 <- function(toolkit, value, container, ...) {
   GProgressBar$new(toolkit, value, container, ...)
 }

R/gradio.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gradio guiWidgetsToolkitRGtk2
-##' @S3method .gradio guiWidgetsToolkitRGtk2
+## @export .gradio guiWidgetsToolkitRGtk2
 .gradio.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                             items,selected=1, horizontal=FALSE, handler=NULL,
                                             action=NULL, container=NULL, ...

R/gseparator.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gseparator guiWidgetsToolkitRGtk2
-##' @S3method .gseparator guiWidgetsToolkitRGtk2
+## @export .gseparator guiWidgetsToolkitRGtk2
 .gseparator.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                          horizontal = TRUE,
                    container = NULL, ... ) {

R/gslider.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gslider guiWidgetsToolkitRGtk2
-##' @S3method .gslider guiWidgetsToolkitRGtk2
+## @export .gslider guiWidgetsToolkitRGtk2
 .gslider.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                              from = 0, to = 100, by = 1, value = from, horizontal = TRUE,
                                              handler = NULL, action = NULL, container = NULL, ... ) {

R/gspinbutton.R

@@ -7,7 +7,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gspinbutton guiWidgetsToolkitRGtk2
-##' @S3method .gspinbutton guiWidgetsToolkitRGtk2
+## @export .gspinbutton guiWidgetsToolkitRGtk2
 .gspinbutton.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                                  from = 0, to = 10, by = 1, value = from, digits = 0,
                                                  handler = NULL,action = NULL, container = NULL, ... ) {

R/gstackwidget.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gstackwidget guiWidgetsToolkitRGtk2
-##' @S3method .gstackwidget guiWidgetsToolkitRGtk2
+## @export .gstackwidget guiWidgetsToolkitRGtk2
 .gstackwidget.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                                   container = NULL, ... ) {
   GStackWidget$new(toolkit,

R/gstatusbar.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gstatusbar guiWidgetsToolkitRGtk2
-##' @S3method .gstatusbar guiWidgetsToolkitRGtk2
+## @export .gstatusbar guiWidgetsToolkitRGtk2
 .gstatusbar.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                                 text="",
                                                 container = NULL, ... ) {

R/gtable.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gtable guiWidgetsToolkitRGtk2
-##' @S3method .gtable guiWidgetsToolkitRGtk2
+## @export .gtable guiWidgetsToolkitRGtk2
 .gtable.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                          items,
                                          multiple = FALSE,

R/gtext.R

@@ -10,7 +10,7 @@ make_tag_table <- memoise(gtkTextTagTableNew)
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gtext guiWidgetsToolkitRGtk2
-##' @S3method .gtext guiWidgetsToolkitRGtk2
+## @export .gtext guiWidgetsToolkitRGtk2
 .gtext.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                     text = NULL, width = NULL, height = 300, font.attr = NULL,
                     wrap = TRUE,

R/gtimer.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gtimer guiWidgetsToolkitRGtk2
-##' @S3method .gtimer guiWidgetsToolkitRGtk2
+## @export .gtimer guiWidgetsToolkitRGtk2
 .gtimer.guiWidgetsToolkitRGtk2 <- function(toolkit, ms, FUN, data=NULL, one.shot=FALSE, start=TRUE)
   GTimer$new(toolkit, ms, FUN, data=data, one.shot=one.shot, start=start)
 

R/gtk-misc.R

@@ -6,15 +6,15 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method getWidget RGtkObject
-##' @S3method getWidget RGtkObject
+## @export getWidget RGtkObject
 getWidget.RGtkObject <- function(obj) obj
 
 ##' S3 method for stopping getBlock
 ##'
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method getBlock RGtkObject
-##' @S3method getBlock RGtkObject
+## @export getBlock RGtkObject
 getBlock.RGtkObject <- function(obj) obj
 
 

R/gtoolbar.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gtoolbar guiWidgetsToolkitRGtk2
-##' @S3method .gtoolbar guiWidgetsToolkitRGtk2
+## @export .gtoolbar guiWidgetsToolkitRGtk2
 .gtoolbar.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                               toolbar.list=list(),
                                               style = c("both","icons","text","both-horiz"),

R/gtree.R

@@ -9,7 +9,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gtree guiWidgetsToolkitRGtk2
-##' @S3method .gtree guiWidgetsToolkitRGtk2
+## @export .gtree guiWidgetsToolkitRGtk2
 .gtree.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                            offspring = NULL, offspring.data = NULL,
                                            chosen.col = 1, offspring.col=2, icon.col=NULL, tooltip.col=NULL,
@@ -134,7 +134,7 @@ GTreeBase <- setRefClass("GTreeBase",
                            walk_back_from_path(us_path)
                          })
                          if(!is.null(drop) && drop)
-                           out <- lapply(out, tail, n=1)
+                           out <- lapply(out, utils::tail, n=1)
                          if(length(out) == 1)
                            out <- out[[1]]
                          out

R/gvarbrowser.R

@@ -6,7 +6,7 @@ NULL
 ##' @export
 ##' @rdname gWidgets2RGtk2-undocumented
 ##' @method .gvarbrowser guiWidgetsToolkitRGtk2
-##' @S3method .gvarbrowser guiWidgetsToolkitRGtk2
+## @export .gvarbrowser guiWidgetsToolkitRGtk2
 .gvarbrowser.guiWidgetsToolkitRGtk2 <-  function(toolkit,
                                                  handler = NULL,action = "summary", container = NULL, ... ) {
   GVarBrowser$new(toolkit,