Oops, revert unready work

Revert "new button images for time ruler"

This reverts commit 26ec0100a29f5b90656f77a48d18dd7987bef395.

Revert "add button"

This reverts commit af5163025a19c334e2f8151f16c75acaa705e913.

Revert "ToolBar::MakeButton is public and static"

This reverts commit 668714942ba61a652e335973c416c4cba8f6234f.

src/toolbars/ControlToolBar.cpp

@@ -129,7 +129,7 @@ AButton *ControlToolBar::MakeButton(teBmps eEnabledUp, teBmps eEnabledDown, teBm
                                     bool processdownevents,
                                     const wxChar *label)
 {
-   AButton *r = ToolBar::MakeButton(this,
+   AButton *r = ToolBar::MakeButton(
       bmpRecoloredUpLarge, bmpRecoloredDownLarge, bmpRecoloredHiliteLarge,
       eEnabledUp, eEnabledDown, eDisabled,
       wxWindowID(id),

src/toolbars/EditToolBar.cpp

@@ -105,7 +105,7 @@ AButton *EditToolBar::AddButton(
 {
    AButton *&r = mButtons[id];
 
-   r = ToolBar::MakeButton(this,
+   r = ToolBar::MakeButton(
       bmpRecoloredUpSmall, bmpRecoloredDownSmall, bmpRecoloredHiliteSmall,
       eEnabledUp, eEnabledDown, eDisabled,
       wxWindowID(id),

src/toolbars/ToolBar.cpp

@@ -700,7 +700,6 @@ void ToolBar::MakeButtonBackgroundsSmall()
 }
 
 /// Makes a button and its four different state bitmaps
-/// @param parent            Parent window for the button.
 /// @param eUp               Background for when button is Up.
 /// @param eDown             Background for when button is Down.
 /// @param eHilite           Background for when button is Hilit.
@@ -711,8 +710,7 @@ void ToolBar::MakeButtonBackgroundsSmall()
 /// @param placement         Placement position
 /// @param processdownevents true iff button handles down events.
 /// @param size              Size of the background.
-AButton * ToolBar::MakeButton(wxWindow *parent,
-                              teBmps eUp,
+AButton * ToolBar::MakeButton(teBmps eUp,
                               teBmps eDown,
                               teBmps eHilite,
                               teBmps eStandardUp,
@@ -733,7 +731,7 @@ AButton * ToolBar::MakeButton(wxWindow *parent,
    wxImagePtr disable2   (OverlayImage(eUp,     eDisabled, xoff, yoff));
 
    AButton * button =
-      new AButton(parent, id, placement, size, *up2, *hilite2, *down2,
+      new AButton(this, id, placement, size, *up2, *hilite2, *down2,
             *disable2, processdownevents);
 
    return button;

src/toolbars/ToolBar.h

@@ -121,11 +121,9 @@ class ToolBar /* not final */ : public wxPanel
    virtual int GetInitialWidth() { return -1; }
    virtual int GetMinToolbarWidth() { return GetInitialWidth(); }
    virtual wxSize GetDockedSize() { return GetMinSize(); }
+ protected:
 
- public:
-   static
-   AButton *MakeButton(wxWindow *parent,
-                       teBmps eUp,
+   AButton *MakeButton(teBmps eUp,
                        teBmps eDown,
                        teBmps eHilite,
                        teBmps eStandardUp,
@@ -136,7 +134,6 @@ class ToolBar /* not final */ : public wxPanel
                        bool processdownevents,
                        wxSize size);
 
- protected:
    static
    void MakeAlternateImages(AButton &button, int idx,
                             teBmps eUp,

src/toolbars/ToolsToolBar.cpp

@@ -156,7 +156,7 @@ void ToolsToolBar::UpdatePrefs()
 AButton * ToolsToolBar::MakeTool( teBmps eTool,
    int id, const wxChar *label)
 {
-   AButton *button = ToolBar::MakeButton(this,
+   AButton *button = ToolBar::MakeButton(
       bmpRecoloredUpSmall, bmpRecoloredDownSmall, bmpRecoloredHiliteSmall,
       eTool, eTool, eTool,
       wxWindowID(id),

src/toolbars/TranscriptionToolBar.cpp

@@ -147,7 +147,7 @@ AButton *TranscriptionToolBar::AddButton(
 {
    AButton *&r = mButtons[id];
 
-   r = ToolBar::MakeButton(this,
+   r = ToolBar::MakeButton(
       bmpRecoloredUpSmall, bmpRecoloredDownSmall, bmpRecoloredHiliteSmall,
       eFore, eFore, eDisabled,
       wxWindowID(id),

src/widgets/Ruler.cpp

@@ -1957,16 +1957,6 @@ AdornedRulerPanel::AdornedRulerPanel(AudacityProject* parent,
 , mProject(parent)
 , mViewInfo(viewinfo)
 {
-   {
-      ToolBar::MakeButton(this,
-                              bmpRecoloredUpSmall, bmpRecoloredDownSmall, bmpRecoloredHiliteSmall,
-
-                          bmpSyncLockTracksUp, bmpSyncLockTracksDown, bmpSyncLockTracksDisabled,                               wxWindowID(id),
-                              wxDefaultPosition,
-                              true,
-                              theTheme.ImageSize( bmpRecoloredUpSmall ));
-   }
-
    SetLabel( _("Timeline") );
    SetName(GetLabel());
    SetBackgroundStyle(wxBG_STYLE_PAINT);