Updated to bring Linux build into line with Win 1.2.0.3
This commit is contained in:
parent
cdd282d27b
commit
0f47c03197
|
@ -209,9 +209,9 @@ bool HouseStyle::createReport()
|
|||
try {
|
||||
if (type == HS_TYPE_SPELL)
|
||||
spellcheck = new WrapAspell(
|
||||
ruleFile // carries lang information
|
||||
ruleFile, // carries lang information
|
||||
#ifdef __WXMSW__
|
||||
, aspellDataPath,
|
||||
aspellDataPath,
|
||||
aspellDictPath
|
||||
#endif
|
||||
);
|
||||
|
|
|
@ -29,9 +29,9 @@ class WrapAspell
|
|||
{
|
||||
public:
|
||||
WrapAspell (
|
||||
std::string lang// = "en_US",
|
||||
std::string lang,// = "en_US",
|
||||
#ifdef __WXMSW__
|
||||
, const std::string& aspellDataPathParameter,
|
||||
const std::string& aspellDataPathParameter,
|
||||
const std::string& aspellDictPath
|
||||
#endif
|
||||
);
|
||||
|
|
|
@ -2275,11 +2275,9 @@ void MyFrame::OnSplitTab ( wxCommandEvent& event )
|
|||
if ( currentSelection == -1 )
|
||||
return;
|
||||
*/
|
||||
|
||||
int currentSelection, direction;
|
||||
currentSelection = mainBook->GetSelection();
|
||||
direction = wxAUI_NB_RIGHT;
|
||||
|
||||
switch ( id )
|
||||
{
|
||||
ID_SPLIT_TAB_TOP:
|
||||
|
@ -4966,13 +4964,13 @@ wxMenuBar *MyFrame::getMenuBar()
|
|||
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;
|
||||
splitTabMenu->Append ( ID_SPLIT_TAB_TOP, _ ( "&Top" ), _ ( "Top" ));
|
||||
splitTabMenu->Append ( ID_SPLIT_TAB_RIGHT, _ ( "&Right" ), _ ( "Right" ));
|
||||
splitTabMenu->Append ( ID_SPLIT_TAB_BOTTOM, _ ( "&Bottom" ), _ ( "Bottom" ));
|
||||
splitTabMenu->Append ( ID_SPLIT_TAB_LEFT, _ ( "&Left" ), _ ( "Left" ));
|
||||
/**/
|
||||
*/
|
||||
|
||||
viewMenu = new wxMenu; // use class-wide data member
|
||||
viewMenu->Append ( ID_PREVIOUS_DOCUMENT, _ ( "&Previous Document\tCtrl+PgUp" ), _ ( "Previous Document" ) );
|
||||
|
|
|
@ -354,7 +354,6 @@ void XmlCtrl::handleDelete ( wxKeyEvent& event )
|
|||
startLine = LineFromPosition ( start );
|
||||
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
|
||||
int column = GetColumn ( GetCurrentPos() );
|
||||
|
||||
|
@ -382,7 +381,6 @@ void XmlCtrl::handleDelete ( wxKeyEvent& event )
|
|||
return;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
if ( !canMoveRightAt ( GetCurrentPos() ) &&
|
||||
GetSelectionStart() == GetSelectionEnd() )
|
||||
|
|
Loading…
Reference in New Issue