From f8ff8d82f29173bd491ba59dc71576f5f9a31a1f Mon Sep 17 00:00:00 2001 From: Magnus Manske Date: Mon, 12 Dec 2005 12:56:39 +0000 Subject: [PATCH] *** empty log message *** --- Alignment.cpp | 4 +++- MyFrame.cpp | 1 + TVectorTree.cpp | 8 +++++--- TVectorTree.h | 1 + main.cpp | 4 ++++ main.h | 2 ++ 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Alignment.cpp b/Alignment.cpp index df1444d8..96e738ba 100755 --- a/Alignment.cpp +++ b/Alignment.cpp @@ -4,7 +4,9 @@ #include "Alignment.h" #include -//#define USE_EXTERNAL_CLUSTALW +#ifdef __DEBIAN__ + #define USE_EXTERNAL_CLUSTALW +#endif #ifndef USE_EXTERNAL_CLUSTALW #include "clustalw/clustalw.h" diff --git a/MyFrame.cpp b/MyFrame.cpp index 999e6125..517b5693 100755 --- a/MyFrame.cpp +++ b/MyFrame.cpp @@ -1839,6 +1839,7 @@ void MyFrame::OnSashDrag(wxSashEvent& event) } wxLayoutAlgorithm layout; layout.LayoutFrame(this); + Refresh () ; // Leaves bits of itself behind sometimes // GetClientWindow()->Refresh(); diff --git a/TVectorTree.cpp b/TVectorTree.cpp index 797375a9..5580952e 100755 --- a/TVectorTree.cpp +++ b/TVectorTree.cpp @@ -15,6 +15,9 @@ BEGIN_EVENT_TABLE(TVectorTree, wxTreeCtrl) EVT_MENU(PC_ITEM_DELETE, TVectorTree::itemDelete) EVT_MENU(PC_ITEM_HIDE, TVectorTree::itemShowHide) EVT_MENU(PC_ITEM_SHOW, TVectorTree::itemShowHide) + EVT_MENU(PC_ITEM_COPY_DNA, TVectorTree::itemCopyDNA) + EVT_MENU(PC_ITEM_BLAST_DNA, TVectorTree::blastDNA) + EVT_MENU(PC_ITEM_BLAST_AA, TVectorTree::blastAA) EVT_MENU(PRIMER_FORWARD, TVectorTree::OnPrimerForward) EVT_MENU(PRIMER_BACKWARD, TVectorTree::OnPrimerBackward) @@ -30,8 +33,6 @@ BEGIN_EVENT_TABLE(TVectorTree, wxTreeCtrl) EVT_MENU(PC_RS_ADD_AND_CUT, TVectorTree::rsAddAndCut) EVT_MENU(PC_RS_CUT_WITH_COCKTAIL, TVectorTree::rsCutWithCocktail) EVT_MENU(PC_VECTOR_EDIT, TVectorTree::vecEdit) - EVT_MENU(PC_BLAST_DNA, TVectorTree::blastDNA) - EVT_MENU(PC_BLAST_AA, TVectorTree::blastAA) END_EVENT_TABLE() @@ -336,4 +337,5 @@ void TVectorTree::OnPrimerBoth ( wxCommandEvent &ev ) void TVectorTree::OnPrimerMutation ( wxCommandEvent &ev ) { p->cPlasmid->OnPrimerMutation ( ev ) ; } - +void TVectorTree::itemCopyDNA ( wxCommandEvent &ev ) + { p->cPlasmid->itemCopyDNA ( ev ) ; } diff --git a/TVectorTree.h b/TVectorTree.h index a7788824..387fa1ae 100755 --- a/TVectorTree.h +++ b/TVectorTree.h @@ -58,6 +58,7 @@ class TVectorTree : public wxTreeCtrl void rsAddAndCut ( wxCommandEvent &ev ) ; ///< Event redirect to parent child void rsCutWithCocktail ( wxCommandEvent &ev ) ; ///< Event redirect to parent child void vecEdit ( wxCommandEvent &ev ) ; ///< Event redirect to parent child + void itemCopyDNA ( wxCommandEvent &ev ) ; ///< Event redirect to parent child void blastDNA ( wxCommandEvent &ev ) ; ///< Event redirect to parent child void blastAA ( wxCommandEvent &ev ) ; ///< Event redirect to parent child diff --git a/main.cpp b/main.cpp index 0120fab2..2cde5887 100755 --- a/main.cpp +++ b/main.cpp @@ -233,6 +233,10 @@ bool MyApp::OnInit() wxApp::s_macExitMenuItemId = MDI_QUIT; // wxApp::s_macHelpMenuTitleName = "Help"; +#endif + +#ifdef __DEBIAN__ + homedir = _T("/usr/share/gentle") ; #endif wxInitAllImageHandlers() ; diff --git a/main.h b/main.h index a8bf0853..4f14b72f 100755 --- a/main.h +++ b/main.h @@ -4,6 +4,8 @@ #ifndef _MAIN_H_ #define _MAIN_H_ +//#define __DEBIAN__ + #define GENTLE_VERSION_MAJOR 1 #define GENTLE_VERSION_MINOR 8 #define GENTLE_VERSION_SUB 0