summaryrefslogtreecommitdiffstats
path: root/views/controls/button/checkbox.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-14 19:51:34 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-14 19:51:34 +0000
commit55902b55116fe36b88a719b13c15d38d9b3c08ff (patch)
treecb05a30d82fe83499e09368caad8120557b696e2 /views/controls/button/checkbox.cc
parent7a08a49f266ca32581b95016cfa65a5679c5dcf1 (diff)
downloadchromium_src-55902b55116fe36b88a719b13c15d38d9b3c08ff.zip
chromium_src-55902b55116fe36b88a719b13c15d38d9b3c08ff.tar.gz
chromium_src-55902b55116fe36b88a719b13c15d38d9b3c08ff.tar.bz2
Add basic checkbox support for GTK.
This also makes the Checkbox check for the native wrapper just like NativeButton does, to prevent crashes if it hasn't been initialized yet. Review URL: http://codereview.chromium.org/113408 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button/checkbox.cc')
-rw-r--r--views/controls/button/checkbox.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc
index 8783bcf..af6a7b4 100644
--- a/views/controls/button/checkbox.cc
+++ b/views/controls/button/checkbox.cc
@@ -53,6 +53,9 @@ int Checkbox::GetTextIndent() {
// Checkbox, View overrides:
gfx::Size Checkbox::GetPreferredSize() {
+ if (!native_wrapper_)
+ return gfx::Size();
+
gfx::Size prefsize = native_wrapper_->GetView()->GetPreferredSize();
prefsize.set_width(
prefsize.width() + kCheckboxLabelSpacing +