fix for always terminating intermediate UniChar String for 4 bytes wchar_t

[wxWidgets.git] / src / mac / statlmac.cpp

diff --git a/src/mac/statlmac.cpp b/src/mac/statlmac.cpp
index 93644da485219b8deb39dc68db1c826827ded359..a7a116ba571cc17d391ba59d5f5edf3b2f0bb31e 100644 (file)
--- a/src/mac/statlmac.cpp
+++ b/src/mac/statlmac.cpp
@@ -30,7 +30,7 @@
 #include "wx/statline.h"
 #include "wx/statbox.h"
 
 #include "wx/statline.h"
 #include "wx/statbox.h"
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -49,15 +49,19 @@ bool wxStaticLine::Create( wxWindow *parent,
                            long style,
                            const wxString &name)
 {
                            long style,
                            const wxString &name)
 {

-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
-               kControlSeparatorLineProc , (long) this ) ;
-       
-       MacPostControlCreate() ;
+    if ( !wxStaticLineBase::Create(parent, id, pos, size,
+                                   style, wxDefaultValidator, name) )
+        return false;
+
+    Rect bounds ;
+    Str255 title ;
+    
+    MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
+
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
+          kControlSeparatorLineProc , (long) this ) ;
+    
+    MacPostControlCreate() ;

 
     return TRUE;
 }
 
     return TRUE;
 }