Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 888561
Collapse All | Expand All

(-)a/src/cr3.cpp (-15 / +11 lines)
Lines 341-354 void testFormatting() { Link Here
341
        LFormattedText txt;
341
        LFormattedText txt;
342
        void addLine(const lChar32* str, int flags, LVFontRef font) {
342
        void addLine(const lChar32* str, int flags, LVFontRef font) {
343
            lString32 s(str);
343
            lString32 s(str);
344
            txt.AddSourceLine(s.c_str(),       /* pointer to unicode text string */
344
            txt.AddSourceLine(s.c_str(),  /* pointer to unicode text string */
345
                              s.length(),      /* number of chars in text, 0 for auto(strlen) */
345
                              s.length(), /* number of chars in text, 0 for auto(strlen) */
346
                              0x000000,        /* text color */
346
                              0x000000,   /* text color */
347
                              0xFFFFFF,        /* background color */
347
                              0xFFFFFF,   /* background color */
348
                              font.get(),      /* font to draw string */
348
                              font.get(), /* font to draw string */
349
                              NULL, flags, 16, /* interline space, *16 (16=single, 32=double) */
349
                              NULL,       /* pointer to text lang config */
350
                              30,              /* first line margin */
350
                              flags,      /* flags */
351
                              NULL, 0);
351
                              16,         /* line height in screen pixels; *16 (16=single, 32=double) */
352
                              0,          /* drift y from baseline */
353
                              30,         /* first line margin */
354
                              NULL, 0, 0);
352
        }
355
        }
353
        void dump() {
356
        void dump() {
354
            formatted_text_fragment_t* buf = txt.GetBuffer();
357
            formatted_text_fragment_t* buf = txt.GetBuffer();
Lines 1380-1388 void cr3Frame::OnFileOpen(wxCommandEvent& WXUNUSED(event)) { Link Here
1380
            wxT(""), //const wxString& defaultFile = "",
1383
            wxT(""), //const wxString& defaultFile = "",
1381
            wxT("All supported files|*.fb2;*.fbz;*.txt;*.zip;*.rtf;*.epub;*.tcr;*.html;*.htm;*.shtml;*.xhtml|FictionBook files (*.fb2)|*.fb2;*.fbz|RTF files (*.rtf)|*.rtf|Text files (*.txt, *.tcr)|*.txt;*.tcr|HTML files|*.html;*.htm;*.shtml;*.xhtml|EPUB files (*.epub)|*.epub|ZIP archieves (*.zip)|*.zip"), //const wxString& wildcard = "*.*",
1384
            wxT("All supported files|*.fb2;*.fbz;*.txt;*.zip;*.rtf;*.epub;*.tcr;*.html;*.htm;*.shtml;*.xhtml|FictionBook files (*.fb2)|*.fb2;*.fbz|RTF files (*.rtf)|*.rtf|Text files (*.txt, *.tcr)|*.txt;*.tcr|HTML files|*.html;*.htm;*.shtml;*.xhtml|EPUB files (*.epub)|*.epub|ZIP archieves (*.zip)|*.zip"), //const wxString& wildcard = "*.*",
1382
            wxFD_OPEN | wxFD_FILE_MUST_EXIST //long style = wxFD_DEFAULT_STYLE,
1385
            wxFD_OPEN | wxFD_FILE_MUST_EXIST //long style = wxFD_DEFAULT_STYLE,
1383
            //const wxPoint& pos = wxDefaultPosition,
1384
            //const wxSize& sz = wxDefaultSize,
1385
            //const wxString& name = "filedlg"
1386
    );
1386
    );
1387
1387
1388
    if (dlg.ShowModal() == wxID_OK) {
1388
    if (dlg.ShowModal() == wxID_OK) {
Lines 1410-1418 void cr3Frame::OnFileSave(wxCommandEvent& WXUNUSED(event)) { Link Here
1410
                     wxT(""),                               //const wxString& defaultFile = "",
1410
                     wxT(""),                               //const wxString& defaultFile = "",
1411
                     wxT("Wolf EBook files (*.wol)|*.wol"), //const wxString& wildcard = "*.*",
1411
                     wxT("Wolf EBook files (*.wol)|*.wol"), //const wxString& wildcard = "*.*",
1412
                     wxFD_SAVE | wxFD_OVERWRITE_PROMPT      //long style = wxFD_DEFAULT_STYLE,
1412
                     wxFD_SAVE | wxFD_OVERWRITE_PROMPT      //long style = wxFD_DEFAULT_STYLE,
1413
                     //const wxPoint& pos = wxDefaultPosition,
1414
                     //const wxSize& sz = wxDefaultSize,
1415
                     //const wxString& name = "filedlg"
1416
    );
1413
    );
1417
    WolOptions opts(this);
1414
    WolOptions opts(this);
1418
    if (dlg.ShowModal() == wxID_OK && opts.ShowModal() == wxID_OK) {
1415
    if (dlg.ShowModal() == wxID_OK && opts.ShowModal() == wxID_OK) {
1419
- 

Return to bug 888561