| Index: views/examples/radio_button_example.h
|
| diff --git a/views/examples/radio_button_example.h b/views/examples/radio_button_example.h
|
| index abe5a4c7ff21c54ed61b601cf9746ddac2ba6302..561070041313f88ccfcbfd7a978289e6fc7ab110 100644
|
| --- a/views/examples/radio_button_example.h
|
| +++ b/views/examples/radio_button_example.h
|
| @@ -13,10 +13,18 @@
|
|
|
| namespace examples {
|
|
|
| -class RadioButtonExample : protected ExampleBase,
|
| - private views::ButtonListener {
|
| +class RadioButtonExample : public ExampleBase,
|
| + public views::ButtonListener {
|
| public:
|
| - explicit RadioButtonExample(ExamplesMain* main) : ExampleBase(main) {
|
| + explicit RadioButtonExample(ExamplesMain* main): ExampleBase(main) {}
|
| +
|
| + virtual ~RadioButtonExample() {}
|
| +
|
| + virtual std::wstring GetExampleTitle() {
|
| + return L"Radio Button";
|
| + }
|
| +
|
| + virtual void CreateExampleView(views::View* container) {
|
| select_ = new views::TextButton(this, L"Select");
|
| status_ = new views::TextButton(this, L"Show Status");
|
|
|
| @@ -31,9 +39,8 @@ class RadioButtonExample : protected ExampleBase,
|
| group);
|
| }
|
|
|
| - container_ = new views::View();
|
| - views::GridLayout* layout = new views::GridLayout(container_);
|
| - container_->SetLayoutManager(layout);
|
| + views::GridLayout* layout = new views::GridLayout(container);
|
| + container->SetLayoutManager(layout);
|
|
|
| views::ColumnSet* column_set = layout->AddColumnSet(0);
|
| column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
|
| @@ -48,16 +55,6 @@ class RadioButtonExample : protected ExampleBase,
|
| layout->AddView(status_);
|
| }
|
|
|
| - virtual ~RadioButtonExample() {}
|
| -
|
| - virtual std::wstring GetExampleTitle() {
|
| - return L"Radio Button";
|
| - }
|
| -
|
| - virtual views::View* GetExampleView() {
|
| - return container_;
|
| - }
|
| -
|
| private:
|
| // Override from ButtonListener
|
| virtual void ButtonPressed(views::Button* sender, const views::Event& event) {
|
| @@ -76,9 +73,6 @@ class RadioButtonExample : protected ExampleBase,
|
| }
|
| }
|
|
|
| - // The view containing this test's controls.
|
| - views::View* container_;
|
| -
|
| // 6 radio buttons, 0-2 consists 1st group, and 3-5 consists
|
| // 2nd group.
|
| views::RadioButton* radio_buttons_[6];
|
|
|