[med-svn] [Git][med-team/gentle][master] 4 commits: Readded missing FontSelection patch, changed order of patches
Steffen Möller (@moeller)
gitlab at salsa.debian.org
Mon Jul 31 11:07:29 BST 2023
Steffen Möller pushed to branch master at Debian Med / gentle
Commits:
9b48e90f by Steffen Moeller at 2023-07-31T11:26:08+02:00
Readded missing FontSelection patch, changed order of patches
- - - - -
897b69e3 by Steffen Moeller at 2023-07-31T11:33:29+02:00
Avoiding runtime-warnings by wxWidgets about redundant flags
- - - - -
30ff9ae0 by Steffen Moeller at 2023-07-31T12:00:30+02:00
More on missing return values and Font/Pen selection
- - - - -
402644f2 by Steffen Moeller at 2023-07-31T12:05:11+02:00
d/rules: undo changes to tips_de.txt
- - - - -
7 changed files:
- debian/changelog
- + debian/patches/ExpandOverridesAll.patch
- + debian/patches/FontSelection.patch
- + debian/patches/YetAnotherMissingReturn.patch
- + debian/patches/YetAnotherPenSelection.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,6 +1,10 @@
-gentle (1.9+cvs20100605+dfsg1-12) UNRELEASED; urgency=medium
+gentle (1.9+cvs20100605+dfsg1-12) unstable; urgency=medium
* Added more patches to eradicate compiler warnings on font selection.
+ * Restored order of patches in d/p/series -> new patches last.
+ * Not showing modal dialog announcing read-in of markers.txt
+ * Corrected for run-time checks by wxWidgets for wxEXPAND dominating other
+ widget-orientation flags.
-- Steffen Moeller <moeller at debian.org> Sun, 30 Jul 2023 01:21:41 +0200
=====================================
debian/patches/ExpandOverridesAll.patch
=====================================
@@ -0,0 +1,1198 @@
+Index: gentle2/ABIviewer.cpp
+===================================================================
+--- gentle2.orig/ABIviewer.cpp
++++ gentle2/ABIviewer.cpp
+@@ -280,14 +280,14 @@ void TABIviewer::initme ()
+ wxBoxSizer *h3 = new wxBoxSizer ( wxHORIZONTAL ) ;
+ wxBoxSizer *h4 = new wxBoxSizer ( wxHORIZONTAL ) ;
+
+- h1->Add ( aidLines , 0 , wxEXPAND|wxLEFT|wxRIGHT , 5 ) ;
+- h1->Add ( inv_compl , 0 , wxEXPAND|wxLEFT|wxRIGHT , 5 ) ;
+- h2->Add ( f_height , 0 , wxEXPAND|wxLEFT|wxRIGHT , 5 ) ;
+- h2->Add ( new wxStaticText ( this , -1 , txt("t_scale_height") ) , 0 , wxEXPAND|wxLEFT|wxRIGHT , 5 ) ;
+- h3->Add ( f_width , 0 , wxEXPAND|wxLEFT|wxRIGHT , 5 ) ;
+- h3->Add ( new wxStaticText ( this , -1 , txt("t_scale_width") ) , 0 , wxEXPAND|wxLEFT|wxRIGHT , 5 ) ;
+- h4->Add ( slider , 0 , wxEXPAND|wxLEFT|wxRIGHT , 5 ) ;
+- h4->Add ( new wxStaticText ( this , -1 , txt("t_zoom") ) , 0 , wxEXPAND|wxLEFT|wxRIGHT , 5 ) ;
++ h1->Add ( aidLines , 0 , wxEXPAND , 5 ) ;
++ h1->Add ( inv_compl , 0 , wxEXPAND , 5 ) ;
++ h2->Add ( f_height , 0 , wxEXPAND , 5 ) ;
++ h2->Add ( new wxStaticText ( this , -1 , txt("t_scale_height") ) , 0 , wxEXPAND , 5 ) ;
++ h3->Add ( f_width , 0 , wxEXPAND , 5 ) ;
++ h3->Add ( new wxStaticText ( this , -1 , txt("t_scale_width") ) , 0 , wxEXPAND , 5 ) ;
++ h4->Add ( slider , 0 , wxEXPAND , 5 ) ;
++ h4->Add ( new wxStaticText ( this , -1 , txt("t_zoom") ) , 0 , wxEXPAND , 5 ) ;
+
+ v1->Add ( h1 , 1 ) ;
+ v1->Add ( h2 , 1 ) ;
+@@ -300,7 +300,7 @@ void TABIviewer::initme ()
+
+ wxBoxSizer *v0 = new wxBoxSizer ( wxVERTICAL ) ;
+ v0->Add ( toolbar , 0 , wxBOTTOM , 5 ) ;
+- v0->Add ( h0 , 0 , wxBOTTOM|wxEXPAND , 5 ) ;
++ v0->Add ( h0 , 0 , wxEXPAND , 5 ) ;
+ v0->Add ( sc , 1 , wxEXPAND ) ;
+ SetSizer ( v0 ) ;
+ v0->Fit ( this ) ;
+Index: gentle2/CGview.cpp
+===================================================================
+--- gentle2.orig/CGview.cpp
++++ gentle2/CGview.cpp
+@@ -41,10 +41,10 @@ CGdialog::CGdialog ( wxWindow *parent, c
+
+ width = new wxTextCtrl ( this , -1 , wxString::Format ( _T("%d") , p->width ) ) ;
+ height = new wxTextCtrl ( this , -1 , wxString::Format ( _T("%d") , p->height ) ) ;
+- h1->Add ( new wxStaticText ( this , -1 , txt("t_cgview_image_dimensions") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- h1->Add ( width , 1 , wxEXPAND|wxALL , 5 ) ;
+- h1->Add ( new wxStaticText ( this , -1 , _T(" x ") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- h1->Add ( height , 1 , wxEXPAND|wxALL , 5 ) ;
++ h1->Add ( new wxStaticText ( this , -1 , txt("t_cgview_image_dimensions") ) , 0 , wxEXPAND , 5 ) ;
++ h1->Add ( width , 1 , wxEXPAND , 5 ) ;
++ h1->Add ( new wxStaticText ( this , -1 , _T(" x ") ) , 0 , wxEXPAND , 5 ) ;
++ h1->Add ( height , 1 , wxEXPAND , 5 ) ;
+
+ useDefaultColors = new wxCheckBox ( this , -1 , txt("t_cgview_use_default_colors") ) ;
+
+@@ -52,22 +52,22 @@ CGdialog::CGdialog ( wxWindow *parent, c
+ runcgview = new wxCheckBox ( this , CGVIEW_RUN_CGVIEWER , txt("t_cgview_run_cgview") ) ;
+ cgviewapp = new wxTextCtrl ( this , -1 , appname ) ;
+ choosejar = new wxButton ( this , CGVIEW_CHOOSE_JAR , _T("..") ) ;
+- h3->Add ( runcgview , 0 , wxEXPAND|wxALL , 5 ) ;
+- h3->Add ( cgviewapp , 1 , wxEXPAND|wxALL , 5 ) ;
++ h3->Add ( runcgview , 0 , wxEXPAND , 5 ) ;
++ h3->Add ( cgviewapp , 1 , wxEXPAND , 5 ) ;
+ h3->Add ( choosejar , 0 , wxALL , 5 ) ;
+
+ runimageapp = new wxCheckBox ( this , -1 , txt("t_cgview_run_image_app") ) ;
+ imagetypes = new wxChoice ( this , -1 ) ;
+- h4->Add ( new wxStaticText ( this , -1 , txt("t_cgview_imagetypes") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- h4->Add ( imagetypes , 0 , wxEXPAND|wxALL , 5 ) ;
+- h4->Add ( runimageapp , 0 , wxEXPAND|wxALL , 5 ) ;
++ h4->Add ( new wxStaticText ( this , -1 , txt("t_cgview_imagetypes") ) , 0 , wxEXPAND , 5 ) ;
++ h4->Add ( imagetypes , 0 , wxEXPAND , 5 ) ;
++ h4->Add ( runimageapp , 0 , wxEXPAND , 5 ) ;
+
+ showrestrictionsites = new wxCheckBox ( this , -1 , txt("t_cgview_showrestrictionsites") ) ;
+ showgc = new wxCheckBox ( this , -1 , txt("t_cgview_showgc") ) ;
+ wxButton *bgc = new wxButton ( this , CGVIEW_CHOOSE_BACKGROUND_COLOR , txt("t_cgview_backgroundcolor") ) ;
+- h5->Add ( showrestrictionsites , 0 , wxEXPAND|wxALL , 5 ) ;
+- h5->Add ( showgc , 0 , wxEXPAND|wxALL , 5 ) ;
+- h5->Add ( bgc , 0 , wxEXPAND|wxALL , 5 ) ;
++ h5->Add ( showrestrictionsites , 0 , wxEXPAND , 5 ) ;
++ h5->Add ( showgc , 0 , wxEXPAND , 5 ) ;
++ h5->Add ( bgc , 0 , wxEXPAND , 5 ) ;
+
+
+ h2->Add ( new wxButton ( this , wxID_OK , txt("b_ok" ) ) , 0 , wxALL , 5 ) ;
+Index: gentle2/ExternalBLAST.cpp
+===================================================================
+--- gentle2.orig/ExternalBLAST.cpp
++++ gentle2/ExternalBLAST.cpp
+@@ -39,8 +39,8 @@ void EIpanel::init_blast()
+ st_msg = new wxStaticText ( up , -1 , _T("") ) ;
+
+ v1->Add ( h0 , 0 , wxEXPAND , 0 ) ;
+-// v1->Add ( h1 , 0 , wxEXPAND|wxTOP|wxBOTTOM , 3 ) ;
+- v1->Add ( st_msg , 0 , wxEXPAND|wxTOP|wxBOTTOM , 3 ) ;
++// v1->Add ( h1 , 0 , wxEXPAND , 3 ) ;
++ v1->Add ( st_msg , 0 , wxEXPAND , 3 ) ;
+ up->SetSizer ( v1 ) ;
+
+ c1->SetSelection ( 0 ) ;
+Index: gentle2/ExternalInterface.cpp
+===================================================================
+--- gentle2.orig/ExternalInterface.cpp
++++ gentle2/ExternalInterface.cpp
+@@ -89,7 +89,7 @@ void ExternalInterface::initme ()
+ myapp()->frame->setDummyToolbar ( this ) ;
+ myapp()->frame->addDefaultTools ( toolbar ) ;
+ toolbar->Realize() ;
+- v0->Add ( toolbar , 0 , wxEXPAND|wxBOTTOM , 2 ) ;
++ v0->Add ( toolbar , 0 , wxEXPAND , 2 ) ;
+ }
+ v0->Add ( nb , 1 , wxEXPAND , 5 ) ;
+ SetSizer ( v0 ) ;
+Index: gentle2/ExternalNCBI.cpp
+===================================================================
+--- gentle2.orig/ExternalNCBI.cpp
++++ gentle2/ExternalNCBI.cpp
+@@ -60,8 +60,8 @@ void EIpanel::init_ncbi()
+ st_msg = new wxStaticText ( up , -1 , _T("") ) ;
+
+ v1->Add ( h0 , 0 , wxEXPAND , 0 ) ;
+- v1->Add ( h1 , 0 , wxEXPAND|wxTOP|wxBOTTOM , 3 ) ;
+- v1->Add ( st_msg , 0 , wxEXPAND|wxTOP|wxBOTTOM , 3 ) ;
++ v1->Add ( h1 , 0 , wxEXPAND , 3 ) ;
++ v1->Add ( st_msg , 0 , wxEXPAND , 3 ) ;
+ up->SetSizer ( v1 ) ;
+ v1->Fit ( up ) ;
+ v1->Show ( h1 , false ) ; // Hide PubMed specifics
+Index: gentle2/ManageDatabase.cpp
+===================================================================
+--- gentle2.orig/ManageDatabase.cpp
++++ gentle2/ManageDatabase.cpp
+@@ -159,10 +159,10 @@ void TManageDatabaseDialog::initCopynMov
+ pm_left->SetImageList ( il , wxIMAGE_LIST_SMALL ) ;
+ pm_right->SetImageList ( il , wxIMAGE_LIST_SMALL ) ;
+
+- h1->Add ( new wxStaticText ( p , -1 , txt("t_filter") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h1->Add ( filter_txt , 1 , wxEXPAND|wxALL , 2 ) ;
++ h1->Add ( new wxStaticText ( p , -1 , txt("t_filter") ) , 0 , wxEXPAND , 2 ) ;
++ h1->Add ( filter_txt , 1 , wxEXPAND , 2 ) ;
+
+- h2->Add ( f_twopanes , 0 , wxEXPAND|wxALL , 2 ) ;
++ h2->Add ( f_twopanes , 0 , wxEXPAND , 2 ) ;
+
+ if ( !isProject )
+ {
+@@ -174,25 +174,25 @@ void TManageDatabaseDialog::initCopynMov
+ f_seq = new wxCheckBox ( p , MD_PM_FILTER_SEQ , txt("sequences") ) ;
+ f_desc->SetValue ( 1 ) ;
+
+- h2->Add ( new wxStaticText ( p , -1 , _T("") ) , 1 , wxEXPAND|wxALL , 2 ) ; // Dummy to shove the rest to the right
+- h2->Add ( f_dna , 0 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( f_prot , 0 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( f_primer , 0 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( f_align , 0 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( f_desc , 0 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( f_seq , 0 , wxEXPAND|wxALL , 2 ) ;
++ h2->Add ( new wxStaticText ( p , -1 , _T("") ) , 1 , wxEXPAND , 2 ) ; // Dummy to shove the rest to the right
++ h2->Add ( f_dna , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( f_prot , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( f_primer , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( f_align , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( f_desc , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( f_seq , 0 , wxEXPAND , 2 ) ;
+ }
+
+- v1->Add ( pm_dd_l , 0 , wxEXPAND|wxALL , 2 ) ;
+- v1->Add ( pm_left , 1 , wxEXPAND|wxALL , 2 ) ;
+- v2->Add ( pm_dd_r , 0 , wxEXPAND|wxALL , 2 ) ;
+- v2->Add ( pm_right , 1 , wxEXPAND|wxALL , 2 ) ;
+- h3->Add ( v1 , 1 , wxEXPAND|wxALL , 2 ) ;
+- h3->Add ( v2 , 1 , wxEXPAND|wxALL , 2 ) ;
+-
+- v0->Add ( h1 , 0 , wxEXPAND|wxALL , 2 ) ;
+- v0->Add ( h2 , 0 , wxEXPAND|wxALL , 2 ) ;
+- v0->Add ( h3 , 1 , wxEXPAND|wxALL , 2 ) ;
++ v1->Add ( pm_dd_l , 0 , wxEXPAND , 2 ) ;
++ v1->Add ( pm_left , 1 , wxEXPAND , 2 ) ;
++ v2->Add ( pm_dd_r , 0 , wxEXPAND , 2 ) ;
++ v2->Add ( pm_right , 1 , wxEXPAND , 2 ) ;
++ h3->Add ( v1 , 1 , wxEXPAND , 2 ) ;
++ h3->Add ( v2 , 1 , wxEXPAND , 2 ) ;
++
++ v0->Add ( h1 , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( h2 , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( h3 , 1 , wxEXPAND , 2 ) ;
+
+ if ( !doSave )
+ {
+@@ -211,10 +211,10 @@ void TManageDatabaseDialog::initCopynMov
+ sb->SetDefault () ;
+ pm_name->SetSelection ( -1 , -1 ) ;
+ pm_name->SetFocus() ;
+- h4->Add ( pm_dd_save , 0 , wxEXPAND|wxALL , 2 ) ;
+- h4->Add ( pm_name , 1 , wxEXPAND|wxALL , 2 ) ;
+- h4->Add ( sb , 0 , wxEXPAND|wxALL , 2 ) ;
+- v0->Add ( h4 , 0 , wxEXPAND|wxALL , 2 ) ;
++ h4->Add ( pm_dd_save , 0 , wxEXPAND , 2 ) ;
++ h4->Add ( pm_name , 1 , wxEXPAND , 2 ) ;
++ h4->Add ( sb , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( h4 , 0 , wxEXPAND , 2 ) ;
+ }
+
+ p->SetSizer ( v0 ) ;
+@@ -570,7 +570,7 @@ void TManageDatabaseDialog::initDatabase
+ v1->Add ( pd_db_name , 0 , wxEXPAND , 5 ) ;
+ v1->Add ( pd_db_file , 0 , wxEXPAND , 5 ) ;
+ v1->Add ( new wxStaticText ( p , -1 , _T("") ) , 0 , wxEXPAND , 5 ) ;
+- v1->Add ( g1 , 1 , wxEXPAND | wxALL , 5 ) ;
++ v1->Add ( g1 , 1 , wxEXPAND , 5 ) ;
+
+ pd_db = new wxListBox ( p , MD_PD_DBLIST ) ;
+ h1->Add ( pd_db , 1 , wxEXPAND , 5 ) ;
+Index: gentle2/MiscDialogs.cpp
+===================================================================
+--- gentle2.orig/MiscDialogs.cpp
++++ gentle2/MiscDialogs.cpp
+@@ -70,11 +70,11 @@ TGraphDialog::TGraphDialog ( wxWindow *_
+ add_nb_graph () ;
+ add_nb_data () ;
+ add_nb_scales () ;
+-
++
+ h_buttons->Add ( new wxButton ( this , TGD_OK , txt("b_ok") ) , 1 , 0 ) ;
+ h_buttons->Add ( new wxStaticText ( this , -1 , _T(" ") ) , 1 , wxEXPAND ) ;
+ h_buttons->Add ( new wxButton ( this , wxID_CANCEL , txt("b_cancel") ) , 1 , 0 ) ;
+-
++
+ v0->Add ( nb , 1 , wxEXPAND , 0 ) ;
+ v0->Add ( h_buttons , 0 , wxALL|wxALIGN_CENTER_HORIZONTAL , 5 ) ;
+
+@@ -138,8 +138,8 @@ void TGraphDialog::add_nb_data ()
+ wxBoxSizer *h3 = new wxBoxSizer ( wxHORIZONTAL ) ;
+
+ data_name = new wxTextCtrl ( nb_data , -1 ) ;
+- h1->Add ( new wxStaticText ( nb_data , -1 , txt("name") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h1->Add ( data_name , 1 , wxEXPAND|wxALL , 2 ) ;
++ h1->Add ( new wxStaticText ( nb_data , -1 , txt("name") ) , 0 , wxEXPAND , 2 ) ;
++ h1->Add ( data_name , 1 , wxEXPAND , 2 ) ;
+
+ ch_data_scalex = new wxChoice ( nb_data , -1 ) ;
+ ch_data_scaley = new wxChoice ( nb_data , -1 ) ;
+@@ -148,28 +148,28 @@ void TGraphDialog::add_nb_data ()
+ ch_data_scalex->Append ( parent->gd->scales[a]->name ) ;
+ ch_data_scaley->Append ( parent->gd->scales[a]->name ) ;
+ }
+- h2->Add ( new wxStaticText ( nb_data , -1 , _T("Scale X") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( ch_data_scalex , 1 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( new wxStaticText ( nb_data , -1 , _T("Scale Y") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( ch_data_scaley , 1 , wxEXPAND|wxALL , 2 ) ;
++ h2->Add ( new wxStaticText ( nb_data , -1 , _T("Scale X") ) , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( ch_data_scalex , 1 , wxEXPAND , 2 ) ;
++ h2->Add ( new wxStaticText ( nb_data , -1 , _T("Scale Y") ) , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( ch_data_scaley , 1 , wxEXPAND , 2 ) ;
+
+ data_color = new wxTextCtrl ( nb_data , -1 , _T(" ") ) ;
+ ch_data_pointstyle = new wxChoice ( nb_data , -1 ) ;
+ ch_data_pointstyle->Append ( _T("none") ) ;
+ for ( a = 0 ; a < parent->gd->styles.GetCount() ; a++ )
+ ch_data_pointstyle->Append ( parent->gd->styles[a] ) ;
+- h3->Add ( new wxStaticText ( nb_data , -1 , _T("Point style") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h3->Add ( ch_data_pointstyle , 0 , wxEXPAND|wxALL , 2 ) ;
+- h3->Add ( new wxButton ( nb_data , TGD_BT_DATA , txt("color") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h3->Add ( data_color , 0 , wxEXPAND|wxALL , 2 ) ;
+-
+- v0->Add ( h1 , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h2 , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h3 , 0 , wxEXPAND|wxALL , 5 ) ;
+-
+- h0->Add ( lb_data , 0 , wxEXPAND|wxALL , 5 ) ;
+- h0->Add ( v0 , 0 , wxEXPAND|wxALL , 5 ) ;
+-
++ h3->Add ( new wxStaticText ( nb_data , -1 , _T("Point style") ) , 0 , wxEXPAND , 2 ) ;
++ h3->Add ( ch_data_pointstyle , 0 , wxEXPAND , 2 ) ;
++ h3->Add ( new wxButton ( nb_data , TGD_BT_DATA , txt("color") ) , 0 , wxEXPAND , 2 ) ;
++ h3->Add ( data_color , 0 , wxEXPAND , 2 ) ;
++
++ v0->Add ( h1 , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h2 , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h3 , 0 , wxEXPAND , 5 ) ;
++
++ h0->Add ( lb_data , 0 , wxEXPAND , 5 ) ;
++ h0->Add ( v0 , 0 , wxEXPAND , 5 ) ;
++
+ nb_data->SetSizer ( h0 ) ;
+ h0->Fit ( nb_data ) ;
+
+@@ -204,34 +204,34 @@ void TGraphDialog::add_nb_scales ()
+ wxBoxSizer *h3 = new wxBoxSizer ( wxHORIZONTAL ) ;
+
+ scales_name = new wxTextCtrl ( nb_scales , -1 ) ;
+- h1->Add ( new wxStaticText ( nb_scales , -1 , txt("name") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h1->Add ( scales_name , 1 , wxEXPAND|wxALL , 2 ) ;
++ h1->Add ( new wxStaticText ( nb_scales , -1 , txt("name") ) , 0 , wxEXPAND , 2 ) ;
++ h1->Add ( scales_name , 1 , wxEXPAND , 2 ) ;
+
+ scales_min = new wxTextCtrl ( nb_scales , -1 ) ;
+ scales_max = new wxTextCtrl ( nb_scales , -1 ) ;
+- h2->Add ( new wxStaticText ( nb_scales , -1 , _T("Min") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( scales_min , 1 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( new wxStaticText ( nb_scales , -1 , _T("Max") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( scales_max , 1 , wxEXPAND|wxALL , 2 ) ;
++ h2->Add ( new wxStaticText ( nb_scales , -1 , _T("Min") ) , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( scales_min , 1 , wxEXPAND , 2 ) ;
++ h2->Add ( new wxStaticText ( nb_scales , -1 , _T("Max") ) , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( scales_max , 1 , wxEXPAND , 2 ) ;
+
+ scales_color = new wxTextCtrl ( nb_scales , -1 , _T(" ") ) ;
+ scales_unit = new wxTextCtrl ( nb_scales , -1 ) ;
+ ch_scales_type = new wxChoice ( nb_scales , -1 ) ;
+ for ( a = 0 ; a < parent->gd->scaleTypes.GetCount() ; a++ )
+ ch_scales_type->Append ( parent->gd->scaleTypes[a] ) ;
+- h3->Add ( new wxStaticText ( nb_scales , -1 , _T("Unit") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h3->Add ( scales_unit , 0 , wxEXPAND|wxALL , 2 ) ;
+- h3->Add ( new wxStaticText ( nb_scales , -1 , _T("Type") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h3->Add ( ch_scales_type , 0 , wxEXPAND|wxALL , 2 ) ;
+- h3->Add ( new wxButton ( nb_scales , TGD_BT_SCALES , txt("color") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h3->Add ( scales_color , 0 , wxEXPAND|wxALL , 2 ) ;
+-
+- v0->Add ( h1 , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h2 , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h3 , 0 , wxEXPAND|wxALL , 5 ) ;
++ h3->Add ( new wxStaticText ( nb_scales , -1 , _T("Unit") ) , 0 , wxEXPAND , 2 ) ;
++ h3->Add ( scales_unit , 0 , wxEXPAND , 2 ) ;
++ h3->Add ( new wxStaticText ( nb_scales , -1 , _T("Type") ) , 0 , wxEXPAND , 2 ) ;
++ h3->Add ( ch_scales_type , 0 , wxEXPAND , 2 ) ;
++ h3->Add ( new wxButton ( nb_scales , TGD_BT_SCALES , txt("color") ) , 0 , wxEXPAND , 2 ) ;
++ h3->Add ( scales_color , 0 , wxEXPAND , 2 ) ;
++
++ v0->Add ( h1 , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h2 , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h3 , 0 , wxEXPAND , 5 ) ;
+
+- h0->Add ( lb_scales , 0 , wxEXPAND|wxALL , 5 ) ;
+- h0->Add ( v0 , 0 , wxEXPAND|wxALL , 5 ) ;
++ h0->Add ( lb_scales , 0 , wxEXPAND , 5 ) ;
++ h0->Add ( v0 , 0 , wxEXPAND , 5 ) ;
+
+ nb_scales->SetSizer ( h0 ) ;
+ h0->Fit ( nb_scales ) ;
+@@ -374,8 +374,8 @@ TSpeakDialog::TSpeakDialog(wxWindow *par
+ wxButton *b1 = new wxButton ( this , SPEAK_PLAY , txt("b_speak_play") ) ;
+ wxButton *b2 = new wxButton ( this , SPEAK_STOP , txt("b_speak_stop") ) ;
+
+- h0->Add ( b1 , 1 , wxEXPAND|wxALL , 5 ) ;
+- h0->Add ( b2 , 1 , wxEXPAND|wxALL , 5 ) ;
++ h0->Add ( b1 , 1 , wxEXPAND , 5 ) ;
++ h0->Add ( b2 , 1 , wxEXPAND , 5 ) ;
+
+ doPause = new wxCheckBox ( this , -1 , txt("t_speak_do_pause") ) ;
+ pause = new wxSpinCtrl ( this , -1 ) ;
+@@ -383,16 +383,16 @@ TSpeakDialog::TSpeakDialog(wxWindow *par
+ pause->SetRange ( 1 , 10 ) ;
+ pause->SetValue ( _T("3") ) ;
+
+- h1->Add ( doPause , 0 , wxEXPAND|wxALL , 5 ) ;
+- h1->Add ( pause , 0 , wxEXPAND|wxALL , 5 ) ;
+- h1->Add ( new wxStaticText ( this , -1 , txt("t_speak_pause") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+-
+- v0->Add ( seq , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h1 , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h0 , 0 , wxEXPAND|wxALL , 5 ) ;
++ h1->Add ( doPause , 0 , wxEXPAND , 5 ) ;
++ h1->Add ( pause , 0 , wxEXPAND , 5 ) ;
++ h1->Add ( new wxStaticText ( this , -1 , txt("t_speak_pause") ) , 0 , wxEXPAND , 5 ) ;
++
++ v0->Add ( seq , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h1 , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h0 , 0 , wxEXPAND , 5 ) ;
++
++
+
+-
+-
+ SetSizer ( v0 ) ;
+ v0->Fit ( this ) ;
+
+@@ -556,7 +556,7 @@ TSequencingPrimerDialog::TSequencingPrim
+ c_db = new wxChoice ( this , SPD_DB ) ;
+ h1->Add ( new wxStaticText ( this , -1 , txt("t_use_this_database") ) , 0 , wxEXPAND ) ;
+ h1->Add ( c_db , 0 , wxEXPAND ) ;
+-
++
+ myapp()->frame->LS->getDatabaseList ( db_names , db_files ) ;
+ for ( int a = 0 ; a < db_names.GetCount() ; a++ )
+ c_db->Append ( db_names[a] ) ;
+@@ -581,15 +581,15 @@ TSequencingPrimerDialog::TSequencingPrim
+ cb_35->SetValue ( TRUE ) ;
+ cb_53->SetValue ( TRUE ) ;
+
+- h3->Add ( new wxButton ( this , wxID_OK , txt("b_ok") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- h3->Add ( new wxButton ( this , wxID_CANCEL , txt("b_cancel") ) , 0 , wxEXPAND|wxALL , 5 ) ;
++ h3->Add ( new wxButton ( this , wxID_OK , txt("b_ok") ) , 0 , wxEXPAND , 5 ) ;
++ h3->Add ( new wxButton ( this , wxID_CANCEL , txt("b_cancel") ) , 0 , wxEXPAND , 5 ) ;
+
+ v0->Add ( h0 , 0 , wxALL , 5 ) ;
+- v0->Add ( h1 , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h1a , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h2a , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h2 , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h3 , 0 , wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL , 5 ) ;
++ v0->Add ( h1 , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h1a , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h2a , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h2 , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h3 , 0 , wxEXPAND , 5 ) ;
+
+ SetSizer ( v0 ) ;
+ v0->Fit ( this ) ;
+@@ -838,17 +838,17 @@ TMyMultipleChoiceDialog::TMyMultipleChoi
+ if ( options & wxCANCEL )
+ {
+ wxButton *b = new wxButton ( this , wxID_CANCEL , txt("b_cancel") ) ;
+- h0->Add ( b , wxEXPAND|wxALL , 2 ) ;
++ h0->Add ( b , wxEXPAND , 2 ) ;
+ }
+- else h0->Add ( new wxStaticText ( this , -1 , _T("") ) , wxEXPAND|wxALL , 2 ) ;
++ else h0->Add ( new wxStaticText ( this , -1 , _T("") ) , wxEXPAND , 2 ) ;
+
+ if ( options & wxOK )
+ {
+ wxButton *b = new wxButton ( this , MCD_OK , txt("b_ok") ) ;
+- h0->Add ( b , wxEXPAND|wxALL , 2 ) ;
++ h0->Add ( b , wxEXPAND , 2 ) ;
+ b->SetDefault() ;
+ }
+- else h0->Add ( new wxStaticText ( this , -1 , _T("") ) , wxEXPAND|wxALL , 2 ) ;
++ else h0->Add ( new wxStaticText ( this , -1 , _T("") ) , wxEXPAND , 2 ) ;
+
+ clb = new wxCheckListBox ( this ,
+ -1 ,
+@@ -858,9 +858,9 @@ TMyMultipleChoiceDialog::TMyMultipleChoi
+ choices ) ;
+
+ if ( !message.IsEmpty() )
+- v0->Add ( new wxStaticText ( this , -1 , message ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- v0->Add ( clb , 1 , wxEXPAND|wxALL , 2 ) ;
+- v0->Add ( h0 , 0 , wxEXPAND|wxALL , 2 ) ;
++ v0->Add ( new wxStaticText ( this , -1 , message ) , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( clb , 1 , wxEXPAND , 2 ) ;
++ v0->Add ( h0 , 0 , wxEXPAND , 2 ) ;
+
+ SetSizer ( v0 ) ;
+ v0->Layout () ;
+Index: gentle2/PCR_Troubleshoot.cpp
+===================================================================
+--- gentle2.orig/PCR_Troubleshoot.cpp
++++ gentle2/PCR_Troubleshoot.cpp
+@@ -37,15 +37,15 @@ PCR_troubleshoot_dialog::PCR_troubleshoo
+ text = new wxTextCtrl ( this , -1 , _T("") , wxDefaultPosition , wxDefaultSize , wxTE_MULTILINE ) ;
+ text->SetFont ( *MYFONT ( MYFONTSIZE , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+
+- h0->Add ( new wxStaticText ( this , -1 , _T("")) , 1 , wxEXPAND|wxALL , 5 ) ;
+- h0->Add ( new wxButton ( this , POD_OK , txt("b_ok") ) , 1 , wxEXPAND|wxALL , 5 ) ;
+- h0->Add ( new wxStaticText ( this , -1 , _T("") ) , 1 , wxEXPAND|wxALL , 5 ) ;
+- h0->Add ( new wxButton ( this , POD_CANCEL , txt("b_cancel") ) , 1 , wxEXPAND|wxALL , 5 ) ;
+- h0->Add ( new wxStaticText ( this , -1 , _T("") ) , 1 , wxEXPAND|wxALL , 5 ) ;
++ h0->Add ( new wxStaticText ( this , -1 , _T("")) , 1 , wxEXPAND , 5 ) ;
++ h0->Add ( new wxButton ( this , POD_OK , txt("b_ok") ) , 1 , wxEXPAND , 5 ) ;
++ h0->Add ( new wxStaticText ( this , -1 , _T("") ) , 1 , wxEXPAND , 5 ) ;
++ h0->Add ( new wxButton ( this , POD_CANCEL , txt("b_cancel") ) , 1 , wxEXPAND , 5 ) ;
++ h0->Add ( new wxStaticText ( this , -1 , _T("") ) , 1 , wxEXPAND , 5 ) ;
+
+- v0->Add ( list , 1 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( text , 2 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h0 , 0 , wxEXPAND|wxALL , 5 ) ;
++ v0->Add ( list , 1 , wxEXPAND , 5 ) ;
++ v0->Add ( text , 2 , wxEXPAND , 5 ) ;
++ v0->Add ( h0 , 0 , wxEXPAND , 5 ) ;
+
+ scan () ;
+ for ( int a = 0 ; a < l_title.GetCount() ; a++ )
+Index: gentle2/PrimerDesign.cpp
+===================================================================
+--- gentle2.orig/PrimerDesign.cpp
++++ gentle2/PrimerDesign.cpp
+@@ -485,9 +485,9 @@ void TPrimerDesign::initme ()
+
+ GetToolBar()->ToggleTool(MDI_TOGGLE_FEATURES,show_features);
+
+- h0->Add ( lc , 1 , wxEXPAND|wxALL , 2 ) ;
+- h0->Add ( v1 , 0 , wxEXPAND|wxALL , 2 ) ;
+- h0->Add ( stat , 1 , wxEXPAND|wxALL , 2 ) ;
++ h0->Add ( lc , 1 , wxEXPAND , 2 ) ;
++ h0->Add ( v1 , 0 , wxEXPAND , 2 ) ;
++ h0->Add ( stat , 1 , wxEXPAND , 2 ) ;
+
+ v0->Add ( toolbar , 0 , wxEXPAND , 2 ) ;
+ v0->Add ( h0 , 0 , wxEXPAND , 2 ) ;
+Index: gentle2/ProgramOptionsDialog.cpp
+===================================================================
+--- gentle2.orig/ProgramOptionsDialog.cpp
++++ gentle2/ProgramOptionsDialog.cpp
+@@ -220,8 +220,8 @@ ProgramOptionsDialog::ProgramOptionsDial
+ h0->Add ( CANCEL , 1 , 0 ) ;
+ h0->Add ( new wxStaticText ( this , -1 , _T("") ) , 1 , 0 ) ;
+
+- v0->Add ( nb , 1 , wxALL|wxEXPAND , 5 ) ;
+- v0->Add ( h0 , 0 , wxALL|wxEXPAND , 5 ) ;
++ v0->Add ( nb , 1 , wxEXPAND , 5 ) ;
++ v0->Add ( h0 , 0 , wxEXPAND , 5 ) ;
+
+ SetSizer ( v0 ) ;
+ v0->Fit ( this ) ;
+@@ -266,12 +266,12 @@ void ProgramOptionsDialog::initGlobalSet
+ proxyPort = new wxTextCtrl ( globalSettingsPanel , -1 , myapp()->frame->proxy.AfterLast(':') ) ;
+
+ // ORF length
+- wxBoxSizer *orf_sizer = new wxBoxSizer ( wxHORIZONTAL ) ;
++ wxBoxSizer *orf_sizer = new wxBoxSizer ( wxHORIZONTAL ) ;
+ orfLength = new wxTextCtrl ( globalSettingsPanel , -1 , wxString::Format ( _T("%d") , myapp()->frame->orfLength ) ) ;
+- orf_sizer->Add ( new wxStaticText ( globalSettingsPanel , -1 , _T("ORF length") ) , 0 , wxEXPAND|wxALL , 3 ) ;
+- orf_sizer->Add ( orfLength , 1 , wxEXPAND|wxALL , 3 ) ;
++ orf_sizer->Add ( new wxStaticText ( globalSettingsPanel , -1 , _T("ORF length") ) , 0 , wxEXPAND , 3 ) ;
++ orf_sizer->Add ( orfLength , 1 , wxEXPAND , 3 ) ;
++
+
+-
+ // Display options
+ enhancedDisplay = new wxCheckBox ( globalSettingsPanel , -1 ,
+ txt("t_enhanced_display") ) ;
+@@ -359,44 +359,44 @@ void ProgramOptionsDialog::initGlobalSet
+ else nonstandard_translation_table->SetSelection ( 0 ) ;
+
+ wxBoxSizer *proxy_sizer = new wxBoxSizer ( wxHORIZONTAL ) ;
+- proxy_sizer->Add ( new wxStaticText ( globalSettingsPanel , -1 , txt("t_proxy_name") ) , 0 , wxEXPAND|wxALL , 3 ) ;
+- proxy_sizer->Add ( proxyName , 1 , wxEXPAND|wxALL , 3 ) ;
+- proxy_sizer->Add ( new wxStaticText ( globalSettingsPanel , -1 , txt("t_proxy_port") ) , 0 , wxEXPAND|wxALL , 3 ) ;
+- proxy_sizer->Add ( proxyPort , 0 , wxEXPAND|wxALL , 3 ) ;
++ proxy_sizer->Add ( new wxStaticText ( globalSettingsPanel , -1 , txt("t_proxy_name") ) , 0 , wxEXPAND , 3 ) ;
++ proxy_sizer->Add ( proxyName , 1 , wxEXPAND , 3 ) ;
++ proxy_sizer->Add ( new wxStaticText ( globalSettingsPanel , -1 , txt("t_proxy_port") ) , 0 , wxEXPAND , 3 ) ;
++ proxy_sizer->Add ( proxyPort , 0 , wxEXPAND , 3 ) ;
+
+ wxBoxSizer *v = new wxBoxSizer ( wxHORIZONTAL ) ;
+ wxBoxSizer *h = new wxBoxSizer ( wxHORIZONTAL ) ;
+- h->Add ( new wxStaticText ( globalSettingsPanel , -1 , txt("t_language") ) , 0 , wxEXPAND|wxALL , 3 ) ;
+- h->Add ( language , 0 , wxEXPAND|wxALL , 3 ) ;
++ h->Add ( new wxStaticText ( globalSettingsPanel , -1 , txt("t_language") ) , 0 , wxEXPAND , 3 ) ;
++ h->Add ( language , 0 , wxEXPAND , 3 ) ;
+
+- v->Add ( general_options , 0 , wxEXPAND|wxALL , 3 ) ;
+- v->Add ( display_options , 0 , wxEXPAND|wxALL , 3 ) ;
+-
+- general_options->Add ( h , 0 , wxEXPAND|wxALL , 3 ) ;
+- general_options->Add ( loadLastProject , 0 , wxEXPAND|wxALL , 3 ) ;
+- general_options->Add ( useMetafile , 0 , wxEXPAND|wxALL , 3 ) ;
+- general_options->Add ( checkUpdate , 0 , wxEXPAND|wxALL , 3 ) ;
+- general_options->Add ( useInternalHelp , 0 , wxEXPAND|wxALL , 3 ) ;
+- general_options->Add ( useOnlineHelp , 0 , wxEXPAND|wxALL , 3 ) ;
+- general_options->Add ( doRegisterStuff , 0 , wxEXPAND|wxALL , 3 ) ;
+- general_options->Add ( new wxStaticText ( globalSettingsPanel , -1 , _T("") ) , 0 , wxEXPAND|wxALL , 3 ) ;
+- general_options->Add ( use_nonstandard_translation_table , 0 , wxEXPAND|wxALL , 3 ) ;
+- general_options->Add ( nonstandard_translation_table , 0 , wxEXPAND|wxALL , 3 ) ;
+- general_options->Add ( proxy_sizer , 0 , wxEXPAND|wxALL , 3 ) ;
+- general_options->Add ( orf_sizer , 0 , wxEXPAND|wxALL , 3 ) ;
+-
+- display_options->Add ( enhancedDisplay , 0 , wxEXPAND|wxALL , 3 ) ;
+- display_options->Add ( vectorTitle , 0 , wxEXPAND|wxALL , 3 ) ;
+- display_options->Add ( vectorLength , 0 , wxEXPAND|wxALL , 3 ) ;
+- display_options->Add ( showSplashScreen , 0 , wxEXPAND|wxALL , 3 ) ;
+- display_options->Add ( showEnzymePos , 0 , wxEXPAND|wxALL , 3 ) ;
+- display_options->Add ( showTips , 0 , wxEXPAND|wxALL , 3 ) ;
+- display_options->Add ( useTwoToolbars , 0 , wxEXPAND|wxALL , 3 ) ;
+- display_options->Add ( showToolTips , 0 , wxEXPAND|wxALL , 3 ) ;
+- display_options->Add ( showLowercaseDNA , 0 , wxEXPAND|wxALL , 3 ) ;
+- display_options->Add ( editFeatureMode , 0 , wxEXPAND|wxALL , 3 ) ;
+- display_options->Add ( showStopCodon , 1 , wxEXPAND|wxALL , 3 ) ;
+- display_options->Add ( b_aacol, 0 , wxEXPAND|wxALL , 3 ) ;
++ v->Add ( general_options , 0 , wxEXPAND , 3 ) ;
++ v->Add ( display_options , 0 , wxEXPAND , 3 ) ;
++
++ general_options->Add ( h , 0 , wxEXPAND , 3 ) ;
++ general_options->Add ( loadLastProject , 0 , wxEXPAND , 3 ) ;
++ general_options->Add ( useMetafile , 0 , wxEXPAND , 3 ) ;
++ general_options->Add ( checkUpdate , 0 , wxEXPAND , 3 ) ;
++ general_options->Add ( useInternalHelp , 0 , wxEXPAND , 3 ) ;
++ general_options->Add ( useOnlineHelp , 0 , wxEXPAND , 3 ) ;
++ general_options->Add ( doRegisterStuff , 0 , wxEXPAND , 3 ) ;
++ general_options->Add ( new wxStaticText ( globalSettingsPanel , -1 , _T("") ) , 0 , wxEXPAND , 3 ) ;
++ general_options->Add ( use_nonstandard_translation_table , 0 , wxEXPAND , 3 ) ;
++ general_options->Add ( nonstandard_translation_table , 0 , wxEXPAND , 3 ) ;
++ general_options->Add ( proxy_sizer , 0 , wxEXPAND , 3 ) ;
++ general_options->Add ( orf_sizer , 0 , wxEXPAND , 3 ) ;
++
++ display_options->Add ( enhancedDisplay , 0 , wxEXPAND , 3 ) ;
++ display_options->Add ( vectorTitle , 0 , wxEXPAND , 3 ) ;
++ display_options->Add ( vectorLength , 0 , wxEXPAND , 3 ) ;
++ display_options->Add ( showSplashScreen , 0 , wxEXPAND , 3 ) ;
++ display_options->Add ( showEnzymePos , 0 , wxEXPAND , 3 ) ;
++ display_options->Add ( showTips , 0 , wxEXPAND , 3 ) ;
++ display_options->Add ( useTwoToolbars , 0 , wxEXPAND , 3 ) ;
++ display_options->Add ( showToolTips , 0 , wxEXPAND , 3 ) ;
++ display_options->Add ( showLowercaseDNA , 0 , wxEXPAND , 3 ) ;
++ display_options->Add ( editFeatureMode , 0 , wxEXPAND , 3 ) ;
++ display_options->Add ( showStopCodon , 1 , wxEXPAND , 3 ) ;
++ display_options->Add ( b_aacol, 0 , wxEXPAND , 3 ) ;
+
+ globalSettingsPanel->SetSizer ( v ) ;
+ v->Fit ( globalSettingsPanel ) ;
+Index: gentle2/TAlignmentDialog.cpp
+===================================================================
+--- gentle2.orig/TAlignmentDialog.cpp
++++ gentle2/TAlignmentDialog.cpp
+@@ -50,7 +50,7 @@ TAlignmentDialog::TAlignmentDialog(wxWin
+ h0->Add ( b , 1 , wxALL , 5 ) ;
+ h0->Add ( c , 1 , wxALL , 5 ) ;
+
+- v0->Add ( nb , 1 , wxEXPAND|wxALL , 5 ) ;
++ v0->Add ( nb , 1 , wxEXPAND , 5 ) ;
+ v0->Add ( h0 , 0 , wxCENTRE , 5 ) ;
+ SetSizer ( v0 ) ;
+ #else
+@@ -139,9 +139,9 @@ void TAlignmentDialog::init_what ()
+ }
+ */
+
+- h0->Add ( v0 , 1 , wxEXPAND|wxALL , 5 ) ;
++ h0->Add ( v0 , 1 , wxEXPAND , 5 ) ;
+ h0->Add ( v1 , 1 , wxALL , 5 ) ;
+- h0->Add ( v2 , 1 , wxEXPAND|wxALL , 5 ) ;
++ h0->Add ( v2 , 1 , wxEXPAND , 5 ) ;
+ vx->Add ( h0 , 1 , wxEXPAND ) ;
+ vx->Add ( new wxStaticText ( p , -1 , txt("t_alignment_txt") ) , 0 , wxEXPAND|wxALIGN_CENTER_HORIZONTAL ) ;
+ p->SetSizer ( vx ) ;
+Index: gentle2/TEliteLaChromLogDialog.cpp
+===================================================================
+--- gentle2.orig/TEliteLaChromLogDialog.cpp
++++ gentle2/TEliteLaChromLogDialog.cpp
+@@ -62,14 +62,14 @@ TEliteLaChromLogDialog::TEliteLaChromLog
+ for ( a = 0 ; a < col_headers.GetCount() ; a++ )
+ lines->InsertColumn ( a , col_headers[a] ) ;
+
+- h0->Add ( unique_dates , 1 , wxEXPAND|wxALL , 2 ) ;
+- h0->Add ( unique_users , 1 , wxEXPAND|wxALL , 2 ) ;
++ h0->Add ( unique_dates , 1 , wxEXPAND , 2 ) ;
++ h0->Add ( unique_users , 1 , wxEXPAND , 2 ) ;
+
+- h1->Add ( b_excel , 0 , wxEXPAND|wxALL , 2 ) ;
++ h1->Add ( b_excel , 0 , wxEXPAND , 2 ) ;
+
+- v0->Add ( h0 , 1 , wxEXPAND|wxALL , 2 ) ;
+- v0->Add ( lines , 1 , wxEXPAND|wxALL , 2 ) ;
+- v0->Add ( h1 , 0 , wxEXPAND|wxALL , 2 ) ;
++ v0->Add ( h0 , 1 , wxEXPAND , 2 ) ;
++ v0->Add ( lines , 1 , wxEXPAND , 2 ) ;
++ v0->Add ( h1 , 0 , wxEXPAND , 2 ) ;
+
+ // Fill interface with data
+ unique_users->Append ( txt("t_eld_all_users") ) ;
+Index: gentle2/TImageDisplay.cpp
+===================================================================
+--- gentle2.orig/TImageDisplay.cpp
++++ gentle2/TImageDisplay.cpp
+@@ -95,12 +95,12 @@ void TImageDisplay::initme ()
+ cb = new wxCheckBox ( this , IV_CB , txt("img_show_text" ) ) ;
+ invert = new wxCheckBox ( this , IV_CB_INVERT , txt("t_invert" ) ) ;
+
+- v0->Add ( bu , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( lb , 1 , wxEXPAND|wxALL , 5 ) ;
++ v0->Add ( bu , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( lb , 1 , wxEXPAND , 5 ) ;
+
+ h1->Add ( cb , 0 , wxEXPAND , 5 ) ;
+ h1->Add ( invert , 0 , wxEXPAND , 5 ) ;
+- v0->Add ( h1 , 0 , wxEXPAND|wxALL , 5 ) ;
++ v0->Add ( h1 , 0 , wxEXPAND , 5 ) ;
+
+ h0->Add ( v0 , 0 , wxEXPAND , 5 ) ;
+ h0->Add ( right , 1 , wxEXPAND , 5 ) ;
+@@ -113,7 +113,7 @@ void TImageDisplay::initme ()
+ myapp()->frame->addTool ( toolbar , MDI_COPY ) ;
+ myapp()->frame->addDefaultTools ( toolbar ) ;
+ toolbar->Realize() ;
+- vx->Add ( toolbar , 0 , wxEXPAND|wxBOTTOM , 2 ) ;
++ vx->Add ( toolbar , 0 , wxEXPAND , 2 ) ;
+ }
+
+ vx->Add ( h0 , 1 , wxEXPAND , 5 ) ;
+Index: gentle2/TItemEditDialog.cpp
+===================================================================
+--- gentle2.orig/TItemEditDialog.cpp
++++ gentle2/TItemEditDialog.cpp
+@@ -79,9 +79,9 @@ TItemEditDialog::TItemEditDialog ( wxWin
+ h1->Add ( button_cancel , 0 , wxEXPAND ) ;
+ #endif
+
+- v0->Add ( rb , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h0 , 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( lb , 1 , wxEXPAND|wxALL , 5 ) ;
++ v0->Add ( rb , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h0 , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( lb , 1 , wxEXPAND , 5 ) ;
+ v0->Add ( h1 , 0 , wxCENTER|wxALL , 5 ) ;
+
+ button_OK->SetDefault() ;
+Index: gentle2/TLigationDialog.cpp
+===================================================================
+--- gentle2.orig/TLigationDialog.cpp
++++ gentle2/TLigationDialog.cpp
+@@ -44,9 +44,9 @@ void TLigationDialog::init ()
+ l_sources = new wxCheckListBox ( this , LD_SOURCES ) ;
+ l_targets = new wxCheckListBox ( this , LD_TARGETS ) ;
+ v1a->Add ( new wxStaticText ( this , -1 , txt("frag2lig") ) , 0 , wxEXPAND ) ;
+- v1a->Add ( l_sources , 1 , wxEXPAND|wxTOP , 5 ) ;
++ v1a->Add ( l_sources , 1 , wxEXPAND , 5 ) ;
+ v1b->Add ( new wxStaticText ( this , -1 , txt("what2create") ) , 0 , wxEXPAND ) ;
+- v1b->Add ( l_targets , 1 , wxEXPAND|wxTOP , 5 ) ;
++ v1b->Add ( l_targets , 1 , wxEXPAND , 5 ) ;
+ h1->Add ( v1a , 1 , wxEXPAND ) ;
+ h1->Add ( v1b , 1 , wxEXPAND ) ;
+
+@@ -57,8 +57,8 @@ void TLigationDialog::init ()
+ h0->Add ( new wxButton ( this , LD_CANCEL , txt("b_cancel") ) , 0 ) ;
+
+ v0->Add ( h1 , 1 , wxEXPAND ) ;
+- v0->Add ( message , 0 , wxEXPAND|wxTOP , 5 ) ;
+- v0->Add ( h0 , 0 , wxEXPAND|wxTOP , 5 ) ;
++ v0->Add ( message , 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h0 , 0 , wxEXPAND , 5 ) ;
+
+ this->SetSizer ( v0 ) ;
+ // v0->Fit ( this ) ;
+Index: gentle2/TProteolysis.cpp
+===================================================================
+--- gentle2.orig/TProteolysis.cpp
++++ gentle2/TProteolysis.cpp
+@@ -119,31 +119,31 @@ TProteolysis::TProteolysis(TAminoAcids *
+ wxBoxSizer *vr = new wxBoxSizer ( wxVERTICAL ) ;
+ wxBoxSizer *vg = new wxBoxSizer ( wxVERTICAL ) ;
+
+- va->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_separate") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- va->Add ( sep_fragments , 2 , wxEXPAND|wxALL , 5 ) ;
+- va->Add ( sep_num_prot , 0 , wxEXPAND|wxALL , 5 ) ;
+- va->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_auto_results") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- va->Add ( sep_results , 2 , wxEXPAND|wxALL , 5 ) ;
+- va->Add ( sep_desc , 1 , wxEXPAND|wxALL , 5 ) ;
+-
+- vl->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_proteases") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- vl->Add ( proteases , 1 , wxEXPAND|wxALL , 5 ) ;
+- vl->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_skip") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- vl->Add ( ignore , 1 , wxEXPAND|wxALL , 5 ) ;
+-
+- h3->Add ( new wxButton ( this , PRO_FRAGMENTS_ALL , txt("b_all") ) , 0 , wxALL|wxEXPAND , 2 ) ;
+- h3->Add ( new wxButton ( this , PRO_FRAGMENTS_NONE , txt("b_none") ) , 0 , wxALL|wxEXPAND , 2 ) ;
+-
+- vr->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_cuts") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- vr->Add ( cuts , 1 , wxEXPAND|wxALL , 5 ) ;
+- vr->Add ( partial_digestion , 0 , wxEXPAND|wxALL , 5 ) ;
+- vr->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_results") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- vr->Add ( results , 1 , wxEXPAND|wxALL , 5 ) ;
+- vr->Add ( sortresults , 0 , wxEXPAND|wxALL , 5 ) ;
+- vr->Add ( h3 , 0 , wxEXPAND|wxALL , 5 ) ;
++ va->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_separate") ) , 0 , wxEXPAND , 5 ) ;
++ va->Add ( sep_fragments , 2 , wxEXPAND , 5 ) ;
++ va->Add ( sep_num_prot , 0 , wxEXPAND , 5 ) ;
++ va->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_auto_results") ) , 0 , wxEXPAND , 5 ) ;
++ va->Add ( sep_results , 2 , wxEXPAND , 5 ) ;
++ va->Add ( sep_desc , 1 , wxEXPAND , 5 ) ;
++
++ vl->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_proteases") ) , 0 , wxEXPAND , 5 ) ;
++ vl->Add ( proteases , 1 , wxEXPAND , 5 ) ;
++ vl->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_skip") ) , 0 , wxEXPAND , 5 ) ;
++ vl->Add ( ignore , 1 , wxEXPAND , 5 ) ;
++
++ h3->Add ( new wxButton ( this , PRO_FRAGMENTS_ALL , txt("b_all") ) , 0 , wxEXPAND , 2 ) ;
++ h3->Add ( new wxButton ( this , PRO_FRAGMENTS_NONE , txt("b_none") ) , 0 , wxEXPAND , 2 ) ;
++
++ vr->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_cuts") ) , 0 , wxEXPAND , 5 ) ;
++ vr->Add ( cuts , 1 , wxEXPAND , 5 ) ;
++ vr->Add ( partial_digestion , 0 , wxEXPAND , 5 ) ;
++ vr->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_results") ) , 0 , wxEXPAND , 5 ) ;
++ vr->Add ( results , 1 , wxEXPAND , 5 ) ;
++ vr->Add ( sortresults , 0 , wxEXPAND , 5 ) ;
++ vr->Add ( h3 , 0 , wxEXPAND , 5 ) ;
+
+- vg->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_gel") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- vg->Add ( gel , 1 , wxEXPAND|wxALL , 5 ) ;
++ vg->Add ( new wxStaticText ( this , -1 , txt("t_proteolysis_gel") ) , 0 , wxEXPAND , 5 ) ;
++ vg->Add ( gel , 1 , wxEXPAND , 5 ) ;
+
+
+ h0->Add ( va , 2 , wxEXPAND ) ;
+@@ -151,17 +151,17 @@ TProteolysis::TProteolysis(TAminoAcids *
+ h0->Add ( vr , 2 , wxEXPAND ) ;
+ h0->Add ( vg , 1 , wxEXPAND ) ;
+
+- h1->Add ( create_fragments , 0 , wxALL|wxEXPAND , 2 ) ;
+- h1->Add ( create_labels , 0 , wxALL|wxEXPAND , 2 ) ;
+- h1->Add ( use_proteases , 0 , wxALL|wxEXPAND , 2 ) ;
+- h1->Add ( show_uncut , 0 , wxALL|wxEXPAND , 2 ) ;
+- h1->Add ( new wxButton ( this , PRO_CREATE_REPORT , txt("b_pro_report") ) , 0 , wxALL|wxEXPAND , 2 ) ;
+-
+- h2->Add ( new wxStaticText ( this , -1 , txt("") ) , 2 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( new wxButton ( this , POD_OK , txt("b_ok") ) , 1 , wxALL|wxEXPAND , 2 ) ;
+- h2->Add ( new wxStaticText ( this , -1 , txt("") ) , 1 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( new wxButton ( this , POD_CANCEL , txt("b_cancel") ) , 1 , wxALL|wxEXPAND , 2 ) ;
+- h2->Add ( new wxStaticText ( this , -1 , txt("") ) , 2 , wxEXPAND|wxALL , 2 ) ;
++ h1->Add ( create_fragments , 0 , wxEXPAND , 2 ) ;
++ h1->Add ( create_labels , 0 , wxEXPAND , 2 ) ;
++ h1->Add ( use_proteases , 0 , wxEXPAND , 2 ) ;
++ h1->Add ( show_uncut , 0 , wxEXPAND , 2 ) ;
++ h1->Add ( new wxButton ( this , PRO_CREATE_REPORT , txt("b_pro_report") ) , 0 , wxEXPAND , 2 ) ;
++
++ h2->Add ( new wxStaticText ( this , -1 , txt("") ) , 2 , wxEXPAND , 2 ) ;
++ h2->Add ( new wxButton ( this , POD_OK , txt("b_ok") ) , 1 , wxEXPAND , 2 ) ;
++ h2->Add ( new wxStaticText ( this , -1 , txt("") ) , 1 , wxEXPAND , 2 ) ;
++ h2->Add ( new wxButton ( this , POD_CANCEL , txt("b_cancel") ) , 1 , wxEXPAND , 2 ) ;
++ h2->Add ( new wxStaticText ( this , -1 , txt("") ) , 2 , wxEXPAND , 2 ) ;
+
+ v0->Add ( h0 , 1 , wxEXPAND ) ;
+ v0->Add ( h1 , 0 , wxEXPAND ) ;
+Index: gentle2/TRestrictionEditor.cpp
+===================================================================
+--- gentle2.orig/TRestrictionEditor.cpp
++++ gentle2/TRestrictionEditor.cpp
+@@ -173,7 +173,7 @@ void TRestrictionEditor::initRestriction
+ nfstv->SetSize ( 70 , th * 2 ) ;
+ h1d->Add ( nfstv , 0 , wxALL|wxALIGN_CENTER_VERTICAL , 5 ) ;
+ h1d->Add ( new wxStaticText ( this , -1 , txt("base pairs.") ) ,
+- 1 , wxEXPAND|wxALIGN_CENTER_VERTICAL , 5 ) ;
++ 1 , wxEXPAND , 5 ) ;
+
+
+ wxBoxSizer *v3a = new wxBoxSizer ( wxVERTICAL ) ;
+@@ -237,9 +237,9 @@ void TRestrictionEditor::initRestriction
+ v2b->Add ( h1e , 1 , wxEXPAND , 5 ) ;
+ v2b->Add ( h1f , 1 , wxEXPAND , 5 ) ;
+
+- h1->Add ( v2a , 1 , wxEXPAND|wxALL , 5 ) ;
+- h1->Add ( v2b , 1 , wxEXPAND|wxALL , 5 ) ;
+- h1->Add ( v2c , 1 , wxEXPAND|wxALL , 5 ) ;
++ h1->Add ( v2a , 1 , wxEXPAND , 5 ) ;
++ h1->Add ( v2b , 1 , wxEXPAND , 5 ) ;
++ h1->Add ( v2c , 1 , wxEXPAND , 5 ) ;
+
+ // "This enzyme cuts" list
+ rsl = new wxListCtrl ( this , -1 , wxDefaultPosition , wxDefaultSize ,
+@@ -259,8 +259,8 @@ void TRestrictionEditor::initRestriction
+
+ rsl->SetSize ( w/3 , h/3 ) ;
+
+- h2->Add ( rsl , 1 , wxEXPAND|wxALL , 5 ) ;
+- h2->Add ( rsl2 , 1 , wxEXPAND|wxALL , 5 ) ;
++ h2->Add ( rsl , 1 , wxEXPAND , 5 ) ;
++ h2->Add ( rsl2 , 1 , wxEXPAND , 5 ) ;
+
+ v1->Add ( h1 , 1 , wxEXPAND , 5 ) ;
+ v1->Add ( h2 , 1 , wxEXPAND , 5 ) ;
+Index: gentle2/TRestrictionIdentifier.cpp
+===================================================================
+--- gentle2.orig/TRestrictionIdentifier.cpp
++++ gentle2/TRestrictionIdentifier.cpp
+@@ -66,27 +66,27 @@ void TRestrictionIdentifier::initme ()
+ group_list = new wxChoice ( this , RI_GROUP ) ;
+ enzymes_list = new wxListBox ( this , RI_ENZYMES_LIST ) ;
+
+- h1->Add ( new wxStaticText(this,-1,txt("t_minumum")+_T(" ")) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h1->Add ( bp_list , 0 , wxEXPAND|wxALL , 2 ) ;
+- h1->Add ( new wxStaticText(this,-1,txt("t_bp")) , 0 , wxEXPAND|wxALL , 2 ) ;
++ h1->Add ( new wxStaticText(this,-1,txt("t_minumum")+_T(" ")) , 0 , wxEXPAND , 2 ) ;
++ h1->Add ( bp_list , 0 , wxEXPAND , 2 ) ;
++ h1->Add ( new wxStaticText(this,-1,txt("t_bp")) , 0 , wxEXPAND , 2 ) ;
+
+- h2->Add ( new wxStaticText(this,-1,txt("t_minumum")+_T(" ")) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( percent_list , 0 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( new wxStaticText(this,-1,_T("%")) , 0 , wxEXPAND|wxALL , 2 ) ;
++ h2->Add ( new wxStaticText(this,-1,txt("t_minumum")+_T(" ")) , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( percent_list , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( new wxStaticText(this,-1,_T("%")) , 0 , wxEXPAND , 2 ) ;
+
+-// h3->Add ( new wxStaticText(this,-1,txt("enzyme_groups")+_T(" ")) , 0 , wxEXPAND|wxALL , 2 ) ;
+-// h3->Add ( group_list , 0 , wxEXPAND|wxALL , 2 ) ;
++// h3->Add ( new wxStaticText(this,-1,txt("enzyme_groups")+_T(" ")) , 0 , wxEXPAND , 2 ) ;
++// h3->Add ( group_list , 0 , wxEXPAND , 2 ) ;
+
+- v->Add ( new wxStaticText(this,-1,txt("band_difference")) , 0 , wxEXPAND|wxALL , 2 ) ;
+- v->Add ( h1 , 0 , wxEXPAND|wxALL , 2 ) ;
+- v->Add ( h2 , 0 , wxEXPAND|wxALL , 2 ) ;
+-// v->Add ( h3 , 0 , wxEXPAND|wxALL , 5 ) ;
++ v->Add ( new wxStaticText(this,-1,txt("band_difference")) , 0 , wxEXPAND , 2 ) ;
++ v->Add ( h1 , 0 , wxEXPAND , 2 ) ;
++ v->Add ( h2 , 0 , wxEXPAND , 2 ) ;
++// v->Add ( h3 , 0 , wxEXPAND , 5 ) ;
+
+- v->Add ( new wxStaticText(this,-1,txt("enzyme_groups")) , 0 , wxEXPAND|wxALL , 2 ) ;
+- v->Add ( group_list , 0 , wxEXPAND|wxALL , 2 ) ;
++ v->Add ( new wxStaticText(this,-1,txt("enzyme_groups")) , 0 , wxEXPAND , 2 ) ;
++ v->Add ( group_list , 0 , wxEXPAND , 2 ) ;
+
+- v->Add ( enzymes_list , 2 , wxEXPAND|wxALL , 2 ) ;
+- v->Add ( dna_list , 1 , wxEXPAND|wxALL , 2 ) ;
++ v->Add ( enzymes_list , 2 , wxEXPAND , 2 ) ;
++ v->Add ( dna_list , 1 , wxEXPAND , 2 ) ;
+
+ main->Add ( v , 0 , wxEXPAND , 2 ) ;
+ main->Add ( right , 1 , wxEXPAND , 2 ) ;
+Index: gentle2/TSequencingAssistantDialog.cpp
+===================================================================
+--- gentle2.orig/TSequencingAssistantDialog.cpp
++++ gentle2/TSequencingAssistantDialog.cpp
+@@ -20,12 +20,12 @@ TSequencingAssistantDialog::TSequencingA
+ abi2 = new wxChoice ( this , SAD_ABI2 ) ;
+
+ // Sequence/sequencing data dropdown boxes
+- h1a->Add ( new wxStaticText ( this , -1 , txt("t_sad_sequence") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- h1a->Add ( sequence , 1 , wxEXPAND|wxALL , 5 ) ;
+- h1a->Add ( new wxStaticText ( this , -1 , txt("t_sad_abi1") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- h1a->Add ( abi1 , 1 , wxEXPAND|wxALL , 5 ) ;
+- h1a->Add ( new wxStaticText ( this , -1 , txt("t_sad_abi2") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- h1a->Add ( abi2 , 1 , wxEXPAND|wxALL , 5 ) ;
++ h1a->Add ( new wxStaticText ( this , -1 , txt("t_sad_sequence") ) , 0 , wxEXPAND , 5 ) ;
++ h1a->Add ( sequence , 1 , wxEXPAND , 5 ) ;
++ h1a->Add ( new wxStaticText ( this , -1 , txt("t_sad_abi1") ) , 0 , wxEXPAND , 5 ) ;
++ h1a->Add ( abi1 , 1 , wxEXPAND , 5 ) ;
++ h1a->Add ( new wxStaticText ( this , -1 , txt("t_sad_abi2") ) , 0 , wxEXPAND , 5 ) ;
++ h1a->Add ( abi2 , 1 , wxEXPAND , 5 ) ;
+
+ // OK/Cancel
+ ok = new wxButton ( this , wxID_OK , txt("b_ok") ) ;
+@@ -35,8 +35,8 @@ TSequencingAssistantDialog::TSequencingA
+
+ // Initial help text
+ v0->Add ( new wxStaticText ( this , -1 , txt("t_sad_text") , wxDefaultPosition , wxSize(400,60) , wxALIGN_CENTRE ) ,
+- 0 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h1a , 0 , wxEXPAND|wxALL , 5 ) ;
++ 0 , wxEXPAND , 5 ) ;
++ v0->Add ( h1a , 0 , wxEXPAND , 5 ) ;
+ v0->Add ( h2 , 0 , wxCENTER|wxALL , 5 ) ;
+
+ // Initialize dropdown boxes
+Index: gentle2/TSilmutDialog.cpp
+===================================================================
+--- gentle2.orig/TSilmutDialog.cpp
++++ gentle2/TSilmutDialog.cpp
+@@ -48,17 +48,17 @@ TSilmutDialog::TSilmutDialog ( wxWindow
+ wxDefaultPosition , wxSize ( MYSPINBOXSIZE , -1 ) ,
+ wxSP_ARROW_KEYS , 0 , 9 , 2 ) ;
+ allow_cut_removal = new wxCheckBox ( this , PD_SILMUT_ACR , txt("t_silmut_allow_cut_removal") ) ;
+- h0->Add ( st , 0 , wxEXPAND|wxALL , 5 ) ;
+- h0->Add ( lim_xhg , 0 , wxEXPAND|wxALL , 5 ) ;
+- h0->Add ( allow_cut_removal , 0 , wxEXPAND|wxALL , 5 ) ;
++ h0->Add ( st , 0 , wxEXPAND , 5 ) ;
++ h0->Add ( lim_xhg , 0 , wxEXPAND , 5 ) ;
++ h0->Add ( allow_cut_removal , 0 , wxEXPAND , 5 ) ;
+
+ // Max cuts
+ lim_max = new wxSpinCtrl ( this , PD_SILMUT_MAX_CUT , _T("5") ,
+ wxDefaultPosition , wxSize ( MYSPINBOXSIZE , -1 ) ,
+ wxSP_ARROW_KEYS , 0 , 99 , 5 ) ;
+- h1->Add ( new wxStaticText ( this , -1 , txt("t_silmut_max_cut1") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- h1->Add ( lim_max , 0 , wxEXPAND|wxALL , 5 ) ;
+- h1->Add ( new wxStaticText ( this , -1 , txt("t_silmut_max_cut2") ) , 0 , wxEXPAND|wxALL , 5 ) ;
++ h1->Add ( new wxStaticText ( this , -1 , txt("t_silmut_max_cut1") ) , 0 , wxEXPAND , 5 ) ;
++ h1->Add ( lim_max , 0 , wxEXPAND , 5 ) ;
++ h1->Add ( new wxStaticText ( this , -1 , txt("t_silmut_max_cut2") ) , 0 , wxEXPAND , 5 ) ;
+
+ status = new wxStaticText ( this , -1 , _T("") ) ;
+ status->Hide() ;
+@@ -77,14 +77,14 @@ TSilmutDialog::TSilmutDialog ( wxWindow
+ if ( mode == M_WHATCUTS ) egr->SetStringSelection ( txt("All") ) ;
+ else if ( mode == M_SILMUT ) egr->SetStringSelection ( txt("Current") ) ;
+
+- h2->Add ( egr , 0 , wxEXPAND|wxALL , 5 ) ;
+- h2->Add ( new wxButton ( this , PD_SILMUT_OK , txt("b_ok") ) , 0 , wxEXPAND|wxALL , 5 ) ;
+- h2->Add ( new wxButton ( this , PD_SILMUT_CANCEL , txt("b_cancel") ) , 0 , wxEXPAND|wxALL , 5 ) ;
++ h2->Add ( egr , 0 , wxEXPAND , 5 ) ;
++ h2->Add ( new wxButton ( this , PD_SILMUT_OK , txt("b_ok") ) , 0 , wxEXPAND , 5 ) ;
++ h2->Add ( new wxButton ( this , PD_SILMUT_CANCEL , txt("b_cancel") ) , 0 , wxEXPAND , 5 ) ;
+
+ if ( mut_pos > -1 ) // I have no idea what this is for...
+ {
+ mut = new wxChoice ( this , PD_SILMUT_EGR ) ;
+- h2->Add ( mut , 0 , wxEXPAND|wxALL , 5 ) ;
++ h2->Add ( mut , 0 , wxEXPAND , 5 ) ;
+ }
+
+ // List
+Index: gentle2/TStoreAllDialog.cpp
+===================================================================
+--- gentle2.orig/TStoreAllDialog.cpp
++++ gentle2/TStoreAllDialog.cpp
+@@ -32,24 +32,24 @@ TStoreAllDialog::TStoreAllDialog ( wxWin
+ force_db = new wxCheckBox ( this , -1 , txt("t_sad_force_database") ) ;
+ auto_overwrite = new wxCheckBox ( this , -1 , txt("t_sad_auto_overwrite") ) ;
+
+- h0->Add ( b_all , 1 , wxEXPAND|wxALL , 2 ) ;
+- h0->Add ( b_none , 1 , wxEXPAND|wxALL , 2 ) ;
+- h0->Add ( b_invert , 1 , wxEXPAND|wxALL , 2 ) ;
++ h0->Add ( b_all , 1 , wxEXPAND , 2 ) ;
++ h0->Add ( b_none , 1 , wxEXPAND , 2 ) ;
++ h0->Add ( b_invert , 1 , wxEXPAND , 2 ) ;
+
+- h1->Add ( b_ok , 1 , wxEXPAND|wxALL , 2 ) ;
+- h1->Add ( b_cancel , 1 , wxEXPAND|wxALL , 2 ) ;
++ h1->Add ( b_ok , 1 , wxEXPAND , 2 ) ;
++ h1->Add ( b_cancel , 1 , wxEXPAND , 2 ) ;
+
+- h2->Add ( auto_overwrite , 0 , wxEXPAND|wxALL , 2 ) ;
+- h2->Add ( force_db , 0 , wxEXPAND|wxALL , 2 ) ;
++ h2->Add ( auto_overwrite , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( force_db , 0 , wxEXPAND , 2 ) ;
+
+- h3->Add ( new wxStaticText ( this , -1 , _T("t_default_database") ) , 0 , wxEXPAND|wxALL , 2 ) ;
+- h3->Add ( database , 1 , wxEXPAND|wxALL , 2 ) ;
++ h3->Add ( new wxStaticText ( this , -1 , _T("t_default_database") ) , 0 , wxEXPAND , 2 ) ;
++ h3->Add ( database , 1 , wxEXPAND , 2 ) ;
+
+- v0->Add ( list , 1 , wxEXPAND|wxALL , 2 ) ;
+- v0->Add ( h3 , 0 , wxEXPAND|wxALL , 2 ) ;
+- v0->Add ( h2 , 0 , wxEXPAND|wxALL , 2 ) ;
+- v0->Add ( h0 , 0 , wxEXPAND|wxALL , 2 ) ;
+- v0->Add ( h1 , 0 , wxEXPAND|wxALL , 2 ) ;
++ v0->Add ( list , 1 , wxEXPAND , 2 ) ;
++ v0->Add ( h3 , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( h2 , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( h0 , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( h1 , 0 , wxEXPAND , 2 ) ;
+
+ PopulateList() ;
+ database->SetStringSelection ( defdb ) ;
+Index: gentle2/TVectorEditorEnzymes.cpp
+===================================================================
+--- gentle2.orig/TVectorEditorEnzymes.cpp
++++ gentle2/TVectorEditorEnzymes.cpp
+@@ -54,27 +54,27 @@ void TVectorEditor::initPanEnzym ()
+ v1->Add ( listCE , 1 , wxEXPAND , 5 ) ;
+
+ v2->Add ( new wxStaticText ( panEnzym , -1 , _T("") ) , 0 , wxEXPAND , 5 ) ;
+- v2->Add ( b_addgr , 0 , wxEXPAND|wxALL , 5 ) ;
+- v2->Add ( b_atg , 0 , wxEXPAND|wxALL , 5 ) ;
+- v2->Add ( b_asng , 0 , wxEXPAND|wxALL , 5 ) ;
+- v2->Add ( b_dg , 0 , wxEXPAND|wxALL , 5 ) ;
+- if ( b1 ) v2->Add ( b1 , 0 , wxEXPAND|wxALL , 5 ) ;
+- v2->Add ( b2 , 0 , wxEXPAND|wxALL , 5 ) ;
+- v2->Add ( delete_enzyme_button , 0 , wxEXPAND|wxALL , 5 ) ;
++ v2->Add ( b_addgr , 0 , wxEXPAND , 5 ) ;
++ v2->Add ( b_atg , 0 , wxEXPAND , 5 ) ;
++ v2->Add ( b_asng , 0 , wxEXPAND , 5 ) ;
++ v2->Add ( b_dg , 0 , wxEXPAND , 5 ) ;
++ if ( b1 ) v2->Add ( b1 , 0 , wxEXPAND , 5 ) ;
++ v2->Add ( b2 , 0 , wxEXPAND , 5 ) ;
++ v2->Add ( delete_enzyme_button , 0 , wxEXPAND , 5 ) ;
+ v2->Add ( new wxStaticText ( panEnzym , -1 , _T("") ) , 0 , wxEXPAND , 5 ) ;
+- v2->Add ( b3 , 0 , wxEXPAND|wxALL , 5 ) ;
+- v2->Add ( b4 , 0 , wxEXPAND|wxALL , 5 ) ;
+- v2->Add ( b_dfg , 0 , wxEXPAND|wxALL , 5 ) ;
+- v2->Add ( b_import_rebase , 0 , wxEXPAND|wxALL , 5 ) ;
++ v2->Add ( b3 , 0 , wxEXPAND , 5 ) ;
++ v2->Add ( b4 , 0 , wxEXPAND , 5 ) ;
++ v2->Add ( b_dfg , 0 , wxEXPAND , 5 ) ;
++ v2->Add ( b_import_rebase , 0 , wxEXPAND , 5 ) ;
+
+ v3->Add ( tGR , 0 , wxEXPAND , 5 ) ;
+ v3->Add ( listGroups , 1 , wxEXPAND , 5 ) ;
+ v3->Add ( tGE , 0 , wxEXPAND , 5 ) ;
+ v3->Add ( listGE , 3 , wxEXPAND , 5 ) ;
+
+- h1->Add ( v1 , 1 , wxEXPAND|wxALL , 5 ) ;
++ h1->Add ( v1 , 1 , wxEXPAND , 5 ) ;
+ h1->Add ( v2 , 0 , wxEXPAND , 5 ) ;
+- h1->Add ( v3 , 1 , wxEXPAND|wxALL , 5 ) ;
++ h1->Add ( v3 , 1 , wxEXPAND , 5 ) ;
+
+ panEnzym->SetSizer ( h1 ) ;
+ h1->Fit ( panEnzym ) ;
+Index: gentle2/TVectorEditorItems.cpp
+===================================================================
+--- gentle2.orig/TVectorEditorItems.cpp
++++ gentle2/TVectorEditorItems.cpp
+@@ -183,9 +183,9 @@ void TVectorEditor::initPanItem ()
+ wxDefaultPosition , wxDefaultSize ,
+ 4 , vt , wxRA_SPECIFY_COLS ) ;
+
+- v1->Add ( h0a , 0 , wxEXPAND|wxALL , 2 ) ;
+- v1->Add ( h1a , 0 , wxEXPAND|wxALL , 2 ) ;
+- v1->Add ( idesc , 1 , wxEXPAND|wxALL , 2 ) ;
++ v1->Add ( h0a , 0 , wxEXPAND , 2 ) ;
++ v1->Add ( h1a , 0 , wxEXPAND , 2 ) ;
++ v1->Add ( idesc , 1 , wxEXPAND , 2 ) ;
+
+ v2->Add ( h0b ) ;
+ v2->Add ( h1b ) ;
+@@ -204,8 +204,8 @@ void TVectorEditor::initPanItem ()
+ h2->Add ( v1 , 1, wxEXPAND ) ;
+ h2->Add ( v2 , 0 , 0 ) ;
+
+- v0->Add ( items , 1 , wxEXPAND|wxALL , 5 ) ;
+- v0->Add ( h2 , 1 , wxEXPAND|wxALL , 5 ) ;
++ v0->Add ( items , 1 , wxEXPAND , 5 ) ;
++ v0->Add ( h2 , 1 , wxEXPAND , 5 ) ;
+ panItem->SetSizer ( v0 ) ;
+ nb->AddPage ( panItem , txt("t_vec_item") ) ;
+ }
+Index: gentle2/TVirtualGel.cpp
+===================================================================
+--- gentle2.orig/TVirtualGel.cpp
++++ gentle2/TVirtualGel.cpp
+@@ -110,11 +110,11 @@ void TVirtualGel::initme ()
+
+
+ /*
+- hs->Add ( cb_label , 0 , wxEXPAND|wxALIGN_CENTER_VERTICAL , 5 ) ;
+- hs->Add ( new wxStaticText ( this , -1 , txt("t_vg_concentration") ) , 0 , wxEXPAND|wxALIGN_CENTER_VERTICAL , 5 ) ;
+- hs->Add ( ch_percent , 0 , wxEXPAND|wxALIGN_CENTER_VERTICAL , 5 ) ;
+- hs->Add ( new wxStaticText ( this , -1 , txt("t_vg_marker") ) , 0 , wxEXPAND|wxALIGN_CENTER_VERTICAL , 5 ) ;
+- hs->Add ( ch_marker , 0 , wxEXPAND|wxALIGN_CENTER_VERTICAL , 5 ) ;
++ hs->Add ( cb_label , 0 , wxEXPAND , 5 ) ;
++ hs->Add ( new wxStaticText ( this , -1 , txt("t_vg_concentration") ) , 0 , wxEXPAND , 5 ) ;
++ hs->Add ( ch_percent , 0 , wxEXPAND , 5 ) ;
++ hs->Add ( new wxStaticText ( this , -1 , txt("t_vg_marker") ) , 0 , wxEXPAND , 5 ) ;
++ hs->Add ( ch_marker , 0 , wxEXPAND , 5 ) ;
+ */
+
+ wxBoxSizer *vs = new wxBoxSizer ( wxVERTICAL ) ;
+Index: gentle2/FindSequenceDialog.cpp
+===================================================================
+--- gentle2.orig/FindSequenceDialog.cpp
++++ gentle2/FindSequenceDialog.cpp
+@@ -59,45 +59,45 @@ FindSequenceDialog::FindSequenceDialog (
+ wxDefaultPosition , wxDefaultSize , wxTE_READONLY|wxSTATIC_BORDER ) ;
+ status->SetBackgroundColour ( GetBackgroundColour() ) ;
+ find_button = new wxButton ( this , SH_SEARCH , txt("b_find") ) ;
+- h0->Add ( find_button , 1 , wxALL|wxEXPAND , 2 ) ;
+- h0->Add ( new wxStaticText ( this , -1 , _T("") ) , 1 , wxALL|wxEXPAND , 2 ) ;
+- h0->Add ( new wxButton ( this , SH_CANCEL , txt("b_cancel") ) , 1 , wxALL|wxEXPAND , 2 ) ;
++ h0->Add ( find_button , 1 , wxEXPAND , 2 ) ;
++ h0->Add ( new wxStaticText ( this , -1 , _T("") ) , 1 , wxEXPAND , 2 ) ;
++ h0->Add ( new wxButton ( this , SH_CANCEL , txt("b_cancel") ) , 1 , wxEXPAND , 2 ) ;
+ // Highlight stuff
+ highlight_display = new wxStaticText ( this , -1 , _T(" ") ) ;
+ do_highlight = new wxButton ( this , FD_ADD_HIGHLIGHTS , txt("b_find_highlight") ) ;
+- h1->Add ( do_highlight , 0 , wxALL|wxEXPAND , 2 ) ;
+- h1->Add ( highlight_display , 0 , wxLEFT|wxEXPAND , 5 ) ;
+- h1->Add ( new wxButton ( this , FD_SET_HIGHLIGHT_COLOR , txt("b_find_highlight_color") ) , 0 , wxALL|wxEXPAND , 2 ) ;
+- h1->Add ( new wxButton ( this , FD_RESET_HIGHLIGHTS , txt("b_find_remove_highlights") ) , 0 , wxALL|wxEXPAND , 2 ) ;
++ h1->Add ( do_highlight , 0 , wxEXPAND , 2 ) ;
++ h1->Add ( highlight_display , 0 , wxEXPAND , 5 ) ;
++ h1->Add ( new wxButton ( this , FD_SET_HIGHLIGHT_COLOR , txt("b_find_highlight_color") ) , 0 , wxEXPAND , 2 ) ;
++ h1->Add ( new wxButton ( this , FD_RESET_HIGHLIGHTS , txt("b_find_remove_highlights") ) , 0 , wxEXPAND , 2 ) ;
+ highlight_display->SetBackgroundColour ( highlight ) ;
+ // Options
+ cb_sequence = cb_items = cb_enzymes = cb_translation = NULL ;
+ cb_sequence = new wxCheckBox ( this , SH_CB_SEQUENCE , txt("t_sh_cb_sequence") ) ;
+- h2->Add ( cb_sequence , 0 , wxALL|wxEXPAND , 2 ) ;
++ h2->Add ( cb_sequence , 0 , wxEXPAND , 2 ) ;
+ cb_sequence->SetValue ( true ) ;
+ if ( c->def != _T("ABIviewer") )
+ {
+ cb_items = new wxCheckBox ( this , SH_CB_ITEMS , txt("t_sh_cb_items") ) ;
+- h2->Add ( cb_items , 0 , wxALL|wxEXPAND , 2 ) ;
++ h2->Add ( cb_items , 0 , wxEXPAND , 2 ) ;
+ cb_items->SetValue ( true ) ;
+ }
+ if ( c->def == _T("dna") || c->def == _T("PrimerDesign") )
+ {
+ cb_enzymes = new wxCheckBox ( this , SH_CB_ENZYMES , txt("t_sh_cb_enzymes") ) ;
+ cb_translation = new wxCheckBox ( this , SH_CB_TRANSLATION , txt("t_sh_cb_translation") ) ;
+- h2->Add ( cb_enzymes , 0 , wxALL|wxEXPAND , 2 ) ;
+- h2->Add ( cb_translation , 0 , wxALL|wxEXPAND , 2 ) ;
++ h2->Add ( cb_enzymes , 0 , wxEXPAND , 2 ) ;
++ h2->Add ( cb_translation , 0 , wxEXPAND , 2 ) ;
+ cb_enzymes->SetValue ( true ) ;
+ cb_translation->SetValue ( true ) ;
+ }
+
+ lb = new wxListBox ( this , SH_LB ) ;
+- v0->Add ( t , 0 , wxALL|wxEXPAND , 2 ) ;
+- v0->Add ( h0 , 0 , wxALL|wxEXPAND , 2 ) ;
+- v0->Add ( h1 , 0 , wxALL|wxEXPAND , 2 ) ;
+- v0->Add ( h2 , 0 , wxALL|wxEXPAND , 2 ) ;
+- v0->Add ( status , 0 , wxALL|wxEXPAND , 2 ) ;
+- v0->Add ( lb , 1 , wxALL|wxEXPAND , 2 ) ;
++ v0->Add ( t , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( h0 , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( h1 , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( h2 , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( status , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( lb , 1 , wxEXPAND , 2 ) ;
+ do_highlight->Disable() ;
+ find_button->SetDefault () ;
+ t->SetFocus () ;
+Index: gentle2/MyChild.cpp
+===================================================================
+--- gentle2.orig/MyChild.cpp
++++ gentle2/MyChild.cpp
+@@ -506,8 +506,8 @@ void MyChild::initme ()
+
+ wxSafeYield() ;
+ wxBoxSizer *v0 = new wxBoxSizer ( wxVERTICAL ) ;
+- v0->Add ( toolbar , 0 , wxALL|wxEXPAND , 2 ) ;
+- v0->Add ( sw , 1 , wxALL|wxEXPAND , 2 ) ;
++ v0->Add ( toolbar , 0 , wxEXPAND , 2 ) ;
++ v0->Add ( sw , 1 , wxEXPAND , 2 ) ;
+ SetSizer ( v0 ) ;
+ v0->Fit ( this ) ;
+
=====================================
debian/patches/FontSelection.patch
=====================================
@@ -0,0 +1,413 @@
+Index: gentle/main.h
+===================================================================
+--- gentle.orig/main.h
++++ gentle/main.h
+@@ -123,8 +123,8 @@ using namespace std ;
+ \brief Creates or reuses a font. Parameters are the same as wxCreateFont
+ */
+
+-#define MYPEN(_a) (wxThePenList->FindOrCreatePen ( _a , 1 , wxSOLID ) )
+-#define MYBRUSH(_a) (wxTheBrushList->FindOrCreateBrush ( _a , wxSOLID ) )
++#define MYPEN(_a) (wxThePenList->FindOrCreatePen ( _a , 1 , wxPENSTYLE_SOLID ) )
++#define MYBRUSH(_a) (wxTheBrushList->FindOrCreateBrush ( _a , wxBRUSHSTYLE_SOLID ) )
+ #define MYFONT(_a,_b,_c,_d) (wxTheFontList->FindOrCreateFont(_a,_b,_c,_d) )
+
+ // Don't you *EVER* turn this on again!!!!
+Index: gentle/CloningAssistant.cpp
+===================================================================
+--- gentle.orig/CloningAssistant.cpp
++++ gentle/CloningAssistant.cpp
+@@ -156,7 +156,7 @@ TDDR *TCloningAssistant::new_from_vector
+ m->vector = v ;
+ m->item = &v->items[a] ;
+ if ( v->items[a].getType() == VIT_CDS ) m->pen = *MYPEN ( wxColour ( 100 , 200 , 100 ) ) ;
+- else m->pen = *MYPEN ( *wxWHITE ) ;
++ else m->pen = *wxWHITE_PEN ;
+ n->children.push_back ( m ) ;
+ }
+ return n ;
+Index: gentle/SequenceTypePlot.cpp
+===================================================================
+--- gentle.orig/SequenceTypePlot.cpp
++++ gentle/SequenceTypePlot.cpp
+@@ -286,9 +286,9 @@ void SeqPlot::showChouFasman ( wxDC &dc
+ // mylog ( "SeqPlot::showChouFasman" , "2" ) ;
+ for ( u = 1 ; u < d1.GetCount() ; u++ )
+ {
+- wxPen *pen = (wxPen*) wxRED_PEN ;
+- if ( u == 2 ) pen = (wxPen*) wxGREEN_PEN ;
+- if ( u == 3 ) pen = MYPEN(_T("BLUE")) ;
++ const wxPen *pen = wxRED_PEN ;
++ if ( u == 2 ) pen = wxGREEN_PEN ;
++ if ( u == 3 ) pen = wxBLUE_PEN ;
+ int tz = ty + (u-1) * ch + 1 ;
+ int tw = ( tx + cw ) - lx ;
+
+@@ -385,10 +385,10 @@ void SeqPlot::showPlot ( wxDC &dc , int
+ mylog ( "SeqPlot::showPlot" , "5" ) ;
+ for ( u = 0 ; u < prop[b].data.size() ; u++ )
+ {
+- wxPen *pen = (wxPen*) wxRED_PEN ;
+- if ( can->isPrinting() ) pen = (wxPen*) wxBLACK_PEN ;
+- else if ( u == 1 ) pen = (wxPen*) wxGREEN_PEN ;
+- else if ( u == 2 ) pen = MYPEN(_T("BLUE")) ;
++ const wxPen *pen = wxRED_PEN ;
++ if ( can->isPrinting() ) pen = wxBLACK_PEN ;
++ else if ( u == 1 ) pen = wxGREEN_PEN ;
++ else if ( u == 2 ) pen = wxBLUE_PEN ;
+ dc.SetPen(*pen);
+ float ny = prop[b].data[u] ;
+ float oy = b==0?ny:prop[b-1].data[u] ;
+Index: gentle/ABIviewer.cpp
+===================================================================
+--- gentle.orig/ABIviewer.cpp
++++ gentle/ABIviewer.cpp
+@@ -272,7 +272,7 @@ void TABIviewer::initme ()
+ wxDefaultPosition ,
+ wxSize ( -1 , 150 ) ,
+ wxTE_MULTILINE | wxTE_READONLY ) ;
+- stat->SetFont ( *MYFONT ( 8 , wxMODERN , wxNORMAL , wxNORMAL ) ) ;
++ stat->SetFont ( *MYFONT ( 8 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+
+ wxBoxSizer *v1 = new wxBoxSizer ( wxVERTICAL ) ;
+ wxBoxSizer *h1 = new wxBoxSizer ( wxHORIZONTAL ) ;
+Index: gentle/AminoAcids.cpp
+===================================================================
+--- gentle.orig/AminoAcids.cpp
++++ gentle/AminoAcids.cpp
+@@ -363,7 +363,7 @@ void TAminoAcids::showStat ()
+ }
+
+ stat->SetValue ( t ) ;
+- stat->SetFont ( *MYFONT ( MYFONTSIZE , wxMODERN , wxNORMAL , wxNORMAL ) ) ;
++ stat->SetFont ( *MYFONT ( MYFONTSIZE , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+ }
+
+ void TAminoAcids::showSequence ()
+Index: gentle/MyChild.cpp
+===================================================================
+--- gentle.orig/MyChild.cpp
++++ gentle/MyChild.cpp
+@@ -494,8 +494,8 @@ void MyChild::initme ()
+ treeBox->p = this ;
+
+ #ifdef __WXMAC__
+- treeBox->SetFont ( *MYFONT ( MYFONTSIZE , wxMODERN , wxNORMAL , wxNORMAL ) ) ;
+- propBox->SetFont ( *MYFONT ( MYFONTSIZE , wxMODERN , wxNORMAL , wxNORMAL ) ) ;
++ treeBox->SetFont ( *MYFONT ( MYFONTSIZE , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
++ propBox->SetFont ( *MYFONT ( MYFONTSIZE , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+ #endif
+
+ sw->SplitHorizontally ( swu , cSequence , height/2 ) ;
+@@ -1367,9 +1367,9 @@ void MyChild::OnPrintReport(wxCommandEve
+ // Feature list
+ pdc->SetDeviceOrigin ( 0 , h/2 ) ;
+ int cw , ch ;
+- wxFont *font = MYFONT ( w/80 , wxMODERN , wxNORMAL , wxNORMAL ) ;
+- wxFont *sfont = MYFONT ( w/120 , wxMODERN , wxNORMAL , wxNORMAL ) ;
+- wxFont *bfont = MYFONT ( w/40 , wxMODERN , wxNORMAL , wxNORMAL ) ;
++ wxFont *font = MYFONT ( w/80 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ wxFont *sfont = MYFONT ( w/120 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ wxFont *bfont = MYFONT ( w/40 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
+ pdc->SetFont ( *font ) ;
+ pdc->GetTextExtent ( _T("A") , &cw , &ch ) ;
+
+Index: gentle/MyFrame.cpp
+===================================================================
+--- gentle.orig/MyFrame.cpp
++++ gentle/MyFrame.cpp
+@@ -179,7 +179,7 @@ void MyFrame::initme ()
+ // myapp()->sw.Start() ;
+
+ #ifdef __WXGTK__
+- SetFont ( *MYFONT ( 8 , wxSWISS , wxNORMAL , wxNORMAL ) ) ;
++ SetFont ( *MYFONT ( 8 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+ #endif
+
+ int borders = wxNO_BORDER ;
+Index: gentle/PCR_Troubleshoot.cpp
+===================================================================
+--- gentle.orig/PCR_Troubleshoot.cpp
++++ gentle/PCR_Troubleshoot.cpp
+@@ -35,7 +35,7 @@ PCR_troubleshoot_dialog::PCR_troubleshoo
+
+ list = new wxListBox ( this , PCR_TROUBLESHOOT_LIST ) ;
+ text = new wxTextCtrl ( this , -1 , _T("") , wxDefaultPosition , wxDefaultSize , wxTE_MULTILINE ) ;
+- text->SetFont ( *MYFONT ( MYFONTSIZE , wxMODERN , wxNORMAL , wxNORMAL ) ) ;
++ text->SetFont ( *MYFONT ( MYFONTSIZE , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+
+ h0->Add ( new wxStaticText ( this , -1 , _T("")) , 1 , wxEXPAND|wxALL , 5 ) ;
+ h0->Add ( new wxButton ( this , POD_OK , txt("b_ok") ) , 1 , wxEXPAND|wxALL , 5 ) ;
+Index: gentle/PlasmidCanvas.cpp
+===================================================================
+--- gentle.orig/PlasmidCanvas.cpp
++++ gentle/PlasmidCanvas.cpp
+@@ -824,8 +824,8 @@ void PlasmidCanvas::showGClegend ( wxDC
+ {
+ int fontfactor = 10 ;
+ if ( printing ) fontfactor = (w>h?h:w)/10000 ;
+- wxFont *smallFont = MYFONT ( fontfactor*2/3 , wxSWISS , wxNORMAL , wxNORMAL ) ;
+- wxFont *normalFont = MYFONT ( fontfactor*6/5 , wxSWISS , wxNORMAL , wxNORMAL ) ;
++ wxFont *smallFont = MYFONT ( fontfactor*2/3 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ wxFont *normalFont = MYFONT ( fontfactor*6/5 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
+ wxRect r ;
+ int nw = w / 5 ;
+ dc.SetFont(*normalFont);
+Index: gentle/PlasmidCanvasCircular.cpp
+===================================================================
+--- gentle.orig/PlasmidCanvasCircular.cpp
++++ gentle/PlasmidCanvasCircular.cpp
+@@ -229,11 +229,11 @@ void PlasmidCanvas::OnDrawCircular(wxDC&
+
+ int fontfactor = MYFONTSIZE * 10 / 8 ;
+ if ( printing ) fontfactor = mwh/80;
+- wxFont *tinyFont = MYFONT ( fontfactor*4/5 , wxSWISS , wxNORMAL , wxNORMAL ) ;
+- wxFont *smallFont = MYFONT ( fontfactor , wxSWISS , wxNORMAL , wxNORMAL ) ;
+- wxFont *normalFont = MYFONT ( fontfactor*6/5 , wxSWISS , wxNORMAL , wxNORMAL ) ;
+- wxFont *bigFont = MYFONT ( fontfactor*7/5 , wxSWISS , wxNORMAL , wxNORMAL ) ;
+-// wxFont *hugeFont = MYFONT ( fontfactor*9/5 , wxSWISS , wxNORMAL , wxBOLD ) ;
++ wxFont *tinyFont = MYFONT ( fontfactor*4/5 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ wxFont *smallFont = MYFONT ( fontfactor , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ wxFont *normalFont = MYFONT ( fontfactor*6/5 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ wxFont *bigFont = MYFONT ( fontfactor*7/5 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++// wxFont *hugeFont = MYFONT ( fontfactor*9/5 , wxSWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_BOLD ) ;
+
+ int d ;
+ for ( d = 1 ; d*10 < l ; d *= 10 ) ;
+Index: gentle/PlasmidCanvasLinear.cpp
+===================================================================
+--- gentle.orig/PlasmidCanvasLinear.cpp
++++ gentle/PlasmidCanvasLinear.cpp
+@@ -7,8 +7,8 @@ void PlasmidCanvas::OnDrawLinear(wxDC& d
+ if ( printing ) h = h * 2 / 3 ;
+ int fontfactor = MYFONTSIZE * 10 / 8 ;
+ if ( printing ) fontfactor = (w>h?h:w)/10000 ;
+- wxFont *tinyFont = MYFONT ( fontfactor*4/5 , wxSWISS , wxNORMAL , wxNORMAL ) ;
+- wxFont *smallFont = MYFONT ( fontfactor , wxSWISS , wxNORMAL , wxNORMAL ) ;
++ wxFont *tinyFont = MYFONT ( fontfactor*4/5 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ wxFont *smallFont = MYFONT ( fontfactor , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
+
+ // Initial calculations
+ int a , b ;
+@@ -344,8 +344,8 @@ bool PlasmidCanvas::intersectsLine ( wxR
+ void PlasmidCanvas::drawLinearItem ( wxDC& dc , int r1 , int r2 , float a1 , float a2 , TVectorItem *i )
+ {
+ if ( i->direction == -1 ) { int rr = r1 ; r1 = r2 ; r2 = rr ; }
+- wxFont *normalFont = MYFONT ( 12 , wxSWISS , wxNORMAL , wxNORMAL ) ;
+- wxFont *smallFont = MYFONT ( 8 , wxSWISS , wxNORMAL , wxNORMAL ) ;
++ wxFont *normalFont = MYFONT ( 12 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ wxFont *smallFont = MYFONT ( 8 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
+ int r1b = r2 - ( r2 - r1 ) / 10 ;
+ int y1 = (int) ( a2 - a1 ) / 3 ;
+ int y2 = (int) ( a1 + a2 ) / 2 ;
+Index: gentle/PrimerDesign.cpp
+===================================================================
+--- gentle.orig/PrimerDesign.cpp
++++ gentle/PrimerDesign.cpp
+@@ -481,7 +481,7 @@ void TPrimerDesign::initme ()
+ wxDefaultSize,//wxSize ( w*2/3 - 70 , h ) ,
+ wxTE_MULTILINE | wxTE_READONLY ) ;
+
+- stat->SetFont ( *MYFONT ( MYFONTSIZE , wxMODERN , wxNORMAL , wxNORMAL ) ) ;
++ stat->SetFont ( *MYFONT ( MYFONTSIZE , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+
+ GetToolBar()->ToggleTool(MDI_TOGGLE_FEATURES,show_features);
+
+Index: gentle/SequenceCanvas.cpp
+===================================================================
+--- gentle.orig/SequenceCanvas.cpp
++++ gentle/SequenceCanvas.cpp
+@@ -163,9 +163,9 @@ SequenceCanvas::~SequenceCanvas()
+ void SequenceCanvas::set_font_size ( int size )
+ {
+ last_font_size = size ;
+- font = MYFONT ( size , wxMODERN , wxNORMAL , wxNORMAL ) ;
+- smallFont = MYFONT ( MYFONTSIZE * size / 12 , wxSWISS , wxNORMAL , wxNORMAL ) ;
+- varFont = MYFONT ( size-1 , wxROMAN , wxNORMAL , wxNORMAL ) ;
++ font = MYFONT ( size , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ smallFont = MYFONT ( MYFONTSIZE * size / 12 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ varFont = MYFONT ( size-1 , wxFONTFAMILY_ROMAN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
+ }
+
+ void SequenceCanvas::unmark ()
+@@ -688,11 +688,11 @@ void SequenceCanvas::OnPrint ( wxCommand
+ wxFont *oldfont = font ;
+ wxFont *oldvarfont = varFont ;
+ wxFont *oldsmallFont = smallFont ;
+- wxFont *bigfont = MYFONT ( w/30 , wxMODERN , wxNORMAL , wxNORMAL ) ;
+- wxFont *medfont = MYFONT ( w/80 , wxMODERN , wxNORMAL , wxNORMAL ) ;
+- font = MYFONT ( fs*last_font_size/10/12 , wxMODERN , wxNORMAL , wxNORMAL ) ;
+- smallFont = MYFONT ( fs*last_font_size/15/12 , wxSWISS , wxNORMAL , wxNORMAL ) ;
+- varFont = MYFONT ( fs*last_font_size/11/12 , wxROMAN , wxNORMAL , wxNORMAL ) ;
++ wxFont *bigfont = MYFONT ( w/30 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ wxFont *medfont = MYFONT ( w/80 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ font = MYFONT ( fs*last_font_size/10/12 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ smallFont = MYFONT ( fs*last_font_size/15/12 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ varFont = MYFONT ( fs*last_font_size/11/12 , wxFONTFAMILY_ROMAN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
+
+ print_maxx = -w ;
+
+@@ -2827,10 +2827,11 @@ wxColour SequenceCharMarkup::getColorFro
+ wxPen SequenceCharMarkup::getPenFromXML ( TiXmlElement *e )
+ {
+ wxColour c = getColorFromXML ( getSafeXML ( e->Attribute ( "color" ) ) ) ;
+- long width , style ;
+- getSafeXML ( e->Attribute ( "width" ) ) . ToLong ( &width ) ;
+- getSafeXML ( e->Attribute ( "style" ) ) . ToLong ( &style ) ;
+- return * wxThePenList->FindOrCreatePen ( c , width , style ) ;
++ int width;
++ int style ;
++ getSafeXML ( e->Attribute ( "width" ) ) . ToInt ( &width ) ;
++ getSafeXML ( e->Attribute ( "style" ) ) . ToInt ( &style ) ;
++ return * wxThePenList->FindOrCreatePen ( c , width , (wxPenStyle) style ) ;
+ }
+
+ void SequenceCharMarkup::setFromXML ( TiXmlNode *base )
+Index: gentle/TDotPlot.cpp
+===================================================================
+--- gentle.orig/TDotPlot.cpp
++++ gentle/TDotPlot.cpp
+@@ -318,7 +318,7 @@ void TDotPlotPanel::Draw2Memory ()
+ memdc.SetBackground ( *wxWHITE_BRUSH ) ;
+ memdc.Clear() ;
+ memdc.SetPen ( *wxBLACK_PEN ) ;
+- memdc.SetFont ( *MYFONT ( 10 , wxSWISS , wxNORMAL , wxNORMAL ) ) ;
++ memdc.SetFont ( *MYFONT ( 10 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+
+ int x , y ;
+ for ( x = 0 ; x < len1 ; x++ )
+Index: gentle/TGraphScale.cpp
+===================================================================
+--- gentle.orig/TGraphScale.cpp
++++ gentle/TGraphScale.cpp
+@@ -101,7 +101,7 @@ void TGraphScale::drawit ( wxDC &dc , wx
+ float minor = major / 5 ;
+
+ // Draw scale
+- dc.SetFont ( *MYFONT ( 8 , wxMODERN , wxNORMAL , wxNORMAL ) ) ;
++ dc.SetFont ( *MYFONT ( 8 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+ dc.SetTextForeground ( col ) ;
+ dc.SetPen ( *MYPEN ( col ) ) ;
+
+Index: gentle/TIMGreader.cpp
+===================================================================
+--- gentle.orig/TIMGreader.cpp
++++ gentle/TIMGreader.cpp
+@@ -107,7 +107,7 @@ void TIMGitem::draw ( wxDC &dc , int x1
+ if ( type == IMGTYPE_TEXT )
+ {
+ wxFont oldfont = dc.GetFont() ;
+- dc.SetFont ( *MYFONT ( font_size*2/3 , wxMODERN , wxNORMAL , wxNORMAL /*, false , font_name.c_str()*/ ) ) ;
++ dc.SetFont ( *MYFONT ( font_size*2/3 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL /*, false , font_name.c_str()*/ ) ) ;
+
+ int px = xx ( p1.x ) ;
+ int py = yy ( p1.y ) ;
+Index: gentle/TImageDisplay.cpp
+===================================================================
+--- gentle.orig/TImageDisplay.cpp
++++ gentle/TImageDisplay.cpp
+@@ -266,7 +266,7 @@ void TMyImagePanel::OnDraw(wxDC& pdc)
+ {
+ if ( !bmp ) return ;
+
+- pdc.SetFont ( *MYFONT ( 8 , wxMODERN , wxNORMAL , wxNORMAL ) ) ;
++ pdc.SetFont ( *MYFONT ( 8 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+
+ int w , h , iw , ih ;
+ pdc.GetSize ( &w , &h ) ;
+Index: gentle/TMainTree.cpp
+===================================================================
+--- gentle.orig/TMainTree.cpp
++++ gentle/TMainTree.cpp
+@@ -30,7 +30,7 @@ void TMainTree::initme()
+ amino_acids = AppendItem ( treeroot , txt("amino_acids") ) ;
+ misc = AppendItem ( treeroot , txt("misc_stuff") ) ;
+
+- SetFont ( *MYFONT ( MYFONTSIZE , wxSWISS , wxNORMAL , wxNORMAL ) ) ;
++ SetFont ( *MYFONT ( MYFONTSIZE , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+
+ EnsureVisible ( vectors ) ;
+ }
+Index: gentle/TPrimerDialog.cpp
+===================================================================
+--- gentle.orig/TPrimerDialog.cpp
++++ gentle/TPrimerDialog.cpp
+@@ -127,7 +127,7 @@ void TPrimerDialog::initme ( TPrimer *_p
+ wxSize ( w , h-210 ) ,
+ wxLC_REPORT|wxLC_SINGLE_SEL ) ;
+
+- rep->SetFont ( *MYFONT ( 8 , wxMODERN , wxNORMAL , wxNORMAL ) ) ;
++ rep->SetFont ( *MYFONT ( 8 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+
+ bo->SetDefault() ;
+
+Index: gentle/TProteolysis.cpp
+===================================================================
+--- gentle.orig/TProteolysis.cpp
++++ gentle/TProteolysis.cpp
+@@ -93,7 +93,7 @@ TProteolysis::TProteolysis(TAminoAcids *
+ sep_desc = new wxTextCtrl ( this , -1 , _T("") , wxDefaultPosition ,
+ wxDefaultSize , wxTE_MULTILINE|wxTE_READONLY ) ;
+ sep_desc->SetBackgroundColour ( GetBackgroundColour() ) ;
+- sep_desc->SetFont ( *MYFONT ( 8 , wxSWISS , wxNORMAL , wxNORMAL ) ) ;
++ sep_desc->SetFont ( *MYFONT ( 8 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+
+ wxString rb_sr[3] ;
+ rb_sr[0] = txt("t_pro_sort_results_1" ) ;
+@@ -561,7 +561,7 @@ void TProteolysis::draw_gel ( wxDC &dc )
+ int a , y , tw , th , w , h ;
+ dc.GetSize ( &w , &h ) ;
+
+- dc.SetFont( *MYFONT ( 8 , wxMODERN , wxNORMAL , wxNORMAL ) ) ;
++ dc.SetFont( *MYFONT ( 8 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+
+ dc.SetBrush ( *wxWHITE_BRUSH ) ;
+ dc.SetPen ( *wxBLACK_PEN ) ;
+Index: gentle/TSilmutDialog.cpp
+===================================================================
+--- gentle.orig/TSilmutDialog.cpp
++++ gentle/TSilmutDialog.cpp
+@@ -90,7 +90,7 @@ TSilmutDialog::TSilmutDialog ( wxWindow
+ // List
+ lb = new wxListBox ( this , PD_SILMUT_LB , wxDefaultPosition , wxDefaultSize ,
+ 0 , NULL , wxLB_SINGLE|wxLB_SORT ) ;
+- lb->SetFont ( *MYFONT ( 8 , wxMODERN , wxNORMAL , wxNORMAL ) ) ;
++ lb->SetFont ( *MYFONT ( 8 , wxFONTFAMILY_MODERN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+
+ v0->Add ( h0 , 0 , wxEXPAND ) ;
+ v0->Add ( h1 , 0 , wxEXPAND ) ;
+Index: gentle/TVirtualGel.cpp
+===================================================================
+--- gentle.orig/TVirtualGel.cpp
++++ gentle/TVirtualGel.cpp
+@@ -244,8 +244,8 @@ void TMyGelControl::OnDraw(wxDC& dc)
+ // Drawing gel
+ int fontfactor = 10 ;
+ if ( printing ) fontfactor = w/5000 ;
+- wxFont *normalFont = MYFONT ( fontfactor * 11 / 10 , wxSWISS , wxNORMAL , wxNORMAL ) ;
+- wxFont *bigFont = MYFONT ( fontfactor * 14 / 10 , wxSWISS , wxNORMAL , wxNORMAL ) ;
++ wxFont *normalFont = MYFONT ( fontfactor * 11 / 10 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
++ wxFont *bigFont = MYFONT ( fontfactor * 14 / 10 , wxFONTFAMILY_SWISS , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ;
+
+ int tw , th ;
+ wxString title = _T("t_gelname_") + vg->type ;
+@@ -330,16 +330,16 @@ void TMyGelControl::drawBand ( wxDC &dc
+
+ int ps = 1000 ;
+ int bw = lane.pos.GetRight() - lane.pos.GetLeft() ;
+- dc.SetFont ( *MYFONT ( ps , wxROMAN , wxNORMAL , wxNORMAL ) ) ;
++ dc.SetFont ( *MYFONT ( ps , wxFONTFAMILY_ROMAN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+ dc.GetTextExtent ( title , &tw , &th ) ;
+ ps = ps * bw / tw ;
+- dc.SetFont ( *MYFONT ( ps , wxROMAN , wxNORMAL , wxNORMAL ) ) ;
++ dc.SetFont ( *MYFONT ( ps , wxFONTFAMILY_ROMAN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+ dc.GetTextExtent ( title , &tw , &th ) ;
+
+ if ( th > bw / 5 )
+ {
+ ps = ps * ( bw / 5 ) / th ;
+- dc.SetFont ( *MYFONT ( ps , wxROMAN , wxNORMAL , wxNORMAL ) ) ;
++ dc.SetFont ( *MYFONT ( ps , wxFONTFAMILY_ROMAN , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ) ) ;
+ dc.GetTextExtent ( title , &tw , &th ) ;
+ }
+
=====================================
debian/patches/YetAnotherMissingReturn.patch
=====================================
@@ -0,0 +1,67 @@
+Description: Should be appended to MissingReturnValues patch
+Author: Steffen Moeller <moeller at debian.org>
+Forwarded: no
+
+Index: gentle2/PlasmidCanvasHandlers.cpp
+===================================================================
+--- gentle2.orig/PlasmidCanvasHandlers.cpp
++++ gentle2/PlasmidCanvasHandlers.cpp
+@@ -359,6 +359,8 @@ wxMenu *PlasmidCanvas::invokeVectorPopup
+
+ PopupMenu ( cm , pt ) ;
+ delete cm ;
++
++ return (wxMenu *) NULL;
+ }
+
+ void PlasmidCanvas::OnTurningPoint ( wxCommandEvent &ev )
+Index: gentle2/PCR_Troubleshoot.cpp
+===================================================================
+--- gentle2.orig/PCR_Troubleshoot.cpp
++++ gentle2/PCR_Troubleshoot.cpp
+@@ -429,6 +429,7 @@ void PCR_troubleshoot_dialog::scan_Runs
+
+ void PCR_troubleshoot_dialog::scan_hairpin ( TPrimer &p , int nr )
+ {return;
++/* dead code, invoking get_matches that is not fully implemented (comment by Steffen)
+ wxArrayString m = get_matrix ( p.get53sequence() , invert ( p.get53sequence() ) ) ;
+ wxArrayString n = get_matches ( m , 4 , 1 ) ;
+
+@@ -436,6 +437,7 @@ void PCR_troubleshoot_dialog::scan_hairp
+
+ l_title.Add ( wxString::Format ( _T("%d: ") , nr ) + p.getName() ) ;
+ l_text.Add ( s ) ;
++*/
+ }
+
+ void PCR_troubleshoot_dialog::add_error ( TPrimer &p , int nr , wxString head , wxString tail )
+@@ -468,6 +470,7 @@ wxArrayString PCR_troubleshoot_dialog::g
+ return ret ;
+ }
+
++/* misses return value, i.e. not fully implemented, not called/dead code (Comment by Steffen)
+ wxArrayString PCR_troubleshoot_dialog::get_matches ( wxArrayString &m , int min , int allowed_gaps )
+ {
+ int col , row ;
+@@ -483,6 +486,7 @@ wxArrayString PCR_troubleshoot_dialog::g
+ if ( t.GetChar ( a ) == '1' ) cnt++ ;
+ }
+ }
++*/
+
+ wxString PCR_troubleshoot_dialog::invert ( wxString s )
+ {
+Index: gentle2/PCR_Troubleshoot.h
+===================================================================
+--- gentle2.orig/PCR_Troubleshoot.h
++++ gentle2/PCR_Troubleshoot.h
+@@ -58,7 +58,8 @@ class PCR_troubleshoot_dialog : public w
+ virtual wxString invert ( wxString s ) ; ///< Inverts a (DNA) sequence
+ virtual wxString trim_both ( wxString s1 , wxString s2 , wxString s3 ) ;
+ virtual wxArrayString get_matrix ( wxString s1 , wxString s2 ) ;
+- virtual wxArrayString get_matches ( wxArrayString &m , int min , int allowed_gaps = 0 ) ;
++ // dead code (Comment by Steffen)
++ // virtual wxArrayString get_matches ( wxArrayString &m , int min , int allowed_gaps = 0 ) ;
+ virtual void fillSantaLucia () ;
+
+ virtual wxChar opp ( wxChar c ) ;
=====================================
debian/patches/YetAnotherPenSelection.patch
=====================================
@@ -0,0 +1,21 @@
+Description: Should be appended to FontSelection.patch
+Author: Steffen Moeller <moeller at debian.org>
+Forwarded: no
+
+Index: gentle2/AlignmentAppearanceDialog.cpp
+===================================================================
+--- gentle2.orig/AlignmentAppearanceDialog.cpp
++++ gentle2/AlignmentAppearanceDialog.cpp
+@@ -153,9 +153,9 @@ void AlignmentAppearanceDialog::set_pen
+
+ switch ( b )
+ {
+- case 1 : *p = wxPen ( colors[id] , t , wxSOLID ) ; break ;
+- case 2 : *p = wxPen ( colors[id] , t , wxSHORT_DASH ) ; break ;
+- case 3 : *p = wxPen ( colors[id] , t , wxDOT ) ; break ;
++ case 1 : *p = wxPen ( colors[id] , t , wxPENSTYLE_SOLID ) ; break ;
++ case 2 : *p = wxPen ( colors[id] , t , wxPENSTYLE_SHORT_DASH ) ; break ;
++ case 3 : *p = wxPen ( colors[id] , t , wxPENSTYLE_DOT ) ; break ;
+ }
+ }
+
=====================================
debian/patches/series
=====================================
@@ -1,6 +1,3 @@
-MissingReturnValueInNonVoidFunction.patch
-OperatorPrecedence.patch
-AdjustDeleteForArrays.patch
forward_slashes.patch
remove_tinyxml.patch
remove_clustalw.patch
@@ -8,5 +5,11 @@ remove-sqlite-dep.patch
wx3.0-compat.patch
fix-format-codes.patch
wx3.2-compat.patch
+MissingReturnValueInNonVoidFunction.patch
+OperatorPrecedence.patch
+AdjustDeleteForArrays.patch
FontSelection.patch
DoNotShowBoxAboutMarkersLoading.patch
+ExpandOverridesAll.patch
+YetAnotherMissingReturn.patch
+YetAnotherPenSelection.patch
=====================================
debian/rules
=====================================
@@ -15,6 +15,9 @@ execute_before_dh_auto_build:
mv tips_de.txt tips_de.iso8859
iconv -f ISO-8859-15 -t UTF-8 < tips_de.iso8859 > tips_de.txt
+execute_after_dh_auto_build:
+ mv tips_de.iso8859 tips_de.txt
+
override_dh_install:
dh_install
cd debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE); for i in help/*.html help/*.css *.db help/*.htm */*.png */*.x[bp]m */*.bmp *.txt */*.txt *.csv; do chmod -x "$$i"; done
@@ -29,6 +32,7 @@ override_dh_installdocs:
override_dh_auto_clean:
dh_auto_clean
find . -name "*.o" | xargs -r rm
+ if [ -e tips_de.iso8859 ]; then mv tips_de.iso8859 tips_de.txt; fi
rm -f GENtle
override_dh_compress:
View it on GitLab: https://salsa.debian.org/med-team/gentle/-/compare/4769cdb6dd897da6f53c73b0f10f72607b0834be...402644f2dadb21a375681687237dd7b24807bc42
--
View it on GitLab: https://salsa.debian.org/med-team/gentle/-/compare/4769cdb6dd897da6f53c73b0f10f72607b0834be...402644f2dadb21a375681687237dd7b24807bc42
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20230731/83d3cc1b/attachment-0001.htm>
More information about the debian-med-commit
mailing list