- Issue #54, Rolf Jansen's NSTextFieldCell inset fix

- Issue #53, Rolf Jansen's -[NSVew mouse:inRect:] implementation
- Issue #52, Rolf Jansen's NSTabView fix
- Issue #51, partial fix, prepareOpenGL only called once now

AppKit/NSTabView.m

@@ -392,7 +392,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
                // now do selected item
                i = [_items indexOfObject:_selectedItem];
                [style drawTabInRect:[self rectForItemBorderAtIndex:i] clipRect:rect color:[_selectedItem color] selected:YES];
-              {
+               [[_selectedItem view] setNeedsDisplay:YES];
+
                NSRect labelRect=[self rectForItemLabelAtIndex:i];
                labelRect.origin.y+=2;
 
@@ -401,7 +402,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
                if ([[self window] firstResponder] == self)
                   NSDottedFrameRect(NSInsetRect(labelRect,-1,0));
             }
-            }
             break;
         }
             

AppKit/NSTextFieldCell.m

@@ -95,6 +95,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
     rect=NSInsetRect(rect,3,3);
    else if([self isBordered])
     rect=NSInsetRect(rect,2,2);
+   else 
+    rect=NSInsetRect(rect,2,0); 
 
    return rect;
 }

AppKit/NSView.h

@@ -164,6 +164,7 @@ APPKIT_EXPORT NSString *NSViewFocusDidChangeNotification;
 
 -(void)scrollPoint:(NSPoint)point;
 -(BOOL)scrollRectToVisible:(NSRect)rect;
+-(BOOL)mouse:(NSPoint)point inRect:(NSRect)rect;
 
 -(void)allocateGState;
 -(void)releaseGState;

AppKit/NSView.m

@@ -877,6 +877,10 @@ static inline void buildTransformsIfNeeded(NSView *self) {
     return NO;
 }
 
+-(BOOL)mouse:(NSPoint)point inRect:(NSRect)rect {
+   return NSMouseInRect(point, rect, [self isFlipped]);
+}
+
 -(void)allocateGState {
    // unimplemented
 }
@@ -1061,10 +1065,11 @@ static inline void buildTransformsIfNeeded(NSView *self) {
    point.x+=delta.width;
    point.y+=delta.height;
 
-   [self lockFocus];
+   if([self lockFocusIfCanDraw]){
     NSCopyBits([self gState],rect,point);
     [self unlockFocus];
    }
+}
 
 -(void)print:sender {
    [[NSPrintOperation printOperationWithView:self] runOperation];

AppKit/OpenGL.subproj/NSOpenGLContext.m

@@ -84,7 +84,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
       
     if((_glContext=opengl_wglCreateContext([_drawable dc]))==NULL){
      NSLog(@"unable to create _glContext");
-     [self dealloc];
      return;
     }
    }

AppKit/OpenGL.subproj/NSOpenGLDrawable_gdiView.m

@@ -20,7 +20,6 @@
       [_view drawRect:[_view bounds]];
       [_view unlockFocus];
       EndPaint(_windowHandle,&paintStruct);
-      break;
      }
     }
     return 0;
@@ -135,7 +134,6 @@ static void pfdFromPixelFormat(PIXELFORMATDESCRIPTOR *pfd,NSOpenGLPixelFormat *p
    
    pfdFromPixelFormat(&pfd,pixelFormat);
 
-   _view=view;
    _windowHandle=CreateWindowEx(WS_EX_TOOLWINDOW,"NSWin32OpenGLWindow", "", WS_CLIPCHILDREN | WS_CLIPSIBLINGS| WS_POPUP|WS_CHILD,
       0, 0, 500, 500,
       NULL,NULL, GetModuleHandle (NULL),NULL);
@@ -148,9 +146,11 @@ static void pfdFromPixelFormat(PIXELFORMATDESCRIPTOR *pfd,NSOpenGLPixelFormat *p
    if(!SetPixelFormat(_dc,pfIndex,&pfd))
     NSLog(@"SetPixelFormat failed");
 
+   SetWindowPos(_windowHandle,HWND_TOP,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_SHOWWINDOW);
+   
+   _view=view;
    [self updateWithView:view];
 
-    SetWindowPos(_windowHandle,HWND_TOP,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_SHOWWINDOW);
    return self;
 }
 

AppKit/OpenGL.subproj/NSOpenGLView.h

@@ -13,6 +13,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 @interface NSOpenGLView : NSView {
    NSOpenGLPixelFormat *_pixelFormat;
    NSOpenGLContext     *_context;
+   BOOL                 _needsPrepare;
    BOOL                 _needsReshape;
 }
 

AppKit/OpenGL.subproj/NSOpenGLView.m

@@ -60,6 +60,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
    if(_context==nil){
     _context=[[NSOpenGLContext alloc] initWithFormat:_pixelFormat shareContext:nil];
     [_context setView:self];
+    _needsPrepare=YES;
    }
    
    return _context;
@@ -99,7 +100,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
    [super lockFocus];
    
    [[self openGLContext] makeCurrentContext];
+   if(_needsPrepare){
     [self prepareOpenGL];
+    _needsPrepare=NO;
+   }
    if(_needsReshape)
     [self reshape];
 }