Attachment #490972 for bug #269110





lString16 GetConfigFileName()
{
    lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() );
    if ( !wxDirExists( cfgdir.c_str() ) )
        ::wxMkdir( wxString( cfgdir.c_str() ) );
    lChar16 slash = detectSlash( cfgdir );

    wxImage::AddHandler(new wxPNGHandler);
    resources = new ResourceContainer();

    lString16 appname( argv[0].wx_str() );
    int lastSlash=-1;
    lChar16 slashChar = '/';
    for ( int p=0; p<(int)appname.length(); p++ ) {

    int argc = wxGetApp().argc;
    lString16 fnameToOpen;
    for ( int i=1; i<argc; i++ ) {
        lString16 param = lString16( wxGetApp().argv[1].wx_str() );
        if ( param[0]!='-' )
            fnameToOpen = param;
    }

    lString16 outFile;
    bool convert = false;
    for ( int i=1; i<argc; i++ ) {
        lString16 param = lString16( wxGetApp().argv[i].wx_str() );
        if ( param[0]!='-' )
            fnameToOpen = param;
        else if (param.startsWith("--convert"))

        wxCursor hg( wxCURSOR_WAIT );
        this->SetCursor( hg );
        wxSetCursor( hg );
        _view->getDocView()->exportWolFile( dlg.GetPath().wx_str(), opts.getMode()==0, opts.getLevels() );
        wxSetCursor( wxNullCursor );
        this->SetCursor( wxNullCursor );
    }

Lines 41-47 Link Here

(-)old/cr3wx/src/optdlg.cpp (-2 / +2 lines)
41	if ( v==_choices[i] )	41	if ( v==_choices[i] )
42	tb = i;	42	tb = i;
43	if ( _storeStringValues ) {	43	if ( _storeStringValues ) {
44	props->setString( _option, lString16(_choices[tb]) );	44	props->setString( _option, lString16(_choices[tb].wx_str()) );
45	} else {	45	} else {
46	props->setInt( _option, tb );	46	props->setInt( _option, tb );
47	}	47	}
Lines 50-56 Link Here
50	{	50	{
51	unsigned tb = _defvalue;	51	unsigned tb = _defvalue;
52	if ( _storeStringValues ) {	52	if ( _storeStringValues ) {
53	lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue]) );	53	lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue].wx_str()) );
54	lString16 s16 = props->getStringDef( _option, s8.c_str() );	54	lString16 s16 = props->getStringDef( _option, s8.c_str() );
55	wxString v = s16.c_str();	55	wxString v = s16.c_str();
56	for ( unsigned i=0; i<_choices.GetCount(); i++ )	56	for ( unsigned i=0; i<_choices.GetCount(); i++ )





lString16 cr3view::GetHistoryFileName()
{
    lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() );
    if ( !wxDirExists( cfgdir.c_str() ) )
        ::wxMkdir( wxString( cfgdir.c_str() ) );
    lChar16 slash = detectSlash( cfgdir );

    //===========================================
    GetParent()->Update();
    //printf("   loading...  ");
    bool res = getDocView()->LoadDocument( fname.wx_str() );
    //printf("   done. \n");
	//DEBUG
	//_docview->exportWolFile( "test.wol", true );
	//_docview->SetPos(0);
    if ( !res )
        getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.wx_str() );
    lString16 title = getDocView()->getAuthors();
    if ( !title.empty() && !getDocView()->getTitle().empty() )
        title << L". ";

Return to bug 269110

Lines 395-401 Link Here

