X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/233f10bf15c7201e8733426cffdeb6595df539ae..5c892f574cb68906797b34cdf83e52c2055348f8:/samples/widgets/button.cpp diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp index c01bc1cd27..61b118ae0e 100644 --- a/samples/widgets/button.cpp +++ b/samples/widgets/button.cpp @@ -121,18 +121,18 @@ protected: // ------------ // the check/radio boxes for styles - wxCheckBox *m_chkBitmap, - *m_chkImage, + wxCheckBox *m_chkBitmapOnly, + *m_chkTextAndBitmap, *m_chkFit, *m_chkDefault; // more checkboxes for wxBitmapButton only - wxCheckBox *m_chkUseSelected, + wxCheckBox *m_chkUsePressed, *m_chkUseFocused, - *m_chkUseHover, + *m_chkUseCurrent, *m_chkUseDisabled; - // and an image position choice used if m_chkImage is on + // and an image position choice used if m_chkTextAndBitmap is on wxRadioBox *m_radioImagePos; wxRadioBox *m_radioHAlign, @@ -174,20 +174,20 @@ END_EVENT_TABLE() #define FAMILY_CTRLS NATIVE_CTRLS #endif -IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"), FAMILY_CTRLS ); +IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, wxT("Button"), FAMILY_CTRLS ); ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist) : WidgetsPage(book, imaglist, button_xpm) { // init everything - m_chkBitmap = - m_chkImage = + m_chkBitmapOnly = + m_chkTextAndBitmap = m_chkFit = m_chkDefault = - m_chkUseSelected = + m_chkUsePressed = m_chkUseFocused = - m_chkUseHover = + m_chkUseCurrent = m_chkUseDisabled = (wxCheckBox *)NULL; m_radioImagePos = @@ -205,23 +205,28 @@ void ButtonWidgetsPage::CreateContent() wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL); // left pane - wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style")); + wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style")); wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL); - m_chkBitmap = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Bitmap button")); - m_chkImage = CreateCheckBoxAndAddToSizer(sizerLeft, _T("With &image")); - m_chkFit = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Fit exactly")); - m_chkDefault = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Default")); + m_chkBitmapOnly = CreateCheckBoxAndAddToSizer(sizerLeft, "&Bitmap only"); + m_chkTextAndBitmap = CreateCheckBoxAndAddToSizer(sizerLeft, "Text &and &bitmap"); + m_chkFit = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Fit exactly")); + m_chkDefault = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Default")); sizerLeft->AddSpacer(5); wxSizer *sizerUseLabels = - new wxStaticBoxSizer(wxVERTICAL, this, _T("&Use the following bitmaps?")); - m_chkUseSelected = CreateCheckBoxAndAddToSizer(sizerUseLabels, _T("&Pushed")); - m_chkUseFocused = CreateCheckBoxAndAddToSizer(sizerUseLabels, _T("&Focused")); - m_chkUseHover = CreateCheckBoxAndAddToSizer(sizerUseLabels, _T("&Hover")); - m_chkUseDisabled = CreateCheckBoxAndAddToSizer(sizerUseLabels, _T("&Disabled")); + new wxStaticBoxSizer(wxVERTICAL, this, + "&Use the following bitmaps in addition to the normal one?"); + m_chkUsePressed = CreateCheckBoxAndAddToSizer(sizerUseLabels, + "&Pressed (small help icon)"); + m_chkUseFocused = CreateCheckBoxAndAddToSizer(sizerUseLabels, + "&Focused (small error icon)"); + m_chkUseCurrent = CreateCheckBoxAndAddToSizer(sizerUseLabels, + "&Current (small warning icon)"); + m_chkUseDisabled = CreateCheckBoxAndAddToSizer(sizerUseLabels, + "&Disabled (broken image icon)"); sizerLeft->Add(sizerUseLabels, wxSizerFlags().Expand().Border()); sizerLeft->AddSpacer(10); @@ -239,22 +244,22 @@ void ButtonWidgetsPage::CreateContent() // should be in sync with enums Button[HV]Align! static const wxString halign[] = { - _T("left"), - _T("centre"), - _T("right"), + wxT("left"), + wxT("centre"), + wxT("right"), }; static const wxString valign[] = { - _T("top"), - _T("centre"), - _T("bottom"), + wxT("top"), + wxT("centre"), + wxT("bottom"), }; - m_radioHAlign = new wxRadioBox(this, wxID_ANY, _T("&Horz alignment"), + m_radioHAlign = new wxRadioBox(this, wxID_ANY, wxT("&Horz alignment"), wxDefaultPosition, wxDefaultSize, WXSIZEOF(halign), halign); - m_radioVAlign = new wxRadioBox(this, wxID_ANY, _T("&Vert alignment"), + m_radioVAlign = new wxRadioBox(this, wxID_ANY, wxT("&Vert alignment"), wxDefaultPosition, wxDefaultSize, WXSIZEOF(valign), valign); @@ -263,18 +268,18 @@ void ButtonWidgetsPage::CreateContent() sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer - wxButton *btn = new wxButton(this, ButtonPage_Reset, _T("&Reset")); + wxButton *btn = new wxButton(this, ButtonPage_Reset, wxT("&Reset")); sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15); // middle pane - wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, _T("&Operations")); + wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Operations")); wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL); wxSizer *sizerRow = CreateSizerWithTextAndButton(ButtonPage_ChangeLabel, - _T("Change label"), + wxT("Change label"), wxID_ANY, &m_textLabel); - m_textLabel->SetValue(_T("&Press me!")); + m_textLabel->SetValue(wxT("&Press me!")); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); @@ -300,14 +305,14 @@ void ButtonWidgetsPage::CreateContent() void ButtonWidgetsPage::Reset() { - m_chkBitmap->SetValue(false); + m_chkBitmapOnly->SetValue(false); m_chkFit->SetValue(true); - m_chkImage->SetValue(false); + m_chkTextAndBitmap->SetValue(false); m_chkDefault->SetValue(false); - m_chkUseSelected->SetValue(true); + m_chkUsePressed->SetValue(true); m_chkUseFocused->SetValue(true); - m_chkUseHover->SetValue(true); + m_chkUseCurrent->SetValue(true); m_chkUseDisabled->SetValue(true); m_radioImagePos->SetSelection(ButtonImagePos_Left); @@ -346,7 +351,7 @@ void ButtonWidgetsPage::CreateButton() break; default: - wxFAIL_MSG(_T("unexpected radiobox selection")); + wxFAIL_MSG(wxT("unexpected radiobox selection")); // fall through case ButtonHAlign_Centre: @@ -364,7 +369,7 @@ void ButtonWidgetsPage::CreateButton() break; default: - wxFAIL_MSG(_T("unexpected radiobox selection")); + wxFAIL_MSG(wxT("unexpected radiobox selection")); // fall through case ButtonVAlign_Centre: @@ -376,19 +381,21 @@ void ButtonWidgetsPage::CreateButton() break; } - const bool isBitmapButton = m_chkBitmap->GetValue(); - if ( isBitmapButton ) + bool showsBitmap = false; + if ( m_chkBitmapOnly->GetValue() ) { + showsBitmap = true; + wxBitmapButton *bbtn = new wxBitmapButton(this, ButtonPage_Button, - CreateBitmap(_T("normal"))); - if ( m_chkUseSelected->GetValue() ) - bbtn->SetBitmapSelected(CreateBitmap(_T("pushed"))); + CreateBitmap(wxT("normal"))); + if ( m_chkUsePressed->GetValue() ) + bbtn->SetBitmapPressed(CreateBitmap(wxT("pushed"))); if ( m_chkUseFocused->GetValue() ) - bbtn->SetBitmapFocus(CreateBitmap(_T("focused"))); - if ( m_chkUseHover->GetValue() ) - bbtn->SetBitmapHover(CreateBitmap(_T("hover"))); + bbtn->SetBitmapFocus(CreateBitmap(wxT("focused"))); + if ( m_chkUseCurrent->GetValue() ) + bbtn->SetBitmapCurrent(CreateBitmap(wxT("hover"))); if ( m_chkUseDisabled->GetValue() ) - bbtn->SetBitmapDisabled(CreateBitmap(_T("disabled"))); + bbtn->SetBitmapDisabled(CreateBitmap(wxT("disabled"))); m_button = bbtn; } else // normal button @@ -398,13 +405,10 @@ void ButtonWidgetsPage::CreateButton() flags); } - m_chkUseSelected->Enable(isBitmapButton); - m_chkUseFocused->Enable(isBitmapButton); - m_chkUseHover->Enable(isBitmapButton); - m_chkUseDisabled->Enable(isBitmapButton); - - if ( m_chkImage->GetValue() ) + if ( !showsBitmap && m_chkTextAndBitmap->GetValue() ) { + showsBitmap = true; + static const wxDirection positions[] = { wxLEFT, wxRIGHT, wxTOP, wxBOTTOM @@ -412,8 +416,22 @@ void ButtonWidgetsPage::CreateButton() m_button->SetBitmap(wxArtProvider::GetIcon(wxART_INFORMATION), positions[m_radioImagePos->GetSelection()]); + + if ( m_chkUsePressed->GetValue() ) + m_button->SetBitmapPressed(wxArtProvider::GetIcon(wxART_HELP)); + if ( m_chkUseFocused->GetValue() ) + m_button->SetBitmapFocus(wxArtProvider::GetIcon(wxART_ERROR)); + if ( m_chkUseCurrent->GetValue() ) + m_button->SetBitmapCurrent(wxArtProvider::GetIcon(wxART_WARNING)); + if ( m_chkUseDisabled->GetValue() ) + m_button->SetBitmapDisabled(wxArtProvider::GetIcon(wxART_MISSING_IMAGE)); } + m_chkUsePressed->Enable(showsBitmap); + m_chkUseFocused->Enable(showsBitmap); + m_chkUseCurrent->Enable(showsBitmap); + m_chkUseDisabled->Enable(showsBitmap); + if ( m_chkDefault->GetValue() ) { m_button->SetDefault(); @@ -457,11 +475,13 @@ void ButtonWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event)) void ButtonWidgetsPage::OnButtonChangeLabel(wxCommandEvent& WXUNUSED(event)) { m_button->SetLabel(m_textLabel->GetValue()); + + m_sizerButton->Layout(); } void ButtonWidgetsPage::OnButton(wxCommandEvent& WXUNUSED(event)) { - wxLogMessage(_T("Test button clicked.")); + wxLogMessage(wxT("Test button clicked.")); } // ---------------------------------------------------------------------------- @@ -473,11 +493,11 @@ wxBitmap ButtonWidgetsPage::CreateBitmap(const wxString& label) wxBitmap bmp(180, 70); // shouldn't hardcode but it's simpler like this wxMemoryDC dc; dc.SelectObject(bmp); - dc.SetBackground(wxBrush(*wxWHITE)); + dc.SetBackground(wxBrush(*wxCYAN)); dc.Clear(); - dc.SetTextForeground(*wxBLUE); - dc.DrawLabel(wxStripMenuCodes(m_textLabel->GetValue()) + _T("\n") - _T("(") + label + _T(" state)"), + dc.SetTextForeground(*wxBLACK); + dc.DrawLabel(wxStripMenuCodes(m_textLabel->GetValue()) + wxT("\n") + wxT("(") + label + wxT(" state)"), wxArtProvider::GetBitmap(wxART_INFORMATION), wxRect(10, 10, bmp.GetWidth() - 20, bmp.GetHeight() - 20), wxALIGN_CENTRE);