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.9 by maloninc, Fri Dec 30 04:06:33 2005 UTC revision 1.13 by maloninc, Mon Jan 30 00:48:55 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    
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);
30                    
# Line 135  void mnNotePanel::makeHtml(WikiData* wik Line 138  void mnNotePanel::makeHtml(WikiData* wik
138          exp2.Replace(&htmlText, wxT("<a href=\\1>\\1</a>"));          exp2.Replace(&htmlText, wxT("<a href=\\1>\\1</a>"));
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 168  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.9  
changed lines
  Added in v.1.13

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