(-)old/cr3wx/src/cr3.cpp (-5 / +5 lines)
395		395
396	lString16 GetConfigFileName()	396	lString16 GetConfigFileName()
397	{	397	{
398	lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );	398	lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() );
399	if ( !wxDirExists( cfgdir.c_str() ) )	399	if ( !wxDirExists( cfgdir.c_str() ) )
400	::wxMkdir( wxString( cfgdir.c_str() ) );	400	::wxMkdir( wxString( cfgdir.c_str() ) );
401	lChar16 slash = detectSlash( cfgdir );	401	lChar16 slash = detectSlash( cfgdir );
Lines 622-628 Link Here
622	wxImage::AddHandler(new wxPNGHandler);	622	wxImage::AddHandler(new wxPNGHandler);
623	resources = new ResourceContainer();	623	resources = new ResourceContainer();
624		624
625	lString16 appname( argv[0] );	625	lString16 appname( argv[0].wx_str() );
626	int lastSlash=-1;	626	int lastSlash=-1;
627	lChar16 slashChar = '/';	627	lChar16 slashChar = '/';
628	for ( int p=0; p<(int)appname.length(); p++ ) {	628	for ( int p=0; p<(int)appname.length(); p++ ) {
Lines 777-783 Link Here
777	int argc = wxGetApp().argc;	777	int argc = wxGetApp().argc;
778	lString16 fnameToOpen;	778	lString16 fnameToOpen;
779	for ( int i=1; i<argc; i++ ) {	779	for ( int i=1; i<argc; i++ ) {
780	lString16 param = lString16( wxGetApp().argv[1] );	780	lString16 param = lString16( wxGetApp().argv[1].wx_str() );
781	if ( param[0]!='-' )	781	if ( param[0]!='-' )
782	fnameToOpen = param;	782	fnameToOpen = param;
783	}	783	}
Lines 1193-1199 Link Here
1193	lString16 outFile;	1193	lString16 outFile;
1194	bool convert = false;	1194	bool convert = false;
1195	for ( int i=1; i<argc; i++ ) {	1195	for ( int i=1; i<argc; i++ ) {
1196	lString16 param = lString16( wxGetApp().argv[i] );	1196	lString16 param = lString16( wxGetApp().argv[i].wx_str() );
1197	if ( param[0]!='-' )	1197	if ( param[0]!='-' )
1198	fnameToOpen = param;	1198	fnameToOpen = param;
1199	else if (param.startsWith("--convert"))	1199	else if (param.startsWith("--convert"))
Lines 1470-1476 Link Here
1470	wxCursor hg( wxCURSOR_WAIT );	1470	wxCursor hg( wxCURSOR_WAIT );
1471	this->SetCursor( hg );	1471	this->SetCursor( hg );
1472	wxSetCursor( hg );	1472	wxSetCursor( hg );
1473	_view->getDocView()->exportWolFile( dlg.GetPath(), opts.getMode()==0, opts.getLevels() );	1473	_view->getDocView()->exportWolFile( dlg.GetPath().wx_str(), opts.getMode()==0, opts.getLevels() );
1474	wxSetCursor( wxNullCursor );	1474	wxSetCursor( wxNullCursor );
1475	this->SetCursor( wxNullCursor );	1475	this->SetCursor( wxNullCursor );
1476	}	1476	}

Lines 353-359 Link Here

(-)old/cr3wx/src/view.cpp (-3 / +3 lines)
353		353
354	lString16 cr3view::GetHistoryFileName()	354	lString16 cr3view::GetHistoryFileName()
355	{	355	{
356	lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );	356	lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() );
357	if ( !wxDirExists( cfgdir.c_str() ) )	357	if ( !wxDirExists( cfgdir.c_str() ) )
358	::wxMkdir( wxString( cfgdir.c_str() ) );	358	::wxMkdir( wxString( cfgdir.c_str() ) );
359	lChar16 slash = detectSlash( cfgdir );	359	lChar16 slash = detectSlash( cfgdir );
Lines 667-679 Link Here
667	//===========================================	667	//===========================================
668	GetParent()->Update();	668	GetParent()->Update();
669	//printf(" loading... ");	669	//printf(" loading... ");
670	bool res = getDocView()->LoadDocument( fname.c_str() );	670	bool res = getDocView()->LoadDocument( fname.wx_str() );
671	//printf(" done. \n");	671	//printf(" done. \n");
672	//DEBUG	672	//DEBUG
673	//_docview->exportWolFile( "test.wol", true );	673	//_docview->exportWolFile( "test.wol", true );
674	//_docview->SetPos(0);	674	//_docview->SetPos(0);
675	if ( !res )	675	if ( !res )
676	getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.c_str() );	676	getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.wx_str() );
677	lString16 title = getDocView()->getAuthors();	677	lString16 title = getDocView()->getAuthors();
678	if ( !title.empty() && !getDocView()->getTitle().empty() )	678	if ( !title.empty() && !getDocView()->getTitle().empty() )
679	title << L". ";	679	title << L". ";