Remove the test of erase background events from the toolbar sample.

Handling erase background events for toolbars never worked for the ports other
than wxMSW and now it doesn't work for MSW neither as we need to skip erasing
the background in WM_ERASEBKGND handler to avoid flicker which would result
from erasing the background twice, from there and from WM_PAINT handler which
must do it. So don't even try to test if it works, it's unlikely to be very
useful anyhow.

This reverts the change to this file in r62805.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 2c62dcd5c0a4a11e28a8373b1ba0e443f6d9a58b..9fc57c6030735d3cfb9a95e23c149d68eb887d77 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -134,7 +134,6 @@ public:
 
     void OnToolbarStyle(wxCommandEvent& event);
     void OnToolbarBgCol(wxCommandEvent& event);
-    void OnToolbarCustomBg(wxCommandEvent& event);
     void OnToolbarCustomBitmap(wxCommandEvent& event);
 
     void OnToolLeftClick(wxCommandEvent& event);
@@ -149,8 +148,6 @@ public:
         { event.Enable( m_tbar != NULL ); }
 
 private:
-    void OnEraseToolBarBackground(wxEraseEvent& event);
-
     void DoEnablePrint();
     void DoDeletePrint();
     void DoToggleHelp();
@@ -209,7 +206,6 @@ enum
     IDM_TOOLBAR_SHOW_ICONS,
     IDM_TOOLBAR_SHOW_BOTH,
     IDM_TOOLBAR_BG_COL,
-    IDM_TOOLBAR_CUSTOM_BG,
     IDM_TOOLBAR_CUSTOM_PATH,
     IDM_TOOLBAR_TOP_ORIENTATION,
     IDM_TOOLBAR_LEFT_ORIENTATION,
@@ -268,7 +264,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU_RANGE(IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_BOTH,
                    MyFrame::OnToolbarStyle)
     EVT_MENU(IDM_TOOLBAR_BG_COL, MyFrame::OnToolbarBgCol)
-    EVT_MENU(IDM_TOOLBAR_CUSTOM_BG, MyFrame::OnToolbarCustomBg)
 
     EVT_MENU(IDM_TOOLBAR_CUSTOM_PATH, MyFrame::OnToolbarCustomBitmap)
 
@@ -376,17 +371,6 @@ void MyFrame::RecreateToolbar()
     toolBar = CreateToolBar(style, ID_TOOLBAR);
 #endif
 
-    if ( GetMenuBar()->IsChecked(IDM_TOOLBAR_CUSTOM_BG) )
-    {
-        toolBar->Connect
-                 (
-                    wxEVT_ERASE_BACKGROUND,
-                    wxEraseEventHandler(MyFrame::OnEraseToolBarBackground),
-                    NULL,
-                    this
-                 );
-    }
-
     PopulateToolbar(toolBar);
 }
 
@@ -612,7 +596,6 @@ MyFrame::MyFrame(wxFrame* parent,
     tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_BOTH, wxT("Show &both\tCtrl-Alt-B"));
     tbarMenu->AppendSeparator();
     tbarMenu->Append(IDM_TOOLBAR_BG_COL, wxT("Choose bac&kground colour..."));
-    tbarMenu->AppendCheckItem(IDM_TOOLBAR_CUSTOM_BG, wxT("Draw custom back&ground"));
     tbarMenu->Append(IDM_TOOLBAR_CUSTOM_PATH, wxT("Custom &bitmap...\tCtrl-B"));
 
     wxMenu *toolMenu = new wxMenu;
@@ -712,15 +695,6 @@ void MyFrame::OnSize(wxSizeEvent& event)
     }
 }
 
-void MyFrame::OnEraseToolBarBackground(wxEraseEvent& event)
-{
-    wxDC& dc = *event.GetDC();
-    const wxSize size = dc.GetSize();
-    dc.SetPen(*wxRED_PEN);
-    dc.DrawLine(0, 0, size.x, size.y);
-    dc.DrawLine(0, size.y, size.x, 0);
-}
-
 void MyFrame::OnToggleToolbar(wxCommandEvent& WXUNUSED(event))
 {
     wxToolBar *tbar = GetToolBar();
@@ -985,34 +959,6 @@ void MyFrame::OnToolbarBgCol(wxCommandEvent& WXUNUSED(event))
     }
 }
 
-void MyFrame::OnToolbarCustomBg(wxCommandEvent& event)
-{
-    wxToolBarBase *tb = GetToolBar();
-
-    if ( event.IsChecked() )
-    {
-        tb->Connect
-            (
-             wxEVT_ERASE_BACKGROUND,
-             wxEraseEventHandler(MyFrame::OnEraseToolBarBackground),
-             NULL,
-             this
-            );
-    }
-    else
-    {
-        tb->Disconnect
-            (
-             wxEVT_ERASE_BACKGROUND,
-             wxEraseEventHandler(MyFrame::OnEraseToolBarBackground),
-             NULL,
-             this
-            );
-    }
-
-    tb->Refresh();
-}
-
 void MyFrame::OnToolbarCustomBitmap(wxCommandEvent& WXUNUSED(event))
 {
     m_pathBmp = wxLoadFileSelector("custom bitmap", "");