X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8208e181cb576ec6cda37624923f95a59af43072..814af667d9f1e31d9f54759b4e406209b1a3250f:/src/mac/carbon/stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index b249fc0e11..16e9aca2fb 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.cpp
 // Purpose:     wxStaticText
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -15,16 +15,20 @@
 
 #include "wx/app.h"
 #include "wx/stattext.h"
+#include "wx/notebook.h"
+#include "wx/tabctrl.h"
+#include "wx/dc.h"
+#include "wx/dcclient.h"
+#include "wx/utils.h"
+#include "wx/settings.h"
 
 #include <stdio.h>
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
+#endif
 
-#include <wx/mac/uma.h>
-
-BEGIN_EVENT_TABLE(wxStaticText, wxControl)
-    EVT_PAINT(wxStaticText::OnPaint)
-END_EVENT_TABLE()
+#include "wx/mac/uma.h"
 
 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
@@ -33,87 +37,83 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-    SetName(name);
-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
+    m_macIsUserPane = FALSE ;
+    
+    m_label = wxStripMenuCodes(label) ;
 
-    if ( id == -1 )
-  	    m_windowId = (int)NewControlId();
-    else
-	    m_windowId = id;
+    if ( !wxControl::Create( parent, id, pos, size, style,
+                             wxDefaultValidator , name ) )
+    {
+        return false;
+    }
 
-    m_windowStyle = style;
-    m_label = label ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
+    m_peer = new wxMacControl() ;
+    verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , 
+        NULL , m_peer->GetControlRefAddr() ) ) ;  
 
-	bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
-	SetSizeOrDefault( size ) ;
-    
-    return ret;
-}
+    MacPostControlCreate(pos,size) ;
 
-void wxStaticText::OnPaint( wxPaintEvent &event ) 
-{
-    wxPaintDC dc(this);
-    PrepareDC(dc);
-    dc.Clear() ;
-    dc.DrawText( m_label , 0 , 0 ) ;
+    return true;
 }
 
 wxSize wxStaticText::DoGetBestSize() const
 {
-	int x , y  ;
-	GetTextExtent( m_label , &x , &y ) ;
-	return wxSize( x , y ) ;
+    ControlFontStyleRec controlFont ;
+    verify_noerr( m_peer->GetData<ControlFontStyleRec>(kControlEntireControl , kControlFontStyleTag , &controlFont ) ) ;
+    
+    Point bounds ;
+    SInt16 baseline ;
+    wxMacCFStringHolder str(m_label ,  m_font.GetEncoding() ) ;
+    if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
+        verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , m_font.MacGetThemeFontID() , kThemeStateActive , false , &bounds , &baseline ) ) ;
+    else
+    {
+        wxMacWindowStateSaver sv( this ) ;
+        ::TextFont( m_font.MacGetFontNum() ) ;
+        ::TextSize( (short)( m_font.MacGetFontSize()) ) ;
+        ::TextFace( m_font.MacGetFontStyle() ) ;        
+        verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , kThemeCurrentPortFont , kThemeStateActive , false , &bounds , &baseline ) ) ;
+    }
+    if ( m_label.Length() == 0 )
+        bounds.h = 0 ;
+        
+    bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize() ;    
+    return wxSize(bounds.h, bounds.v);
 }
 
-void wxStaticText::SetLabel(const wxString& st , bool resize )
+void wxStaticText::SetLabel(const wxString& st )
 {
-	SetTitle( st ) ;
-	m_label = st ;
-	if ( resize )
-		SetSizeOrDefault() ;
-	else
-		Refresh() ;
-}
-/*
-void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    wxControl::SetSize( x , y , width , height , sizeFlags ) ;
-}
 
-bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
-{
-	Rect bounds ;
-	Str255 title ;
-	
-	MacPreControlCreate( parent , id ,  label , pos , size ,style, *((wxValidator*)NULL) , name , &bounds , title ) ;
-
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
-	  	kControlStaticTextProc , (long) this ) ;
-	::UMASetControlData( m_macControl, kControlLabelPart, kControlStaticTextTextTag , (long) title[0] , (char*) &title[1] ) ;
-	
-	MacPostControlCreate() ;
-
-  return TRUE;
+    m_label = wxStripMenuCodes(st) ;
+    
+    wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
+    CFStringRef ref = str ;
+    verify_noerr( m_peer->SetData<CFStringRef>(kControlEntireControl , kControlStaticTextCFStringTag, ref ) ) ;
+
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+    {
+        InvalidateBestSize();
+        SetSize( GetBestSize() ) ;
+    }
+    Refresh() ;
+    Update() ;
 }
 
-void wxStaticText::SetLabel(const wxString& st , bool resize )
+bool wxStaticText::SetFont(const wxFont& font)
 {
-	SetTitle( st ) ;
-	wxString label ;
-	
-	if( wxApp::s_macDefaultEncodingIsPC )
-		label = wxMacMakeMacStringFromPC( st ) ;
-	else
-		label = st ;
-		
-	::UMASetControlData( m_macControl, kControlLabelPart, kControlStaticTextTextTag , (long) label.Length() , (char*)(const char*) label ) ;
-	Refresh() ;
-}
-*/
+    bool ret = wxControl::SetFont(font);
 
+	if ( ret )
+	{
+	    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+        {
+            InvalidateBestSize();
+            SetSize( GetBestSize() );
+        }
+	}
+
+    return ret;
+}