diff options
| author | Manolo Gouy <Manolo> | 2016-04-18 12:48:40 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-04-18 12:48:40 +0000 |
| commit | cb95d4006797a595cbdafd4f9255f76120aaeb47 (patch) | |
| tree | 50199802bb99e3d9c8e994193e8d69736b965785 | |
| parent | 3df26257d09f87ab5e6224f813b5d15325ce219c (diff) | |
Remove Fl_X::setwindow(Fl_Window*) from WIN32 and USE_X11 Fl_X classes.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11649 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/win32.H | 1 | ||||
| -rw-r--r-- | FL/x.H | 1 | ||||
| -rw-r--r-- | src/Fl_win32.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_x.cxx | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/FL/win32.H b/FL/win32.H index 0a43a2c75..6a4ed57ec 100644 --- a/FL/win32.H +++ b/FL/win32.H @@ -65,7 +65,6 @@ public: static int fake_X_wm(const Fl_Window* w,int &X, int &Y, int &bt,int &bx,int &by); void make_fullscreen(int X, int Y, int W, int H); - void setwindow(Fl_Window* wi) {w=wi; wi->i=this;} void set_minmax(LPMINMAXINFO minmax); void mapraise(); int set_cursor(Fl_Cursor); @@ -120,7 +120,6 @@ public: char wait_for_expose; static Fl_X* first; static Fl_X* i(const Fl_Window* wi) {return wi->i;} - void setwindow(Fl_Window* wi) {w=wi; wi->i=this;} void sendxjunk(); int set_cursor(Fl_Cursor); int set_cursor(const Fl_RGB_Image*, int, int); diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index f9b48b78a..721f66e31 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1797,7 +1797,7 @@ Fl_X* Fl_X::make(Fl_Window* w) { Fl_X *x = new Fl_X; x->other_xid = 0; - x->setwindow(w); + x->w = w; w->i = x; x->region = 0; x->private_dc = 0; x->cursor = LoadCursor(NULL, IDC_ARROW); diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 508105658..41aeb2c87 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -2216,7 +2216,7 @@ Fl_X* Fl_X::set_xid(Fl_Window* win, Window winxid) { Fl_X *xp = new Fl_X; xp->xid = winxid; xp->other_xid = 0; - xp->setwindow(win); + xp->w = win; win->i = xp; xp->next = Fl_X::first; xp->region = 0; xp->wait_for_expose = 1; |