Develop and Download Open Source Software

Browse CVS Repository

Diff of /malonnote/mnNotePanel.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.10 by maloninc, Tue Jan 3 23:20:39 2006 UTC revision 1.12 by maloninc, Fri Jan 20 12:49:54 2006 UTC
# Line 19  mnNotePanel::mnNotePanel(wxWindow* paren Line 19  mnNotePanel::mnNotePanel(wxWindow* paren
19          spWindow->SplitVertically(searchTree, wikiHtmlTextCtrl, 250);          spWindow->SplitVertically(searchTree, wikiHtmlTextCtrl, 250);
20  #else  #else
21          /* init members */          /* init members */
22            wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
23          wikiHtmlTextCtrl = XRCCTRL(*this, "wikiHtmlTextCtrl", mnHtmlWindow);          wikiHtmlTextCtrl = XRCCTRL(*this, "wikiHtmlTextCtrl", mnHtmlWindow);
24            wikiHtmlTextCtrl->SetFonts(font.GetFaceName(), font.GetFaceName());
25  #endif  #endif
26    
         /* init html window */  
         wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);  
         wikiHtmlTextCtrl->SetFonts(font.GetFaceName(), font.GetFaceName());  
27    
28          /* create search tree */          /* create search tree */
29          searchItemRoot = searchTree->AddRoot(wxT(LABEL_ITEM_TREE), -1, -1, NULL);          searchItemRoot = searchTree->AddRoot(wxT(LABEL_ITEM_TREE), -1, -1, NULL);
# Line 140  void mnNotePanel::makeHtml(WikiData* wik Line 139  void mnNotePanel::makeHtml(WikiData* wik
139                    
140          /* [[ ]] */          /* [[ ]] */
141          wxRegEx exp1(wxT("\\[\\[([^\\}]+)\\]\\]"));          wxRegEx exp1(wxT("\\[\\[([^\\}]+)\\]\\]"));
142          exp1.Replace(&htmlText, wxT("<a href=" MNLINK "\\1>\\1</a>"));          exp1.Replace(&htmlText, wxT("<a href=\"" MNLINK "\\1\">\\1</a>"));
143    
144          /* file://  */            /* file://  */  
145          wxRegEx exp3(wxT("(file://[^ ]+)"), wxRE_NEWLINE|wxRE_DEFAULT);          wxRegEx exp3(wxT("(file://[^ ]+)"), wxRE_NEWLINE|wxRE_DEFAULT);
# Line 172  void mnNotePanel::makeHtml(WikiData* wik Line 171  void mnNotePanel::makeHtml(WikiData* wik
171    
172          /* {{ }} */          /* {{ }} */
173          wxRegEx exp8(wxT("\\{\\{([^\\}]+)\\}\\}"));          wxRegEx exp8(wxT("\\{\\{([^\\}]+)\\}\\}"));
174          exp8.Replace(&htmlText, wxT("<a href=" MNDOC "\\1>\\1</a>"));          exp8.Replace(&htmlText, wxT("<a href=\"" MNDOC "\\1\">\\1</a>"));
175    
176          /* table */          /* table */
177          wxRegEx exp10(wxT("^,([^,]+)"), wxRE_NEWLINE|wxRE_DEFAULT);          wxRegEx exp10(wxT("^,([^,]+)"), wxRE_NEWLINE|wxRE_DEFAULT);

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.12

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26