diff options
| author | Greg Ercolano <erco@seriss.com> | 2013-04-10 20:13:12 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2013-04-10 20:13:12 +0000 |
| commit | 936f01be5c04ee2bfaa4fae1d5ebf77cb47c8625 (patch) | |
| tree | 2eabacd96e9a4b2a0733cce9d7efdcf852a6f0ea | |
| parent | 386b12b77061968a7064e1891aa506330620fb75 (diff) | |
While suggesting a new top_window() method for STR#2948,
it's realized that for consistency, the recently added window_offset() method
(a few days ago) should be renamed to top_window_offset().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9870 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Window.H | 2 | ||||
| -rw-r--r-- | src/Fl_Gl_Window.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_Window.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 8b2f8196a..bbd1f573f 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -120,7 +120,7 @@ protected: \see force_position(int) */ int force_position() const { return ((flags() & FORCE_POSITION)?1:0); } - Fl_Window* window_offset(int& xoff, int& yoff) const; + Fl_Window* top_window_offset(int& xoff, int& yoff) const; public: diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index 441dea78a..58384a508 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -184,7 +184,7 @@ void Fl_Gl_Window::make_current() { if (window()) { int xoff,yoff; - const Fl_Window *win = window_offset(xoff, yoff); // STR #2944 [2] + const Fl_Window *win = top_window_offset(xoff, yoff); // STR #2944 [2] xywh[0] = xoff; xywh[1] = win->h() - yoff - h(); } else { diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx index b6e5985bc..ffda05a1a 100644 --- a/src/Fl_Window.cxx +++ b/src/Fl_Window.cxx @@ -283,7 +283,7 @@ void Fl_Window::icon(const void * ic) { \param[out] xoff,yoff Returns the x/y offset \returns the top-level window */ -Fl_Window* Fl_Window::window_offset(int& xoff, int& yoff) const { +Fl_Window* Fl_Window::top_window_offset(int& xoff, int& yoff) const { xoff = yoff = 0; const Fl_Window *win = (const Fl_Window*)this; while (win && win->window()) { |