fixing focus, fixes #9985

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

diff --git a/src/osx/cocoa/stattext.mm b/src/osx/cocoa/stattext.mm
index f35aebba813be85b83d37de2aef2b9fe50df97f9..a30082c99010e6cb8422b77da00cc188b652cff6 100644 (file)
--- a/src/osx/cocoa/stattext.mm
+++ b/src/osx/cocoa/stattext.mm
@@ -92,43 +92,6 @@ wxSize wxStaticText::DoGetBestSize() const
           to allow correct dynamic ellipsizing of the label
 */
 
           to allow correct dynamic ellipsizing of the label
 */
 

-@interface wxNSTextField : NSTextField
-{
-    wxWidgetImpl* m_impl;
-}
-
-- (void)setImplementation: (wxWidgetImpl *) theImplementation;
-- (wxWidgetImpl*) implementation;
-- (BOOL) isFlipped;
-
-@end
-
-@implementation wxNSTextField
-
-- (void)setImplementation: (wxWidgetImpl *) theImplementation
-{
-    m_impl = theImplementation;
-}
-
-- (wxWidgetImpl*) implementation
-{
-    return m_impl;
-}
-
-- (BOOL) isFlipped
-{
-    return YES;
-}
-
-// use our common calls
-- (void) setTitle:(NSString *) title
-{
-    [self setStringValue: title];
-}
-
-@end
-
-

 wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
                                     wxWindowID id, 
 wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
                                     wxWindowID id, 


@@ -140,8 +103,7 @@ wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer,
 {
     NSView* sv = (wxpeer->GetParent()->GetHandle() );
     
 {
     NSView* sv = (wxpeer->GetParent()->GetHandle() );
     

-    NSRect r = wxToNSRect( sv, wxRect( pos, size) );
-    // Rect bounds = wxMacGetBoundsForControl( wxpeer, pos , size ) ;
+    NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;

     wxNSTextField* v = [[wxNSTextField alloc] initWithFrame:r];
     [sv addSubview:v];
 
     wxNSTextField* v = [[wxNSTextField alloc] initWithFrame:r];
     [sv addSubview:v];