From a1f2daa6d8633ad658b541f505f86c97e3d587b8 Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Fri, 10 Jul 2009 14:50:00 +0000 Subject: [PATCH] Do not disable some useful buttons when wxCB_SORT style is used in wxBitmapComboBox sample git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/widgets/bmpcombobox.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp index 8bbd7580b3..6de6f2ff54 100644 --- a/samples/widgets/bmpcombobox.cpp +++ b/samples/widgets/bmpcombobox.cpp @@ -139,8 +139,6 @@ protected: void OnTextButtonAll(wxCommandEvent& event); void OnUpdateUIInsert(wxUpdateUIEvent& event); - void OnUpdateUIAddSeveral(wxUpdateUIEvent& event); - void OnUpdateUIAddSeveralWithImages(wxUpdateUIEvent& event); void OnUpdateUIClearButton(wxUpdateUIEvent& event); void OnUpdateUIDeleteButton(wxUpdateUIEvent& event); void OnUpdateUIItemManipulator(wxUpdateUIEvent& event); @@ -218,8 +216,6 @@ BEGIN_EVENT_TABLE(BitmapComboBoxWidgetsPage, WidgetsPage) EVT_UPDATE_UI(BitmapComboBoxPage_Reset, BitmapComboBoxWidgetsPage::OnUpdateUIResetButton) EVT_UPDATE_UI(BitmapComboBoxPage_Insert, BitmapComboBoxWidgetsPage::OnUpdateUIInsert) EVT_UPDATE_UI(BitmapComboBoxPage_LoadFromFile, BitmapComboBoxWidgetsPage::OnUpdateUIInsert) - EVT_UPDATE_UI(BitmapComboBoxPage_AddSeveral, BitmapComboBoxWidgetsPage::OnUpdateUIAddSeveral) - EVT_UPDATE_UI(BitmapComboBoxPage_AddSeveralWithImages, BitmapComboBoxWidgetsPage::OnUpdateUIAddSeveralWithImages) EVT_UPDATE_UI(BitmapComboBoxPage_Clear, BitmapComboBoxWidgetsPage::OnUpdateUIClearButton) EVT_UPDATE_UI(BitmapComboBoxPage_DeleteText, BitmapComboBoxWidgetsPage::OnUpdateUIClearButton) EVT_UPDATE_UI(BitmapComboBoxPage_Delete, BitmapComboBoxWidgetsPage::OnUpdateUIDeleteButton) @@ -796,18 +792,6 @@ void BitmapComboBoxWidgetsPage::OnUpdateUIClearButton(wxUpdateUIEvent& event) event.Enable(m_combobox->GetCount() != 0); } -void BitmapComboBoxWidgetsPage::OnUpdateUIAddSeveral(wxUpdateUIEvent& event) -{ - if (m_combobox) - event.Enable(!(m_combobox->GetWindowStyle() & wxCB_SORT)); -} - -void BitmapComboBoxWidgetsPage::OnUpdateUIAddSeveralWithImages(wxUpdateUIEvent& event) -{ - if (m_combobox) - event.Enable(!(m_combobox->GetWindowStyle() & wxCB_SORT)); -} - void BitmapComboBoxWidgetsPage::OnComboText(wxCommandEvent& event) { if (!m_combobox) -- 2.47.2