Use the app name, not display name, as debug report name,

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

diff --git a/src/osx/cocoa/stattext.mm b/src/osx/cocoa/stattext.mm
index a30082c99010e6cb8422b77da00cc188b652cff6..da93c8ac63e3d7b8576c3d83588748befdb08a10 100644 (file)
--- a/src/osx/cocoa/stattext.mm
+++ b/src/osx/cocoa/stattext.mm
@@ -23,117 +23,103 @@
     #include "wx/settings.h"
 #endif // WX_PRECOMP
 
     #include "wx/settings.h"
 #endif // WX_PRECOMP
 

-#include "wx/notebook.h"
-#include "wx/tabctrl.h"
-

 #include "wx/osx/private.h"
 
 #include <stdio.h>
 
 #include "wx/osx/private.h"
 
 #include <stdio.h>
 

-wxSize wxStaticText::DoGetBestSize() const
+@interface wxNSStaticTextView : NSTextField

 {
 {

-    Point bounds;
-#if wxOSX_USE_CARBON
-    Rect bestsize = { 0 , 0 , 0 , 0 } ;
-
-    // try the built-in best size if available
-    Boolean former = m_peer->GetData<Boolean>( kControlStaticTextIsMultilineTag);
-    m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 );
-    m_peer->GetBestRect( &bestsize ) ;
-    m_peer->SetData( kControlStaticTextIsMultilineTag, former );
-    if ( !EmptyRect( &bestsize ) )
-    {
-        bounds.h = bestsize.right - bestsize.left ;
-        bounds.v = bestsize.bottom - bestsize.top ;
+    wxWidgetCocoaImpl* impl;
+}
+@end
+
+@implementation wxNSStaticTextView
+
++ (void)initialize
+{
+    static BOOL initialized = NO;
+    if (!initialized) 
+    {    
+        initialized = YES;
+        wxOSXCocoaClassAddWXMethods( self );

     }
     }

-    else
-#endif
+}
+
+@end
+
+class wxStaticTextCocoaImpl : public wxWidgetCocoaImpl
+{
+public:
+    wxStaticTextCocoaImpl( wxWindowMac* peer , WXWidget w , NSLineBreakMode lineBreak) : wxWidgetCocoaImpl(peer, w)

     {
     {

-#if wxOSX_USE_CARBON
-        ControlFontStyleRec controlFont;
-        OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
-        verify_noerr( err );
-
-        wxCFStringRef str( m_label,  GetFont().GetEncoding() );
-
-#if wxOSX_USE_ATSU_TEXT
-        SInt16 baseline;
-        if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
-        {
-            err = GetThemeTextDimensions(
-                (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),
-                m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
-            verify_noerr( err );
-        }
-        else
-#endif
-#endif
-        {
-            wxClientDC dc(const_cast<wxStaticText*>(this));
-            wxCoord width, height ;
-            dc.GetTextExtent( m_label , &width, &height);
-            bounds.h = width;
-            bounds.v = height;
-        }
-
-        if ( m_label.empty() )
-            bounds.h = 0;
+        m_lineBreak = lineBreak;
+    }
+    
+    virtual void SetLabel(const wxString& title, wxFontEncoding encoding) 
+    { 
+        wxNSStaticTextView* v = (wxNSStaticTextView*)GetWXWidget();
+        wxWindow* wxpeer = GetWXPeer();
+        NSCell* cell = [v cell];
+        wxCFStringRef text( title , encoding );
+
+        NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+        [paragraphStyle setLineBreakMode:m_lineBreak];
+        int style = wxpeer->GetWindowStyleFlag();
+        if (style & wxALIGN_CENTER)
+            [paragraphStyle setAlignment: NSCenterTextAlignment];
+        else if (style & wxALIGN_RIGHT)
+            [paragraphStyle setAlignment: NSRightTextAlignment];
+    
+        NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:paragraphStyle, NSParagraphStyleAttributeName, nil];
+        NSAttributedString *attrstring = [[NSAttributedString alloc] initWithString:text.AsNSString() attributes:dict];
+        [cell setAttributedStringValue:attrstring];
+        [attrstring release];
+        [paragraphStyle release];

     }
     }

-    bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize();
-    bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize();
+private :
+    NSLineBreakMode m_lineBreak;
+};

 
 

-    return wxSize( bounds.h, bounds.v );
+wxSize wxStaticText::DoGetBestSize() const
+{
+    return wxWindowMac::DoGetBestSize() ;

 }
 
 }
 

-// for wxST_ELLIPSIZE_* support:
-
-/*
-   FIXME: UpdateLabel() should be called on size events when wxST_ELLIPSIZE_START is set
-          to allow correct dynamic ellipsizing of the label
-*/
-
-wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxString& label,
-                                    const wxPoint& pos, 
+wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),
+                                    const wxString& WXUNUSED(label),
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
-                                    long extraStyle) 
+                                    long style,
+                                    long WXUNUSED(extraStyle))

 {
 {

-    NSView* sv = (wxpeer->GetParent()->GetHandle() );
-    

     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;

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

 
 

-    [v setBezeled:NO];

     [v setEditable:NO];
     [v setDrawsBackground:NO];
     [v setEditable:NO];
     [v setDrawsBackground:NO];

+    [v setSelectable: NO];
+    [v setBezeled:NO];
+    [v setBordered:NO];

     
     

-    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
-    [v setImplementation:c];
-    return c;
-/*
-    Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
-
-    wxMacControl* peer = new wxMacControl( wxpeer );
-    OSStatus err = CreateStaticTextControl(
-        MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
-        &bounds, NULL, NULL, peer->GetControlRefAddr() );
-    verify_noerr( err );
-
-    if ( ( style & wxST_ELLIPSIZE_END ) || ( style & wxST_ELLIPSIZE_MIDDLE ) )
+    NSLineBreakMode linebreak = NSLineBreakByWordWrapping;
+    if ( ((wxStaticText*)wxpeer)->IsEllipsized() )

     {
     {

-        TruncCode tCode = truncEnd;

         if ( style & wxST_ELLIPSIZE_MIDDLE )
         if ( style & wxST_ELLIPSIZE_MIDDLE )

-            tCode = truncMiddle;
-
-        err = peer->SetData( kControlStaticTextTruncTag, tCode );
-        err = peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 );
+            linebreak = NSLineBreakByTruncatingMiddle;
+        else if (style & wxST_ELLIPSIZE_END )
+            linebreak = NSLineBreakByTruncatingTail;
+        else if (style & wxST_ELLIPSIZE_START )
+            linebreak = NSLineBreakByTruncatingHead;

     }
     }

-    return peer;
-    */
+    else 
+    {
+        [[v cell] setWraps:YES];
+    }
+            
+    wxWidgetCocoaImpl* c = new wxStaticTextCocoaImpl( wxpeer, v, linebreak );
+    return c;

 }
 
 #endif //if wxUSE_STATTEXT
 }
 
 #endif //if wxUSE_STATTEXT