Commit 0d7ba80e authored by IOhannes m zmölnig's avatar IOhannes m zmölnig

renamed gemmacwindow's GemCocoaView to GemMacOSView

to avoid nameclashes with [gemcocoawindow].
thanks fede on the mailinglist for pointing that out.
parent 9634f919
...@@ -99,14 +99,14 @@ static NSDate *distantFuture, *distantPast; ...@@ -99,14 +99,14 @@ static NSDate *distantFuture, *distantPast;
@end @end
#endif #endif
@interface GemCocoaView : NSOpenGLView @interface GemMacOSView : NSOpenGLView
{ {
@public gemmacoswindow*parent; @public gemmacoswindow*parent;
} }
@end @end
typedef GLint oglc_setvalue_t; typedef GLint oglc_setvalue_t;
@implementation GemCocoaView @implementation GemMacOSView
- (void) prepareOpenGL - (void) prepareOpenGL
{ {
#if 0 #if 0
...@@ -148,7 +148,7 @@ typedef GLint oglc_setvalue_t; ...@@ -148,7 +148,7 @@ typedef GLint oglc_setvalue_t;
@end @end
struct gemmacoswindow :: PIMPL { struct gemmacoswindow :: PIMPL {
GemCocoaView*view; GemMacOSView*view;
NSWindow*window; NSWindow*window;
// WindowResponder*delegate; // WindowResponder*delegate;
float titleBarHeight, menuBarHeight; float titleBarHeight, menuBarHeight;
...@@ -440,7 +440,7 @@ bool gemmacoswindow :: create(void) ...@@ -440,7 +440,7 @@ bool gemmacoswindow :: create(void)
} }
NSOpenGLPixelFormat *nsglFormat = [[[NSOpenGLPixelFormat alloc] initWithAttributes:attr] autorelease]; NSOpenGLPixelFormat *nsglFormat = [[[NSOpenGLPixelFormat alloc] initWithAttributes:attr] autorelease];
m_pimpl->view = [[GemCocoaView alloc] initWithFrame:[contentView bounds] pixelFormat:nsglFormat]; m_pimpl->view = [[GemMacOSView alloc] initWithFrame:[contentView bounds] pixelFormat:nsglFormat];
m_pimpl->view->parent=this; m_pimpl->view->parent=this;
m_pimpl->window=window; m_pimpl->window=window;
[contentView addSubview:m_pimpl->view]; [contentView addSubview:m_pimpl->view];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment