[med-svn] r17300 - trunk/packages/gentle/trunk/debian/patches
Andreas Tille
tille at moszumanska.debian.org
Thu Jun 26 06:35:42 UTC 2014
Author: tille
Date: 2014-06-26 06:35:42 +0000 (Thu, 26 Jun 2014)
New Revision: 17300
Modified:
trunk/packages/gentle/trunk/debian/patches/fix-format-codes.patch
trunk/packages/gentle/trunk/debian/patches/wx3.0-compat.patch
Log:
Fixed patches
Modified: trunk/packages/gentle/trunk/debian/patches/fix-format-codes.patch
===================================================================
--- trunk/packages/gentle/trunk/debian/patches/fix-format-codes.patch 2014-06-25 13:12:08 UTC (rev 17299)
+++ trunk/packages/gentle/trunk/debian/patches/fix-format-codes.patch 2014-06-26 06:35:42 UTC (rev 17300)
@@ -5,7 +5,7 @@
--- a/ureadseq.c
+++ b/ureadseq.c
-@@ -1344,7 +1344,7 @@
+@@ -1344,7 +1344,7 @@ short seqFileFormatFp(
for (i=0; i < *skiplines; i++) ReadOneLine(sp);
nlines= 0;
ReadOneLine(sp);
@@ -14,7 +14,7 @@
ReadOneLine(sp); /* 1st seq line */
for (ps= sp+10, ilen=0; *ps!=0; ps++) if (isprint(*ps)) ilen++;
-@@ -1590,7 +1590,7 @@
+@@ -1590,7 +1590,7 @@ short writeSeq(FILE *outf, const char *s
seqname[l] = 0;
sscanf( seqname, "%30s", idword);
@@ -23,7 +23,7 @@
numwidth= strlen(numform)+1;
nameform[0]= '\0';
-@@ -1619,8 +1619,8 @@
+@@ -1619,8 +1619,8 @@ short writeSeq(FILE *outf, const char *s
case kOlsen: /* Olsen seq. editor takes plain nucs OR Genbank */
case kGenBank:
@@ -34,7 +34,7 @@
/* fprintf(outf,"ACCESSION %s\n", accnum); */
fprintf(outf,"ORIGIN \n");
spacer = 11;
-@@ -1634,7 +1634,7 @@
+@@ -1634,7 +1634,7 @@ short writeSeq(FILE *outf, const char *s
/* somewhat like genbank... \\\*/
/* fprintf(outf,"\\\\\\\n"); << only at top of file, not each entry... */
fprintf(outf,"ENTRY %s \n", idword);
@@ -43,7 +43,7 @@
/* fprintf(outf,"ACCESSION %s\n", accnum); */
fprintf(outf,"SEQUENCE \n");
numwidth = 7;
-@@ -1644,7 +1644,7 @@
+@@ -1644,7 +1644,7 @@ short writeSeq(FILE *outf, const char *s
strcpy(endstr, "\n///");
/* run a top number line for PIR */
for (j=0; j<numwidth; j++) fputc(' ',outf);
@@ -52,7 +52,7 @@
fputc('\n',outf);
linesout += 5;
break;
-@@ -1654,7 +1654,7 @@
+@@ -1654,7 +1654,7 @@ short writeSeq(FILE *outf, const char *s
fprintf(outf,">P1;%s\n", idword);
else
fprintf(outf,">DL;%s\n", idword);
@@ -61,7 +61,7 @@
spacer = 11;
strcpy(endstr,"*\n");
linesout += 3;
-@@ -1663,8 +1663,8 @@
+@@ -1663,8 +1663,8 @@ short writeSeq(FILE *outf, const char *s
case kEMBL:
fprintf(outf,"ID %s\n", idword);
/* fprintf(outf,"AC %s\n", accnum); */
@@ -72,7 +72,7 @@
strcpy(endstr, "\n//"); /* 11Oct90: bug fix*/
tab = 4; /** added 31jan91 */
spacer = 11; /** added 31jan91 */
-@@ -1675,7 +1675,7 @@
+@@ -1675,7 +1675,7 @@ short writeSeq(FILE *outf, const char *s
case kGCG:
fprintf(outf,"%s\n", seqname);
/* fprintf(outf,"ACCESSION %s\n", accnum); */
@@ -81,7 +81,7 @@
spacer = 11;
numleft = true;
strcpy(endstr, "\n"); /* this is insurance to help prevent misreads at eof */
-@@ -1684,13 +1684,13 @@
+@@ -1684,13 +1684,13 @@ short writeSeq(FILE *outf, const char *s
case kStrider: /* ?? map ?*/
fprintf(outf,"; ### from DNA Strider ;-)\n");
@@ -97,7 +97,7 @@
spacer = 4;
width = 60;
linesout += 1;
-@@ -1721,7 +1721,7 @@
+@@ -1721,7 +1721,7 @@ short writeSeq(FILE *outf, const char *s
fprintf(outf," id { local id %d },\n", gPretty.atseq);
fprintf(outf," descr { title \"%s\" },\n", seqid);
fprintf(outf," inst {\n");
@@ -106,7 +106,7 @@
fprintf(outf," seq-data\n");
if (seqtype == kAmino)
fprintf(outf," iupacaa \"");
-@@ -1743,7 +1743,7 @@
+@@ -1743,7 +1743,7 @@ short writeSeq(FILE *outf, const char *s
tab = 0; /* 1; */
/* strcpy(endstr,";\nend;"); << this is end of all seqs.. */
/* do a header comment line for paup */
@@ -115,7 +115,7 @@
linesout += 1;
break;
-@@ -1760,13 +1760,13 @@
+@@ -1760,13 +1760,13 @@ short writeSeq(FILE *outf, const char *s
tab = gPretty.tab;
/* also add rtf formatting w/ font, size, style */
if (gPretty.nametop) {
@@ -131,7 +131,7 @@
idword, seqlen, checksum);
linesout++;
nameleft= true;
-@@ -1778,7 +1778,7 @@
+@@ -1778,7 +1778,7 @@ short writeSeq(FILE *outf, const char *s
break;
case kIG:
@@ -140,7 +140,7 @@
fprintf(outf,"%s\n", idword);
strcpy(endstr,"1"); /* == linear dna */
linesout += 2;
-@@ -1787,7 +1787,7 @@
+@@ -1787,7 +1787,7 @@ short writeSeq(FILE *outf, const char *s
default :
case kZuker: /* don't attempt Zuker's ftn format */
case kPearson:
@@ -149,7 +149,7 @@
linesout += 1;
break;
}
-@@ -1828,7 +1828,7 @@
+@@ -1828,7 +1828,7 @@ short writeSeq(FILE *outf, const char *s
s[l++] = ' ';
}
if (l1 % 10 == 1 || l1 == width) {
Modified: trunk/packages/gentle/trunk/debian/patches/wx3.0-compat.patch
===================================================================
--- trunk/packages/gentle/trunk/debian/patches/wx3.0-compat.patch 2014-06-25 13:12:08 UTC (rev 17299)
+++ trunk/packages/gentle/trunk/debian/patches/wx3.0-compat.patch 2014-06-26 06:35:42 UTC (rev 17300)
@@ -5,26 +5,26 @@
--- a/TClone.h
+++ b/TClone.h
-@@ -68,7 +68,7 @@
- void parseLines ( wxArrayString &v , char *t , long l ) ; ///< Breaks text into lines
- void separateNames ( wxString &s1 , wxString &s2 ) ; ///< ???
- int cmp ( const wxString &s1 , const wxString &s2 ) ; ///< String comparison
-- int a2i ( wxString &s ) { return atoi ( (char*) s.c_str() ) ; } ///< Converts string to integer
-+ int a2i ( wxString &s ) { return atoi ( (const char*) s.c_str() ) ; } ///< Converts string to integer
-
- wxString filename , name , sequence , description ;
- int size ; ///< Sequence length
+@@ -68,7 +68,7 @@ class TClone
+ void parseLines ( wxArrayString &v , char *t , long l ) ; ///< Breaks text into lines
+ void separateNames ( wxString &s1 , wxString &s2 ) ; ///< ???
+ int cmp ( const wxString &s1 , const wxString &s2 ) ; ///< String comparison
+- int a2i ( wxString &s ) { return atoi ( (char*) s.c_str() ) ; } ///< Converts string to integer
++ int a2i ( wxString &s ) { return atoi ( (const char*) s.c_str() ) ; } ///< Converts string to integer
+
+ wxString filename , name , sequence , description ;
+ int size ; ///< Sequence length
--- a/TXMLfile.cpp
+++ b/TXMLfile.cpp
-@@ -221,7 +221,7 @@
- {
- char u[100] ;
- sprintf ( u , "short_itemtype%d" , i.getType() ) ;
-- i.name = wxString ( txt(u) , wxConvUTF8 ) ;
-+ i.name = txt(u);
- wxString d2 = i.desc ;
- int k = d2.find ( _T("\n") ) ;
- if ( k > -1 ) d2.erase ( k ) ;
+@@ -221,7 +221,7 @@ void TXMLfile::readGBqualifiers ( TVecto
+ {
+ char u[100] ;
+ sprintf ( u , "short_itemtype%d" , i.getType() ) ;
+- i.name = wxString ( txt(u) , wxConvUTF8 ) ;
++ i.name = txt(u);
+ wxString d2 = i.desc ;
+ int k = d2.find ( _T("\n") ) ;
+ if ( k > -1 ) d2.erase ( k ) ;
--- a/TVirtualGel.cpp
+++ b/TVirtualGel.cpp
@@ -8,7 +8,6 @@
@@ -37,7 +37,7 @@
EVT_CHOICE(VG_MARKER,TVirtualGel::OnMarker)
--- a/MyChild.cpp
+++ b/MyChild.cpp
-@@ -1141,7 +1141,7 @@
+@@ -1141,7 +1141,7 @@ bool MyChild::runRestriction ( wxString
{
MyFrame *f = myapp()->frame ; //(MyFrame*) GetParent() ;
TRestrictionEditor ed ( f , _T("") , wxPoint(-1,-1) , wxSize(600,400) ,
@@ -48,7 +48,7 @@
ed.remoteCocktail = &vec->cocktail ;
--- a/TRestrictionEditor.cpp
+++ b/TRestrictionEditor.cpp
-@@ -376,7 +376,7 @@
+@@ -376,7 +376,7 @@ void TRestrictionEditor::res_ll_act ( wx
wxString s = el->GetItemText ( i ) ;
TRestrictionEnzyme *e = myapp()->frame->LS->getRestrictionEnzyme ( s ) ;
TEnzymeDialog ed ( this , s , wxPoint(-1,-1) , wxSize(600,400) ,
@@ -59,47 +59,47 @@
}
--- a/TVectorEditor.cpp
+++ b/TVectorEditor.cpp
-@@ -400,7 +400,7 @@
- e->setCut ( 0 ) ;
- e->setOverlap ( 0 ) ;
- TEnzymeDialog ed ( this , txt("t_new_protease") , wxPoint(-1,-1) , wxSize(600,400) ,
-- wxDEFAULT_DIALOG_STYLE|wxCENTRE|wxDIALOG_MODAL ) ;
-+ wxDEFAULT_DIALOG_STYLE|wxCENTRE ) ;
- ed.initme ( e ) ;
- if ( ed.ShowModal() == wxID_OK )
- {
+@@ -400,7 +400,7 @@ void TVectorEditor::newProtease ( wxComm
+ e->setCut ( 0 ) ;
+ e->setOverlap ( 0 ) ;
+ TEnzymeDialog ed ( this , txt("t_new_protease") , wxPoint(-1,-1) , wxSize(600,400) ,
+- wxDEFAULT_DIALOG_STYLE|wxCENTRE|wxDIALOG_MODAL ) ;
++ wxDEFAULT_DIALOG_STYLE|wxCENTRE ) ;
+ ed.initme ( e ) ;
+ if ( ed.ShowModal() == wxID_OK )
+ {
--- a/TVectorEditorEnzymes.cpp
+++ b/TVectorEditorEnzymes.cpp
-@@ -116,7 +116,7 @@
- wxString s = lb->GetString ( vi[k] ) ;
- TRestrictionEnzyme *e = myapp()->frame->LS->getRestrictionEnzyme ( s ) ;
- TEnzymeDialog ed ( this , s , wxPoint(-1,-1) , wxSize(600,400) ,
-- wxDEFAULT_DIALOG_STYLE|wxCENTRE|wxDIALOG_MODAL ) ;
-+ wxDEFAULT_DIALOG_STYLE|wxCENTRE ) ;
- ed.initme ( e ) ;
- if ( ed.ShowModal() == wxID_OK )
- {
-@@ -149,7 +149,7 @@
- wxString s = lb->GetString ( vi[0] ) ;
- TRestrictionEnzyme *e = myapp()->frame->LS->getRestrictionEnzyme ( s ) ;
- TEnzymeDialog ed ( this , s , wxPoint(-1,-1) , wxSize(600,400) ,
-- wxDEFAULT_DIALOG_STYLE|wxCENTRE|wxDIALOG_MODAL ) ;
-+ wxDEFAULT_DIALOG_STYLE|wxCENTRE ) ;
- ed.initme ( e ) ;
- ed.ShowModal() ;
- }
-@@ -335,7 +335,7 @@
- e->setCut ( 0 ) ;
- e->setOverlap ( 0 ) ;
- TEnzymeDialog ed ( this , txt("t_new_enzyme") , wxPoint(-1,-1) , wxSize(600,400) ,
-- wxDEFAULT_DIALOG_STYLE|wxCENTRE|wxDIALOG_MODAL ) ;
-+ wxDEFAULT_DIALOG_STYLE|wxCENTRE ) ;
- ed.initme ( e ) ;
- if ( ed.ShowModal() == wxID_OK )
- {
+@@ -116,7 +116,7 @@ void TVectorEditor::enzymeListDlbClick (
+ wxString s = lb->GetString ( vi[k] ) ;
+ TRestrictionEnzyme *e = myapp()->frame->LS->getRestrictionEnzyme ( s ) ;
+ TEnzymeDialog ed ( this , s , wxPoint(-1,-1) , wxSize(600,400) ,
+- wxDEFAULT_DIALOG_STYLE|wxCENTRE|wxDIALOG_MODAL ) ;
++ wxDEFAULT_DIALOG_STYLE|wxCENTRE ) ;
+ ed.initme ( e ) ;
+ if ( ed.ShowModal() == wxID_OK )
+ {
+@@ -149,7 +149,7 @@ void TVectorEditor::enzymeListDlbClick (
+ wxString s = lb->GetString ( vi[0] ) ;
+ TRestrictionEnzyme *e = myapp()->frame->LS->getRestrictionEnzyme ( s ) ;
+ TEnzymeDialog ed ( this , s , wxPoint(-1,-1) , wxSize(600,400) ,
+- wxDEFAULT_DIALOG_STYLE|wxCENTRE|wxDIALOG_MODAL ) ;
++ wxDEFAULT_DIALOG_STYLE|wxCENTRE ) ;
+ ed.initme ( e ) ;
+ ed.ShowModal() ;
+ }
+@@ -335,7 +335,7 @@ void TVectorEditor::newEnzyme ( wxComman
+ e->setCut ( 0 ) ;
+ e->setOverlap ( 0 ) ;
+ TEnzymeDialog ed ( this , txt("t_new_enzyme") , wxPoint(-1,-1) , wxSize(600,400) ,
+- wxDEFAULT_DIALOG_STYLE|wxCENTRE|wxDIALOG_MODAL ) ;
++ wxDEFAULT_DIALOG_STYLE|wxCENTRE ) ;
+ ed.initme ( e ) ;
+ if ( ed.ShowModal() == wxID_OK )
+ {
--- a/AminoAcids.cpp
+++ b/AminoAcids.cpp
-@@ -656,7 +656,7 @@
+@@ -656,7 +656,7 @@ void TAminoAcids::handleListBox ( wxStri
{
if ( curDisplay )
{
@@ -110,7 +110,7 @@
curDisplay = NULL ;
--- a/CGview.cpp
+++ b/CGview.cpp
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ void CGdialog::OnRunCGviewer ( wxCommand
void CGdialog::OnChooseJar ( wxCommandEvent &event )
{
@@ -121,36 +121,36 @@
}
--- a/ManageDatabase.cpp
+++ b/ManageDatabase.cpp
-@@ -634,7 +634,7 @@
- void TManageDatabaseDialog::pdOnNew ( wxCommandEvent &ev )
- {
- wxString wildcard = _T("GENtle database (*.db)|*.db") ;
-- wxFileDialog d ( this , txt("t_add_new_db") , _T("") , _T("") , wildcard , wxSAVE|wxOVERWRITE_PROMPT ) ;
-+ wxFileDialog d ( this , txt("t_add_new_db") , _T("") , _T("") , wildcard , wxFD_SAVE|wxFD_OVERWRITE_PROMPT ) ;
- int x = d.ShowModal() ;
- if ( x != wxID_OK ) return ;
-
-@@ -655,7 +655,7 @@
- void TManageDatabaseDialog::pdOnAdd ( wxCommandEvent &ev )
- {
- wxString wildcard = _T("GENtle database (*.db)|*.db") ;
-- wxFileDialog d ( this , txt("t_choose_db") , _T("") , _T("") , wildcard , wxOPEN ) ;
-+ wxFileDialog d ( this , txt("t_choose_db") , _T("") , _T("") , wildcard , wxFD_OPEN ) ;
- int x = d.ShowModal() ;
- if ( x != wxID_OK ) return ;
-
-@@ -965,7 +965,7 @@
- TVectorItem i ;
- i.name = sr[a][sr["di_name"]] ;
- i.desc = sr[a][sr["di_description"]] ;
-- i.setType ( sr[a][sr["di_type"]].GetChar(0) ) ;
-+ i.setType ( (char)sr[a][sr["di_type"]].GetChar(0) ) ;
- i.from = atoi ( sr[a][sr["di_from"]].mb_str() ) ;
- i.to = atoi ( sr[a][sr["di_to"]].mb_str() ) ;
- i.setDirection ( atoi ( sr[a][sr["di_direction"]].mb_str() ) ) ;
+@@ -634,7 +634,7 @@ void TManageDatabaseDialog::pdOnDBchange
+ void TManageDatabaseDialog::pdOnNew ( wxCommandEvent &ev )
+ {
+ wxString wildcard = _T("GENtle database (*.db)|*.db") ;
+- wxFileDialog d ( this , txt("t_add_new_db") , _T("") , _T("") , wildcard , wxSAVE|wxOVERWRITE_PROMPT ) ;
++ wxFileDialog d ( this , txt("t_add_new_db") , _T("") , _T("") , wildcard , wxFD_SAVE|wxFD_OVERWRITE_PROMPT ) ;
+ int x = d.ShowModal() ;
+ if ( x != wxID_OK ) return ;
+
+@@ -655,7 +655,7 @@ void TManageDatabaseDialog::pdOnNew ( wx
+ void TManageDatabaseDialog::pdOnAdd ( wxCommandEvent &ev )
+ {
+ wxString wildcard = _T("GENtle database (*.db)|*.db") ;
+- wxFileDialog d ( this , txt("t_choose_db") , _T("") , _T("") , wildcard , wxOPEN ) ;
++ wxFileDialog d ( this , txt("t_choose_db") , _T("") , _T("") , wildcard , wxFD_OPEN ) ;
+ int x = d.ShowModal() ;
+ if ( x != wxID_OK ) return ;
+
+@@ -965,7 +965,7 @@ bool TManageDatabaseDialog::do_load_DNA
+ TVectorItem i ;
+ i.name = sr[a][sr["di_name"]] ;
+ i.desc = sr[a][sr["di_description"]] ;
+- i.setType ( sr[a][sr["di_type"]].GetChar(0) ) ;
++ i.setType ( (char)sr[a][sr["di_type"]].GetChar(0) ) ;
+ i.from = atoi ( sr[a][sr["di_from"]].mb_str() ) ;
+ i.to = atoi ( sr[a][sr["di_to"]].mb_str() ) ;
+ i.setDirection ( atoi ( sr[a][sr["di_direction"]].mb_str() ) ) ;
--- a/MyFrame.cpp
+++ b/MyFrame.cpp
-@@ -727,7 +727,7 @@
+@@ -727,7 +727,7 @@ void MyFrame::saveImage ( wxBitmap *bmp
name.Replace ( _T("\\") , _T("_") , TRUE ) ;
wxString lastdir = LS->getOption ( _T("LAST_IMPORT_DIR") , _T("C:") ) ;
@@ -159,7 +159,7 @@
if ( d.ShowModal() != wxID_OK ) return ;
wxString filename = d.GetPath() ;
-@@ -764,7 +764,7 @@
+@@ -764,7 +764,7 @@ void MyFrame::OnFileImport(wxCommandEven
_T("|") + wcCM5format ;
wxString lastdir = LS->getOption ( _T("LAST_IMPORT_DIR") , _T("C:") ) ;
wxFileDialog d ( this , txt("import_file") , lastdir ,
@@ -168,7 +168,7 @@
int x = d.ShowModal() ;
if ( x != wxID_OK ) return ;
-@@ -2616,8 +2616,8 @@
+@@ -2616,8 +2616,8 @@ void TTestSuite::vectorPressKey ( ChildB
if ( r == 10 ) { ev.m_keyCode = WXK_LEFT ; msg = _T("LEFT") ; }
if ( r == 11 ) { ev.m_keyCode = WXK_UP ; msg = _T("UP") ; }
if ( r == 12 ) { ev.m_keyCode = WXK_DOWN ; msg = _T("DOWN") ; }
@@ -181,34 +181,34 @@
else ac->cSequence->OnCharHook(ev) ;
--- a/PCR_Troubleshoot.cpp
+++ b/PCR_Troubleshoot.cpp
-@@ -415,13 +415,13 @@
- if ( ( b - a ) / length > 4 )
- {
- add_error ( p , nr , msg ,
-- wxString::Format ( txt("t_pcr_ts_warning_runs_text") , (char*)s.Mid(a,length).c_str() ) ) ;
-+ wxString::Format ( txt("t_pcr_ts_warning_runs_text") , (const char*)s.Mid(a,length).c_str() ) ) ;
- a = b - length ;
- }
- else if ( ( b - a ) / length == 4 )
- {
- add_warning ( p , nr , msg ,
-- wxString::Format ( txt("t_pcr_ts_warning_runs_text2") , (char*)s.Mid(a,length).c_str() ) ) ;
-+ wxString::Format ( txt("t_pcr_ts_warning_runs_text2") , (const char*)s.Mid(a,length).c_str() ) ) ;
- a = b - length ;
- }
- }
-@@ -489,7 +489,7 @@
- int a ;
- for ( a = 0 ; a < s.length() ; a++ )
- {
-- switch ( s.GetChar ( a ) )
-+ switch ( (char)s.GetChar ( a ) )
- {
- case 'A' : s.SetChar ( a , 'T' ) ; break ;
- case 'C' : s.SetChar ( a , 'G' ) ; break ;
+@@ -415,13 +415,13 @@ void PCR_troubleshoot_dialog::scan_Runs
+ if ( ( b - a ) / length > 4 )
+ {
+ add_error ( p , nr , msg ,
+- wxString::Format ( txt("t_pcr_ts_warning_runs_text") , (char*)s.Mid(a,length).c_str() ) ) ;
++ wxString::Format ( txt("t_pcr_ts_warning_runs_text") , (const char*)s.Mid(a,length).c_str() ) ) ;
+ a = b - length ;
+ }
+ else if ( ( b - a ) / length == 4 )
+ {
+ add_warning ( p , nr , msg ,
+- wxString::Format ( txt("t_pcr_ts_warning_runs_text2") , (char*)s.Mid(a,length).c_str() ) ) ;
++ wxString::Format ( txt("t_pcr_ts_warning_runs_text2") , (const char*)s.Mid(a,length).c_str() ) ) ;
+ a = b - length ;
+ }
+ }
+@@ -489,7 +489,7 @@ wxString PCR_troubleshoot_dialog::invert
+ int a ;
+ for ( a = 0 ; a < s.length() ; a++ )
+ {
+- switch ( s.GetChar ( a ) )
++ switch ( (char)s.GetChar ( a ) )
+ {
+ case 'A' : s.SetChar ( a , 'T' ) ; break ;
+ case 'C' : s.SetChar ( a , 'G' ) ; break ;
--- a/SequenceCanvas.cpp
+++ b/SequenceCanvas.cpp
-@@ -394,13 +394,13 @@
+@@ -394,13 +394,13 @@ void SequenceCanvas::editSpecialKeyPress
{
mark ( id , the_sequence->length() , the_sequence->length() , 2 ) ;
}
@@ -226,50 +226,50 @@
if ( from > the_sequence->length() ) from = the_sequence->length() ;
--- a/SequenceTypeAAstructure.cpp
+++ b/SequenceTypeAAstructure.cpp
-@@ -400,7 +400,7 @@
- dc.SetPen ( *pen_C ) ;
- for ( a = 0 ; a < atom_pos.size() ; a++ )
- {
-- switch ( atom_type.GetChar ( a ) )
-+ switch ( (char)atom_type.GetChar ( a ) )
- {
- case 'C' : if ( can->isPrinting() ) dc.SetPen ( *pen_C ) ; dc.SetBrush ( *brush_C ) ; break ;
- case 'S' : if ( can->isPrinting() ) dc.SetPen ( *pen_S ) ; dc.SetBrush ( *brush_S ) ; break ;
+@@ -400,7 +400,7 @@ void SeqAAstructure::draw_amino_acid ( w
+ dc.SetPen ( *pen_C ) ;
+ for ( a = 0 ; a < atom_pos.size() ; a++ )
+ {
+- switch ( atom_type.GetChar ( a ) )
++ switch ( (char)atom_type.GetChar ( a ) )
+ {
+ case 'C' : if ( can->isPrinting() ) dc.SetPen ( *pen_C ) ; dc.SetBrush ( *brush_C ) ; break ;
+ case 'S' : if ( can->isPrinting() ) dc.SetPen ( *pen_S ) ; dc.SetBrush ( *brush_S ) ; break ;
--- a/SequenceTypePlot.cpp
+++ b/SequenceTypePlot.cpp
-@@ -538,7 +538,7 @@
- mylog ( "SeqPlot::useNcoils" , wxString::Format ( _T("BEGIN ncoils_function (%d): ") , b ) + s ) ;
- x = ncoils_function ( (const char*) s.mb_str() , b ) . c_str() ;
- mylog ( "SeqPlot::useNcoils" , "END ncoils_function" ) ;
-- wxString t ( (char*) x.c_str() , wxConvUTF8 ) ;
-+ wxString t ( (const char*) x.c_str() , wxConvUTF8 ) ;
- wxArrayString ta ;
- explode ( _T("\n") , t , ta ) ;
- for ( b = 0 ; b < s.length() ; b++ )
+@@ -538,7 +538,7 @@ void SeqPlot::useNcoils ()
+ mylog ( "SeqPlot::useNcoils" , wxString::Format ( _T("BEGIN ncoils_function (%d): ") , b ) + s ) ;
+ x = ncoils_function ( (const char*) s.mb_str() , b ) . c_str() ;
+ mylog ( "SeqPlot::useNcoils" , "END ncoils_function" ) ;
+- wxString t ( (char*) x.c_str() , wxConvUTF8 ) ;
++ wxString t ( (const char*) x.c_str() , wxConvUTF8 ) ;
+ wxArrayString ta ;
+ explode ( _T("\n") , t , ta ) ;
+ for ( b = 0 ; b < s.length() ; b++ )
--- a/TImageDisplay.cpp
+++ b/TImageDisplay.cpp
-@@ -310,7 +310,7 @@
-
- if ( invert )
- {
-- int lf = pdc.GetLogicalFunction() ;
-+ wxRasterOperationMode lf = pdc.GetLogicalFunction() ;
- pdc.SetLogicalFunction ( wxINVERT ) ;
- pdc.SetBrush ( *wxWHITE_BRUSH ) ;
- pdc.SetPen ( *wxWHITE_PEN ) ;
+@@ -310,7 +310,7 @@ void TMyImagePanel::OnDraw(wxDC& pdc)
+
+ if ( invert )
+ {
+- int lf = pdc.GetLogicalFunction() ;
++ wxRasterOperationMode lf = pdc.GetLogicalFunction() ;
+ pdc.SetLogicalFunction ( wxINVERT ) ;
+ pdc.SetBrush ( *wxWHITE_BRUSH ) ;
+ pdc.SetPen ( *wxWHITE_PEN ) ;
--- a/TPhyloTree.cpp
+++ b/TPhyloTree.cpp
@@ -3,7 +3,6 @@
- BEGIN_EVENT_TABLE(TPhyloTree, MyChildBase)
- EVT_CLOSE(ChildBase::OnClose)
- EVT_SET_FOCUS(ChildBase::OnFocus)
-- EVT_SIZE(ChildBase::OnSize)
- EVT_CHECKBOX(PHYLIP_DIRECT_LINES,TPhyloTree::OnDirectLines)
- EVT_LISTBOX(PHYLIP_TREE_LIST,TPhyloTree::OnTreeList)
- EVT_MENU(MDI_FILE_SAVE,TPhyloTree::OnFileSave)
+ BEGIN_EVENT_TABLE(TPhyloTree, MyChildBase)
+ EVT_CLOSE(ChildBase::OnClose)
+ EVT_SET_FOCUS(ChildBase::OnFocus)
+- EVT_SIZE(ChildBase::OnSize)
+ EVT_CHECKBOX(PHYLIP_DIRECT_LINES,TPhyloTree::OnDirectLines)
+ EVT_LISTBOX(PHYLIP_TREE_LIST,TPhyloTree::OnTreeList)
+ EVT_MENU(MDI_FILE_SAVE,TPhyloTree::OnFileSave)
--- a/TStorage.cpp
+++ b/TStorage.cpp
-@@ -272,7 +272,7 @@
+@@ -272,7 +272,7 @@ TSQLresult TStorage::getObjectSqlite3 (
} while ( rc == SQLITE_BUSY ) ;
ierror = e ? 1 : 0 ;
@@ -278,7 +278,7 @@
else error = _T("Alles OK") ;
sqlite3_close ( db ) ;
-@@ -531,7 +531,7 @@
+@@ -531,7 +531,7 @@ void TStorage::replaceTable ( wxString t
s1 = s2 = _T("") ;
for ( b = 0 ; b < f.GetCount() ; b++ )
{
@@ -289,7 +289,7 @@
}
--- a/main.cpp
+++ b/main.cpp
-@@ -253,7 +253,7 @@
+@@ -253,7 +253,7 @@ bool MyApp::OnInit()
if ( wxGetEnv ( _T("COILSDIR") , NULL ) ) wxUnsetEnv ( _T("COILSDIR") ) ;
wxSetEnv ( _T("COILSDIR") , homedir ) ;
#else
@@ -300,7 +300,7 @@
--- a/ChildBase.cpp
+++ b/ChildBase.cpp
-@@ -223,7 +223,7 @@
+@@ -223,7 +223,7 @@ void ChildBase::OnExport (wxCommandEvent
wxString wildcard = getExportFilters () ;
wxString lastdir = myapp()->frame->LS->getOption ( _T("LAST_IMPORT_DIR") , _T("C:") ) ;
More information about the debian-med-commit
mailing list