neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated to bring Linux build into line with Win 1.2.0.3

This commit is contained in:
Gerald Schmidt 2009-02-13 15:35:42 +00:00
parent cdd282d27b
commit 0f47c03197
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/housestyle.cpp
View File

@ -209,9 +209,9 @@ bool HouseStyle::createReport()
try { try {
if (type == HS_TYPE_SPELL) if (type == HS_TYPE_SPELL)
spellcheck = new WrapAspell( spellcheck = new WrapAspell(
ruleFile // carries lang information ruleFile, // carries lang information
#ifdef __WXMSW__ #ifdef __WXMSW__
, aspellDataPath, aspellDataPath,
aspellDictPath aspellDictPath
#endif #endif
); );

4
src/wrapaspell.h
View File

@ -29,9 +29,9 @@ class WrapAspell
{ {
public: public:
WrapAspell ( WrapAspell (
std::string lang// = "en_US", std::string lang,// = "en_US",
#ifdef __WXMSW__ #ifdef __WXMSW__
, const std::string& aspellDataPathParameter, const std::string& aspellDataPathParameter,
const std::string& aspellDictPath const std::string& aspellDictPath
#endif #endif
); );

6
src/xmlcopyeditor.cpp
View File

@ -2275,11 +2275,9 @@ void MyFrame::OnSplitTab ( wxCommandEvent& event )
if ( currentSelection == -1 ) if ( currentSelection == -1 )
return; return;
*/ */
int currentSelection, direction; int currentSelection, direction;
currentSelection = mainBook->GetSelection(); currentSelection = mainBook->GetSelection();
direction = wxAUI_NB_RIGHT; direction = wxAUI_NB_RIGHT;
switch ( id ) switch ( id )
{ {
ID_SPLIT_TAB_TOP: ID_SPLIT_TAB_TOP:
@ -4966,13 +4964,13 @@ wxMenuBar *MyFrame::getMenuBar()
break; break;
} }
/* WAIT FOR AUI LIBRARY TO SUPPORT THIS - currently always splits left */ /* WAIT FOR AUI LIBRARY TO SUPPORT THIS - currently always splits left
wxMenu *splitTabMenu = new wxMenu; wxMenu *splitTabMenu = new wxMenu;
splitTabMenu->Append ( ID_SPLIT_TAB_TOP, _ ( "&Top" ), _ ( "Top" )); splitTabMenu->Append ( ID_SPLIT_TAB_TOP, _ ( "&Top" ), _ ( "Top" ));
splitTabMenu->Append ( ID_SPLIT_TAB_RIGHT, _ ( "&Right" ), _ ( "Right" )); splitTabMenu->Append ( ID_SPLIT_TAB_RIGHT, _ ( "&Right" ), _ ( "Right" ));
splitTabMenu->Append ( ID_SPLIT_TAB_BOTTOM, _ ( "&Bottom" ), _ ( "Bottom" )); splitTabMenu->Append ( ID_SPLIT_TAB_BOTTOM, _ ( "&Bottom" ), _ ( "Bottom" ));
splitTabMenu->Append ( ID_SPLIT_TAB_LEFT, _ ( "&Left" ), _ ( "Left" )); splitTabMenu->Append ( ID_SPLIT_TAB_LEFT, _ ( "&Left" ), _ ( "Left" ));
/**/ */
viewMenu = new wxMenu; // use class-wide data member viewMenu = new wxMenu; // use class-wide data member
viewMenu->Append ( ID_PREVIOUS_DOCUMENT, _ ( "&Previous Document\tCtrl+PgUp" ), _ ( "Previous Document" ) ); viewMenu->Append ( ID_PREVIOUS_DOCUMENT, _ ( "&Previous Document\tCtrl+PgUp" ), _ ( "Previous Document" ) );

2
src/xmlctrl.cpp
View File

@ -354,7 +354,6 @@ void XmlCtrl::handleDelete ( wxKeyEvent& event )
startLine = LineFromPosition ( start ); startLine = LineFromPosition ( start );
endLine = LineFromPosition ( end ); endLine = LineFromPosition ( end );
/* commented out: redundant as covered by shift-tab
// add test so range unindentation only happens when caret is flush with left margin // add test so range unindentation only happens when caret is flush with left margin
int column = GetColumn ( GetCurrentPos() ); int column = GetColumn ( GetCurrentPos() );
@ -382,7 +381,6 @@ void XmlCtrl::handleDelete ( wxKeyEvent& event )
return; return;
} }
} }
*/
if ( !canMoveRightAt ( GetCurrentPos() ) && if ( !canMoveRightAt ( GetCurrentPos() ) &&
GetSelectionStart() == GetSelectionEnd() ) GetSelectionStart() == GetSelectionEnd() )