summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2010-12-02 22:59:30 +0000
committerManolo Gouy <Manolo>2010-12-02 22:59:30 +0000
commitc95c08e6274b36d957d61eac52855ecd6d825303 (patch)
treebd3aea5f084241b5236e0d91be275b165dd7eff3
parentc5ef8d13d1cb13313a161b0010bae864563d78b0 (diff)
Fix STR 2281: documentation changes only to clarify names and functions of the 2 clipboards
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7942 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--FL/Fl.H20
-rw-r--r--src/fl_dnd_mac.cxx5
-rw-r--r--src/fl_dnd_win32.cxx7
3 files changed, 12 insertions, 20 deletions
diff --git a/FL/Fl.H b/FL/Fl.H
index 61ac0f280..e62bdbc02 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -682,24 +682,28 @@ public:
@{ */
// cut/paste:
/**
- Copies the data pointed to by \p stuff to the selection (0) or
- primary (1) clipboard. The selection clipboard is used for
- middle-mouse pastes and for drag-and-drop selections. The primary
- clipboard is used for traditional copy/cut/paste operations.
+ Copies the data pointed to by \p stuff to the selection clipboard (0) or
+ the copy clipboard (1). The selection clipboard is used for
+ middle-mouse pastes and for drag-and-drop selections. The
+ copy clipboard is used for traditional copy/cut/paste operations.
*/
static void copy(const char* stuff, int len, int clipboard = 0); // platform dependent
/**
- Pastes the data from the selection (0) or primary (1) clipboard into receiver.
+ Pastes the data from the selection clipboard (0) or the copy clipboard (1)
+ into receiver.
The selection clipboard is used for middle-mouse pastes and for
- drag-and-drop selections. The primary clipboard is used for
- traditional copy/cut/paste operations.
+ drag-and-drop selections. The copy clipboard is used for traditional
+ copy/cut/paste operations.
*/
static void paste(Fl_Widget &receiver, int clipboard /*=0*/); // platform dependent
/**
- Initiate a Drag And Drop operation. The clipboard should be
+ Initiate a Drag And Drop operation. The selection clipboard (0) should be
filled with relevant data before calling this method. FLTK will
then initiate the system wide drag and drop handling. Dropped data
will be marked as <i>text</i>.
+
+ Create a selection first using:
+ Fl::copy(const char *stuff, int len, 0)
*/
static int dnd(); // platform dependent
diff --git a/src/fl_dnd_mac.cxx b/src/fl_dnd_mac.cxx
index f233bb99b..bf6976190 100644
--- a/src/fl_dnd_mac.cxx
+++ b/src/fl_dnd_mac.cxx
@@ -32,11 +32,6 @@
extern int MACpreparedrag(void);
-/**
- * drag and drop whatever is in the cut-copy-paste buffer
- * - create a selection first using:
- * Fl::copy(const char *stuff, int len, 0)
- */
int Fl::dnd()
{
return MACpreparedrag();
diff --git a/src/fl_dnd_win32.cxx b/src/fl_dnd_win32.cxx
index 6476de39e..7915d3881 100644
--- a/src/fl_dnd_win32.cxx
+++ b/src/fl_dnd_win32.cxx
@@ -483,13 +483,6 @@ public:
};
-/**
- Drag and drop whatever is in the cut-copy-paste buffer.
-
- Create a selection first using:
-
- Fl::copy(const char *stuff, int len, 0)
-*/
int Fl::dnd()
{
DWORD dropEffect;