From caaebf43bc4c1bf57bde2c58d46a77e07f086353 Mon Sep 17 00:00:00 2001 From: New Pagodi Date: Tue, 25 Jun 2019 15:51:58 -0500 Subject: [PATCH] Remove wxSTC methods for configuring autocomp popup The wxSTC methods AutoCompSetColours and AutoCompUseListCtrl were added in fe7b332b7be1f958676f5eccab7459ab3a171403 to allow some configuration of the autocompletion popup window. Based on subsequent discussion, it was decided that a better method of configuring the popup and getting information about the configuration is needed. For now, simply remove the current methods while the better solution is created. In addition, since the configuration options are being removed, set the popup to have the appearance of a list control since that was the appearance before any configuration options were added. --- include/wx/stc/stc.h | 10 -------- interface/wx/stc/stc.h | 48 -------------------------------------- src/stc/PlatWX.cpp | 14 +---------- src/stc/PlatWX.h | 3 --- src/stc/ScintillaWX.cpp | 18 -------------- src/stc/ScintillaWX.h | 3 --- src/stc/stc.cpp | 16 ------------- src/stc/stc.cpp.in | 16 ------------- src/stc/stc.h.in | 10 -------- src/stc/stc.interface.h.in | 48 -------------------------------------- 10 files changed, 1 insertion(+), 185 deletions(-) diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index 8c68f743c7..53c6ab6032 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -5187,16 +5187,6 @@ public: // Register an image for use in autocompletion lists. void RegisterImage(int type, const wxBitmap& bmp); - // Set the colours used to display the items in an autocompletion list. - void AutoCompSetColours(const wxColour& background, const wxColour& text, - const wxColour& highlight, - const wxColour& highlightText); - - // Use a wxListCtrl to display autocompletion lists. - void AutoCompUseListCtrl(bool useListCtrl = true, - const wxColour& currentBgColour = wxNullColour, - const wxColour& currentTextColour = wxNullColour); - // The following methods are nearly equivalent to their similarly named diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h index f7ca8e70c6..21a3a4cac4 100644 --- a/interface/wx/stc/stc.h +++ b/interface/wx/stc/stc.h @@ -7423,54 +7423,6 @@ public: */ void RegisterImage(int type, const wxBitmap& bmp); - /** - Set the colours used to display the items in an autocompletion list. - - This method can be used if the default colours make the list hard to - read or if specific colours are desired for whatever reason. - @param background - The colour used for the background of the list. - @param text - The colour used for all text except for the selected item. - @param highlight - The colour used to highlight the selected item in the list. - @param highlightText - The colour used for the text of the selected item. - @remarks - To reset one or more of the colours to its default, - call this method with wxNullColour for the colour or colours - to be reset. - - @since 3.1.3 - */ - void AutoCompSetColours(const wxColour& background, const wxColour& text, - const wxColour& highlight, - const wxColour& highlightText); - - /** - Use a wxListCtrl to display autocompletion and user lists. - - By default lists will be displayed in a wxListBox. Use this method to - display them in a wxListCtrl instead. The primary difference is that - wxListCtrl has hot tracking to highlight the item under the mouse cursor. - @param useListCtrl - Set this to true to use a wxListCtrl and to false to use a - wxListBox. - @param currentBgColour - The colour used to highlight the item under the mouse cursor. - @param currentTextColour - The colour used for the text of the item under the mouse cursor. - @remarks - To reset one or more of the colours to its default, - call this method with wxNullColour for the colour or colours - to be reset. - - @since 3.1.3 - */ - void AutoCompUseListCtrl(bool useListCtrl = true, - const wxColour& currentBgColour = wxNullColour, - const wxColour& currentTextColour = wxNullColour); - //@} diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp index c9fdfe9ee8..0a1289e5c6 100644 --- a/src/stc/PlatWX.cpp +++ b/src/stc/PlatWX.cpp @@ -2356,7 +2356,7 @@ wxSTCListBoxVisualData::wxSTCListBoxVisualData(int d):m_desiredVisibleRows(d), m_useDefaultTextColour(true), m_useDefaultHighlightBgColour(true), m_useDefaultHighlightTextColour(true), - m_hasListCtrlAppearance(false), + m_hasListCtrlAppearance(true), m_useDefaultCurrentBgColour(true), m_useDefaultCurrentTextColour(true) { @@ -3163,18 +3163,6 @@ void ListBoxImpl::SetDoubleClickAction(CallBackAction action, void *data) { m_listBox->SetDoubleClickAction(action, data); } -void ListBoxImpl::SetColours(const wxColour& background, const wxColour& text, - const wxColour& hiliBg, const wxColour& hiliText) -{ - m_visualData->SetColours(background, text, hiliBg, hiliText); -} - -void ListBoxImpl::UseListCtrlStyle(bool useListCtrl, const wxColour& currentBg, - const wxColour& currentText) -{ - m_visualData->UseListCtrlStyle(useListCtrl, currentBg, currentText); -} - ListBox::ListBox() { } diff --git a/src/stc/PlatWX.h b/src/stc/PlatWX.h index 8449c870d2..52c7eb92c9 100644 --- a/src/stc/PlatWX.h +++ b/src/stc/PlatWX.h @@ -49,9 +49,6 @@ public: virtual void ClearRegisteredImages() wxOVERRIDE; virtual void SetDoubleClickAction(CallBackAction, void *) wxOVERRIDE; virtual void SetList(const char* list, char separator, char typesep) wxOVERRIDE; - void SetColours(const wxColour&, const wxColour&, - const wxColour&, const wxColour&); - void UseListCtrlStyle(bool, const wxColour&, const wxColour&); }; diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 9dcd59814c..3796bf9f9f 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -1399,24 +1399,6 @@ void ScintillaWX::DoRegisterImage(int type, const wxBitmap& bmp) { static_cast(ac.lb)->RegisterImageHelper(type, bmp); } -void ScintillaWX::SetListBoxColours(const wxColour& background, - const wxColour& text, - const wxColour& highlight, - const wxColour& highlightText) -{ - static_cast(ac.lb)->SetColours(background, text, - highlight, highlightText); -} - -void ScintillaWX::UseListCtrlStyleForLists(bool useListCtrl, - const wxColour& currentBgColour, - const wxColour& currentTextColour) -{ - static_cast(ac.lb)->UseListCtrlStyle(useListCtrl, - currentBgColour, - currentTextColour); -} - sptr_t ScintillaWX::DirectFunction( ScintillaWX* swx, unsigned int iMessage, uptr_t wParam, sptr_t lParam) { return swx->WndProc(iMessage, wParam, lParam); diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h index 5bbe6179c3..92079170e3 100644 --- a/src/stc/ScintillaWX.h +++ b/src/stc/ScintillaWX.h @@ -201,9 +201,6 @@ public: void SetPaintAbandoned(){paintState = paintAbandoned;} void DoMarkerDefineBitmap(int markerNumber, const wxBitmap& bmp); void DoRegisterImage(int type, const wxBitmap& bmp); - void SetListBoxColours(const wxColour&, const wxColour&, - const wxColour&, const wxColour&); - void UseListCtrlStyleForLists(bool, const wxColour&, const wxColour&); private: bool capturedMouse; diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp index 54695d5466..b01802915c 100644 --- a/src/stc/stc.cpp +++ b/src/stc/stc.cpp @@ -5046,22 +5046,6 @@ void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) m_swx->DoRegisterImage(type, bmp); } -void wxStyledTextCtrl::AutoCompSetColours(const wxColour& background, - const wxColour& text, - const wxColour& highlight, - const wxColour& highlightText) -{ - m_swx->SetListBoxColours(background, text, highlight, highlightText); -} - -void wxStyledTextCtrl::AutoCompUseListCtrl(bool useListCtrl, - const wxColour& currentBgColour, - const wxColour& currentTextColour) -{ - m_swx->UseListCtrlStyleForLists(useListCtrl, currentBgColour, - currentTextColour); -} - diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in index 91807cf3f9..fb44624ab7 100644 --- a/src/stc/stc.cpp.in +++ b/src/stc/stc.cpp.in @@ -573,22 +573,6 @@ void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) m_swx->DoRegisterImage(type, bmp); } -void wxStyledTextCtrl::AutoCompSetColours(const wxColour& background, - const wxColour& text, - const wxColour& highlight, - const wxColour& highlightText) -{ - m_swx->SetListBoxColours(background, text, highlight, highlightText); -} - -void wxStyledTextCtrl::AutoCompUseListCtrl(bool useListCtrl, - const wxColour& currentBgColour, - const wxColour& currentTextColour) -{ - m_swx->UseListCtrlStyleForLists(useListCtrl, currentBgColour, - currentTextColour); -} - diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in index 593b5dce88..503f127c25 100644 --- a/src/stc/stc.h.in +++ b/src/stc/stc.h.in @@ -304,16 +304,6 @@ public: // Register an image for use in autocompletion lists. void RegisterImage(int type, const wxBitmap& bmp); - // Set the colours used to display the items in an autocompletion list. - void AutoCompSetColours(const wxColour& background, const wxColour& text, - const wxColour& highlight, - const wxColour& highlightText); - - // Use a wxListCtrl to display autocompletion lists. - void AutoCompUseListCtrl(bool useListCtrl = true, - const wxColour& currentBgColour = wxNullColour, - const wxColour& currentTextColour = wxNullColour); - // The following methods are nearly equivalent to their similarly named diff --git a/src/stc/stc.interface.h.in b/src/stc/stc.interface.h.in index a3c0334908..f2ac38130b 100644 --- a/src/stc/stc.interface.h.in +++ b/src/stc/stc.interface.h.in @@ -363,54 +363,6 @@ public: */ void RegisterImage(int type, const wxBitmap& bmp); - /** - Set the colours used to display the items in an autocompletion list. - - This method can be used if the default colours make the list hard to - read or if specific colours are desired for whatever reason. - @param background - The colour used for the background of the list. - @param text - The colour used for all text except for the selected item. - @param highlight - The colour used to highlight the selected item in the list. - @param highlightText - The colour used for the text of the selected item. - @remarks - To reset one or more of the colours to its default, - call this method with wxNullColour for the colour or colours - to be reset. - - @since 3.1.3 - */ - void AutoCompSetColours(const wxColour& background, const wxColour& text, - const wxColour& highlight, - const wxColour& highlightText); - - /** - Use a wxListCtrl to display autocompletion and user lists. - - By default lists will be displayed in a wxListBox. Use this method to - display them in a wxListCtrl instead. The primary difference is that - wxListCtrl has hot tracking to highlight the item under the mouse cursor. - @param useListCtrl - Set this to true to use a wxListCtrl and to false to use a - wxListBox. - @param currentBgColour - The colour used to highlight the item under the mouse cursor. - @param currentTextColour - The colour used for the text of the item under the mouse cursor. - @remarks - To reset one or more of the colours to its default, - call this method with wxNullColour for the colour or colours - to be reset. - - @since 3.1.3 - */ - void AutoCompUseListCtrl(bool useListCtrl = true, - const wxColour& currentBgColour = wxNullColour, - const wxColour& currentTextColour = wxNullColour); - //@}