ATSU Support in font extended

[wxWidgets.git] / src / mac / carbon / stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 93998884fd35770a7015131c7fa47181a7d1ef13..f01e11f66652f8a4b79cbacfbb78325dfb8cd1d1 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -9,10 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "stattext.h"
 #endif
 
 #pragma implementation "stattext.h"
 #endif
 

+#include "wx/wxprec.h"
+

 #include "wx/app.h"
 #include "wx/stattext.h"
 #include "wx/notebook.h"
 #include "wx/app.h"
 #include "wx/stattext.h"
 #include "wx/notebook.h"


@@ -78,6 +80,9 @@ wxSize wxStaticText::DoGetBestSize() const
     }
     if ( m_label.Length() == 0 )
         bounds.h = 0 ;
     }
     if ( m_label.Length() == 0 )
         bounds.h = 0 ;

+        
+    bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize() ;    

     return wxSize(bounds.h, bounds.v);
 }
 
     return wxSize(bounds.h, bounds.v);
 }
 


@@ -95,7 +100,7 @@ void wxStaticText::SetLabel(const wxString& st )
         InvalidateBestSize();
         SetSize( GetBestSize() ) ;
     }
         InvalidateBestSize();
         SetSize( GetBestSize() ) ;
     }

-
+    Refresh() ;

     Update() ;
 }
 
     Update() ;
 }
 


@@ -106,10 +111,10 @@ bool wxStaticText::SetFont(const wxFont& font)
        if ( ret )
        {
            if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
        if ( ret )
        {
            if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )

-            {
-                InvalidateBestSize();
-               SetSize( GetBestSize() );
-            }
+        {
+            InvalidateBestSize();
+            SetSize( GetBestSize() );
+        }

        }
 
     return ret;
        }
 
     return ret;