fix wxGTK1 compilation after wxTextEntry DoGetValue() change

[wxWidgets.git] / src / osx / cocoa / glcanvas.mm

diff --git a/src/osx/cocoa/glcanvas.mm b/src/osx/cocoa/glcanvas.mm
index e088ede061fa7e95f27632a927dfcf52364b93d6..83c99ce833f7778d1ac7b66bd9fbf8287ce8c455 100644 (file)
--- a/src/osx/cocoa/glcanvas.mm
+++ b/src/osx/cocoa/glcanvas.mm
@@ -229,27 +229,23 @@ bool wxGLContext::SetCurrent(const wxGLCanvas& win) const
 
 @interface wxNSCustomOpenGLView : NSView
 {
 
 @interface wxNSCustomOpenGLView : NSView
 {

-    WXCOCOAIMPL_COMMON_MEMBERS

     NSOpenGLContext* context;
 }
 
     NSOpenGLContext* context;
 }
 

-- (id)initWithFrame:(NSRect)frame;
-
-WXCOCOAIMPL_COMMON_INTERFACE
-

 @end
 
 @implementation wxNSCustomOpenGLView
 
 @end
 
 @implementation wxNSCustomOpenGLView
 

-- (id)initWithFrame:(NSRect)frame
++ (void)initialize

 {
 {

-    [super initWithFrame:frame];
-    impl = NULL;
-    return self;
+    static BOOL initialized = NO;
+    if (!initialized) 
+    {
+        initialized = YES;
+        wxOSXCocoaClassAddWXMethods( self );
+    }

 }
 
 }
 

-WXCOCOAIMPL_COMMON_IMPLEMENTATION
-

 - (BOOL)isOpaque
 {
     return YES;
 - (BOOL)isOpaque
 {
     return YES;


@@ -279,7 +275,6 @@ bool wxGLCanvas::Create(wxWindow *parent,
     NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
     wxNSCustomOpenGLView* v = [[wxNSCustomOpenGLView alloc] initWithFrame:r];
     m_peer = new wxWidgetCocoaImpl( this, v );
     NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
     wxNSCustomOpenGLView* v = [[wxNSCustomOpenGLView alloc] initWithFrame:r];
     m_peer = new wxWidgetCocoaImpl( this, v );

-    [v setImplementation:m_peer];

 
     MacPostControlCreate(pos, size) ;
 */
 
     MacPostControlCreate(pos, size) ;
 */