summaryrefslogtreecommitdiffstats
path: root/views/controls/button/checkbox.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-25 23:35:22 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-25 23:35:22 +0000
commitb5ac72f9cc7c836a923ab81be80a6e3913498a9d (patch)
tree224231c6ea079c27b4bd8214366860b0d3c83b45 /views/controls/button/checkbox.cc
parent59326aacf6020c3cfa8978a334c36b2dcc1a99bb (diff)
downloadchromium_src-b5ac72f9cc7c836a923ab81be80a6e3913498a9d.zip
chromium_src-b5ac72f9cc7c836a923ab81be80a6e3913498a9d.tar.gz
chromium_src-b5ac72f9cc7c836a923ab81be80a6e3913498a9d.tar.bz2
Native button cleanup:
. I nuked NativeButton's minimum_size_ field as it's only used to enforce a minimum size on windows. The code to adjust for minimum size is now ifdef'd on windows. . Changes GTK's button to set the font as appropriate. BUG=none TEST=none Review URL: http://codereview.chromium.org/246007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button/checkbox.cc')
-rw-r--r--views/controls/button/checkbox.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc
index 9120ace..cba0aaf 100644
--- a/views/controls/button/checkbox.cc
+++ b/views/controls/button/checkbox.cc
@@ -184,7 +184,8 @@ bool Checkbox::HitTestLabel(const MouseEvent& e) {
// Checkbox, private:
void Checkbox::Init(const std::wstring& label_text) {
- set_minimum_size(gfx::Size(0, 0));
+ // Checkboxs don't need to enforce a minimum size.
+ set_ignore_minimum_size(true);
label_ = new Label(label_text);
label_->set_has_focus_border(true);
label_->SetHorizontalAlignment(Label::ALIGN_LEFT);