merge: fix loadfile rm dup create_objects, fix put_title

[goodguy/history.git] / cinelerra-5.1 / guicast / bcwindowbase.C

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 0c34217adfa474ea83cb4912001c0489e74260b4..c61691f2ffc9bf80c60c143cc3b6e5206a0c9a88 100644 (file)
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -4029,17 +4029,10 @@ void BC_WindowBase::set_background(VFrame *bitmap)
 
 void BC_WindowBase::put_title(const char *text)
 {
-       if( BC_Resources::locale_utf8 ) {
-               char *bp=this->title, *ep = bp+sizeof(this->title)-1;
-               for( const char *cp=text; *cp!=0 && bp<ep; ) {
-                       if( *cp < 0 ) { do { *bp++ = *cp++; } while( *cp < 0 );  continue; }
-                       if( *cp < ' ' ) { *bp++ = ' ';  ++cp;  continue; }
-                       *bp++ = *cp++;
-               }
-               *bp = 0;
-       }
-       else
-               strcpy(this->title, text);
+       char *cp = this->title, *ep = cp+sizeof(this->title)-1;
+       for( const unsigned char *bp = (const unsigned char *)text; *bp && cp<ep; ++bp )
+               *cp++ = *bp >= ' ' ? *bp : ' ';
+       *cp = 0;
 }
 
 void BC_WindowBase::set_title(const char *text)