Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 490972 Details for
Bug 269110
app-text/coolreader3: reader of fictionbook texts
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
cr3.1.2.71_wxGTK3.diff
cr3.1.2.71_wxGTK3.diff (text/plain), 4.21 KB, created by
Sergey Torokhov
on 2017-08-28 12:18:56 UTC
(
hide
)
Description:
cr3.1.2.71_wxGTK3.diff
Filename:
MIME Type:
Creator:
Sergey Torokhov
Created:
2017-08-28 12:18:56 UTC
Size:
4.21 KB
patch
obsolete
># Patch to build CoolReader3 with active wxGTK-3.0 profile ># (eselect wxwidgets is set to "gtk2-unicode-3.0" instead of "gtk2-inicode-release-2.8") >diff -Naur old/cr3wx/src/cr3.cpp new/cr3wx/src/cr3.cpp >--- old/cr3wx/src/cr3.cpp 2015-07-13 11:23:37.000000000 +0300 >+++ new/cr3wx/src/cr3.cpp 2017-08-28 12:54:13.000000000 +0300 >@@ -395,7 +395,7 @@ > > lString16 GetConfigFileName() > { >- lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() ); >+ lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() ); > if ( !wxDirExists( cfgdir.c_str() ) ) > ::wxMkdir( wxString( cfgdir.c_str() ) ); > lChar16 slash = detectSlash( cfgdir ); >@@ -622,7 +622,7 @@ > wxImage::AddHandler(new wxPNGHandler); > resources = new ResourceContainer(); > >- lString16 appname( argv[0] ); >+ lString16 appname( argv[0].wx_str() ); > int lastSlash=-1; > lChar16 slashChar = '/'; > for ( int p=0; p<(int)appname.length(); p++ ) { >@@ -777,7 +777,7 @@ > int argc = wxGetApp().argc; > lString16 fnameToOpen; > for ( int i=1; i<argc; i++ ) { >- lString16 param = lString16( wxGetApp().argv[1] ); >+ lString16 param = lString16( wxGetApp().argv[1].wx_str() ); > if ( param[0]!='-' ) > fnameToOpen = param; > } >@@ -1193,7 +1193,7 @@ > lString16 outFile; > bool convert = false; > for ( int i=1; i<argc; i++ ) { >- lString16 param = lString16( wxGetApp().argv[i] ); >+ lString16 param = lString16( wxGetApp().argv[i].wx_str() ); > if ( param[0]!='-' ) > fnameToOpen = param; > else if (param.startsWith("--convert")) >@@ -1470,7 +1470,7 @@ > wxCursor hg( wxCURSOR_WAIT ); > this->SetCursor( hg ); > wxSetCursor( hg ); >- _view->getDocView()->exportWolFile( dlg.GetPath(), opts.getMode()==0, opts.getLevels() ); >+ _view->getDocView()->exportWolFile( dlg.GetPath().wx_str(), opts.getMode()==0, opts.getLevels() ); > wxSetCursor( wxNullCursor ); > this->SetCursor( wxNullCursor ); > } >diff -Naur old/cr3wx/src/optdlg.cpp new/cr3wx/src/optdlg.cpp >--- old/cr3wx/src/optdlg.cpp 2015-07-13 11:23:37.000000000 +0300 >+++ new/cr3wx/src/optdlg.cpp 2017-08-28 11:38:06.000000000 +0300 >@@ -41,7 +41,7 @@ > if ( v==_choices[i] ) > tb = i; > if ( _storeStringValues ) { >- props->setString( _option, lString16(_choices[tb]) ); >+ props->setString( _option, lString16(_choices[tb].wx_str()) ); > } else { > props->setInt( _option, tb ); > } >@@ -50,7 +50,7 @@ > { > unsigned tb = _defvalue; > if ( _storeStringValues ) { >- lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue]) ); >+ lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue].wx_str()) ); > lString16 s16 = props->getStringDef( _option, s8.c_str() ); > wxString v = s16.c_str(); > for ( unsigned i=0; i<_choices.GetCount(); i++ ) >diff -Naur old/cr3wx/src/view.cpp new/cr3wx/src/view.cpp >--- old/cr3wx/src/view.cpp 2015-07-13 11:23:37.000000000 +0300 >+++ new/cr3wx/src/view.cpp 2017-08-28 12:57:55.000000000 +0300 >@@ -353,7 +353,7 @@ > > lString16 cr3view::GetHistoryFileName() > { >- lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() ); >+ lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() ); > if ( !wxDirExists( cfgdir.c_str() ) ) > ::wxMkdir( wxString( cfgdir.c_str() ) ); > lChar16 slash = detectSlash( cfgdir ); >@@ -667,13 +667,13 @@ > //=========================================== > GetParent()->Update(); > //printf(" loading... "); >- bool res = getDocView()->LoadDocument( fname.c_str() ); >+ 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.c_str() ); >+ 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". ";
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 269110
:
195559
|
200845
|
236199
|
236203
|
236205
|
236311
|
236401
|
236407
|
236493
|
236495
|
236497
|
239825
|
239977
|
239979
|
249187
|
289807
|
290581
|
290583
|
294187
|
294201
|
309417
|
341284
|
355380
|
425978
|
425980
|
451078
|
451080
|
483354
|
483356
|
483358
|
490934
|
490936
|
490970
| 490972 |
490976