diff options
| author | Manolo Gouy <Manolo> | 2010-12-13 12:21:12 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-12-13 12:21:12 +0000 |
| commit | 02f327dbec37648afe548275158e6754a91c5b3f (patch) | |
| tree | 1c22b726685bf40b2b914062cdaf2c852a0157ef /src | |
| parent | 0c21b331b0ad275e25af3ed623c36ddeff484748 (diff) | |
Mac OS X: removed unused global variable fl_selection_requestor
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8023 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl.cxx | 4 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index 300b17b5b..090cac7a1 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -927,7 +927,7 @@ void fl_fix_focus() { } } -#ifndef WIN32 +#if !(defined(WIN32) || defined(__APPLE__)) extern Fl_Widget *fl_selection_requestor; // from Fl_x.cxx #endif @@ -945,7 +945,7 @@ void fl_throw_focus(Fl_Widget *o) { #endif // DEBUG if (o->contains(Fl::pushed())) Fl::pushed_ = 0; -#ifndef WIN32 +#if !(defined(WIN32) || defined(__APPLE__)) if (o->contains(fl_selection_requestor)) fl_selection_requestor = 0; #endif if (o->contains(Fl::belowmouse())) Fl::belowmouse_ = 0; diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 7a3b7dcc6..49deb785f 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2324,7 +2324,6 @@ const CFStringEncoding encodings[] = { const size_t handledFlavorsCount = sizeof(encodings)/sizeof(CFStringEncoding); // clipboard variables definitions : -Fl_Widget *fl_selection_requestor = 0; char *fl_selection_buffer[2]; int fl_selection_length[2]; static int fl_selection_buffer_length[2]; |