diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-11-12 00:19:14 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-11-12 00:19:14 +0000 |
| commit | d1f909be8a18885ef4a1a96836bf986a37fdc694 (patch) | |
| tree | c12d1216ab836d9a1e6edc2d76ab1f54458a0762 /src | |
| parent | b59a07f47256ba77db26304392b53a1ad330bba7 (diff) | |
fl_arc() and fl_pie() fixes for WIN32 removed - the problem is with
the SGI X server with small arcs & pies, and not with WIN32.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@858 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_win32.cxx | 6 | ||||
| -rw-r--r-- | src/fl_arci.cxx | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index c8dc8f555..3f6476cae 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_win32.cxx,v 1.33.2.15 1999/10/14 04:56:08 bill Exp $" +// "$Id: Fl_win32.cxx,v 1.33.2.16 1999/11/12 00:19:12 mike Exp $" // // WIN32-specific code for the Fast Light Tool Kit (FLTK). // @@ -438,9 +438,11 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar case WM_RBUTTONUP: mouse_event(window, 2, 3, wParam, lParam); return 0; case WM_MOUSEMOVE: mouse_event(window, 3, 0, wParam, lParam); return 0; +#ifdef WM_MOUSELEAVE case WM_MOUSELEAVE: Fl::handle(FL_LEAVE, window); break; +#endif /* WM_MOUSELEAVE */ case WM_SETFOCUS: Fl::handle(FL_FOCUS, window); @@ -897,5 +899,5 @@ void Fl_Window::make_current() { } // -// End of "$Id: Fl_win32.cxx,v 1.33.2.15 1999/10/14 04:56:08 bill Exp $". +// End of "$Id: Fl_win32.cxx,v 1.33.2.16 1999/11/12 00:19:12 mike Exp $". // diff --git a/src/fl_arci.cxx b/src/fl_arci.cxx index 6db1693c5..26ec7aacc 100644 --- a/src/fl_arci.cxx +++ b/src/fl_arci.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_arci.cxx,v 1.4.2.1 1999/11/09 16:40:05 mike Exp $" +// "$Id: fl_arci.cxx,v 1.4.2.2 1999/11/12 00:19:14 mike Exp $" // // Arc (integer) drawing functions for the Fast Light Tool Kit (FLTK). // @@ -46,7 +46,7 @@ void fl_arc(int x,int y,int w,int h,double a1,double a2) { int ya = y+h/2-int(h*sin(a1/180.0*M_PI)); int xb = x+w/2+int(w*cos(a2/180.0*M_PI)); int yb = y+h/2-int(h*sin(a2/180.0*M_PI)); - Arc(fl_gc, x, y, x+w+1, y+h+1, xa, ya, xb, yb); + Arc(fl_gc, x, y, x+w, y+h, xa, ya, xb, yb); #else XDrawArc(fl_display, fl_window, fl_gc, x,y,w-1,h-1, int(a1*64),int((a2-a1)*64)); #endif @@ -61,12 +61,12 @@ void fl_pie(int x,int y,int w,int h,double a1,double a2) { int xb = x+w/2+int(w*cos(a2/180.0*M_PI)); int yb = y+h/2-int(h*sin(a2/180.0*M_PI)); SelectObject(fl_gc, fl_brush()); - Pie(fl_gc, x, y, x+w+1, y+h+1, xa, ya, xb, yb); + Pie(fl_gc, x, y, x+w, y+h, xa, ya, xb, yb); #else XFillArc(fl_display, fl_window, fl_gc, x,y,w,h, int(a1*64),int((a2-a1)*64)); #endif } // -// End of "$Id: fl_arci.cxx,v 1.4.2.1 1999/11/09 16:40:05 mike Exp $". +// End of "$Id: fl_arci.cxx,v 1.4.2.2 1999/11/12 00:19:14 mike Exp $". // |