Fix clipping code on OSX...

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4386 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2005-06-01 03:49:43 +00:00
parent 9d12e01cc7
commit 04c67e441e
2 changed files with 2 additions and 16 deletions

View File

@ -2,9 +2,10 @@ CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #648, STR #692, STR #730, STR
#744, STR #745)
- Clipping fixes for OSX
- Removed attempt to find items via
Fl_Menu_::find_item() in linked submenus
- Fluid interactive window resizing fixe (STR #873, 791)
- Fluid interactive window resizing fixes (STR #873, 791)
- Fluid panel resize and alignment fixes (STR #891)
- Fl_Window::show(argc, argv) now sets the scheme before
showing the window; this should eliminate any

View File

@ -452,26 +452,11 @@ void fl_restore_clip() {
#ifdef WIN32
SelectClipRgn(fl_gc, r); //if r is NULL, clip is automatically cleared
#elif defined(__APPLE_QD__)
# if 1
if ( fl_window )
{
GrafPtr port = GetWindowPort( fl_window );
if ( port ) { // port will be NULL if we are using a GWorld (and fl_window_region is invalid)
RgnHandle portClip = NewRgn();
CopyRgn( fl_window_region, portClip ); // changed
if ( r )
SectRgn( portClip, r, portClip );
SetPortClipRegion( port, portClip );
DisposeRgn( portClip );
}
}
# else
if (r) SetClip(r);
else {
Rect rect; rect.left=0; rect.top=0; rect.right=0x7fff; rect.bottom=0x7fff;
ClipRect(&rect);
}
# endif
#elif defined(__APPLE_QUARTZ__)
if ( fl_window )
{