diff --git a/src/mypropertysheet.cpp b/src/mypropertysheet.cpp index a1044b9..44a1b7c 100755 --- a/src/mypropertysheet.cpp +++ b/src/mypropertysheet.cpp @@ -45,9 +45,6 @@ MyPropertySheet::MyPropertySheet ( bool expandInternalEntitiesParameter, bool showFullPathOnFrameParameter, int lang, -#ifdef __WXMSW__ - bool useCoolBarParameter, -#endif wxWindowID id, wxString title, const wxPoint& position, @@ -253,12 +250,6 @@ MyPropertySheet::MyPropertySheet ( generalPanel, wxID_ANY, _ ( "S&how full path on frame" ) ); fullPathBox->SetValue ( showFullPathOnFrameParameter ); -#ifdef __WXMSW__ - useCoolBarBox = new wxCheckBox ( - generalPanel, wxID_ANY, _ ( "&Use Microsoft rebar control (restart required)" ) ); - useCoolBarBox->SetValue ( useCoolBarParameter ); -#endif - hsizer->Add ( applicationDirEdit, 0, wxALL | wxALIGN_LEFT, 0 ); hsizer->Add ( browse, 0, wxLEFT | wxALIGN_LEFT, 5 ); hsizerBrowser->Add ( browserCommandEdit, 0, wxALL | wxALIGN_LEFT, 0 ); @@ -275,13 +266,10 @@ MyPropertySheet::MyPropertySheet ( vsizerCheckbox1->Add ( expandInternalEntitiesBox, 0, wxALL | wxALIGN_LEFT, 5 ); vsizerCheckbox1->Add ( singleInstanceCheckBox, 0, wxALL | wxALIGN_LEFT, 5 ); vsizerCheckbox1->Add ( restoreLayoutBox, 0, wxALL | wxALIGN_LEFT, 5 ); - vsizerCheckbox1->Add ( rememberOpenTabsBox, 0, wxALL | wxALIGN_LEFT, 5 ); + vsizerCheckbox2->Add ( rememberOpenTabsBox, 0, wxALL | wxALIGN_LEFT, 5 ); vsizerCheckbox2->Add ( unlimitedUndoBox, 0, wxALL | wxALIGN_LEFT, 5 ); vsizerCheckbox2->Add ( saveBomBox, 0, wxALL | wxALIGN_LEFT, 5 ); vsizerCheckbox2->Add ( fullPathBox, 0, wxALL | wxALIGN_LEFT, 5 ); -#ifdef __WXMSW__ - vsizerCheckbox2->Add ( useCoolBarBox, 0, wxALL | wxALIGN_LEFT, 5 ); -#endif hsizerCheckboxes->Add ( vsizerCheckbox1, 0, wxALL | wxALIGN_LEFT, 0 ); hsizerCheckboxes->Add ( vsizerCheckbox2, 0, wxALL | wxALIGN_LEFT, 0 ); vsizer->Add ( hsizerCheckboxes, 0, wxALL | wxALIGN_LEFT, 5 ); @@ -333,9 +321,6 @@ void MyPropertySheet::OnOk ( wxCommandEvent& e ) unlimitedUndo = unlimitedUndoBox->GetValue(); expandInternalEntities = expandInternalEntitiesBox->GetValue(); showFullPathOnFrame = fullPathBox->GetValue(); -#ifdef __WXMSW__ - useCoolBar = useCoolBarBox->GetValue(); -#endif int languageChoice = languageBox->GetSelection(); switch ( languageChoice ) @@ -422,13 +407,6 @@ bool MyPropertySheet::getUnlimitedUndo() return unlimitedUndo; } -#ifdef __WXMSW__ -bool MyPropertySheet::getUseCoolBar() -{ - return useCoolBar; -} -#endif - int MyPropertySheet::getLang() { return lang; diff --git a/src/mypropertysheet.h b/src/mypropertysheet.h index a5778c3..911b2a6 100755 --- a/src/mypropertysheet.h +++ b/src/mypropertysheet.h @@ -59,9 +59,6 @@ public: bool expandInternalEntities, bool showFullPathOnFrame, int lang, -#ifdef __WXMSW__ - bool useCoolBar, -#endif wxWindowID id = wxID_ANY, wxString title = _T ( "" ), const wxPoint& position = wxDefaultPosition, @@ -82,9 +79,6 @@ public: bool getRestoreLayout(); bool getExpandInternalEntities(); bool getShowFullPathOnFrame(); -#ifdef __WXMSW__ - bool getUseCoolBar(); -#endif int getLang(); private: int lang; @@ -93,7 +87,6 @@ private: *foldBox, *numberBox, *whitespaceVisibleBox, - //*wrapBox, *indentLinesBox, *deleteWholeTagBox, *rememberOpenTabsBox, @@ -105,9 +98,6 @@ private: *validateAsYouTypeBox, *fullPathBox, *highlightSyntaxBox, -#ifdef __WXMSW__ - *useCoolBarBox, -#endif *unlimitedUndoBox, *restoreLayoutBox, *expandInternalEntitiesBox, @@ -120,9 +110,6 @@ private: rememberOpenTabs, libxmlNetAccess, saveBom, -#ifdef __WXMSW__ - useCoolBar, -#endif unlimitedUndo, restoreLayout, expandInternalEntities,