diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-23 02:49:34 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-23 02:49:34 +0000 |
| commit | 232d1b83fbcadc744455b9b1615713d54f974499 (patch) | |
| tree | 385ea2e2fbacc14b1604721da74a0d226609ef97 /views/controls | |
| parent | 51d295b8863dc7e88568c598f908ad4c79ff38b6 (diff) | |
| download | chromium_src-232d1b83fbcadc744455b9b1615713d54f974499.zip chromium_src-232d1b83fbcadc744455b9b1615713d54f974499.tar.gz chromium_src-232d1b83fbcadc744455b9b1615713d54f974499.tar.bz2 | |
Makes FindBarWin buildable on linux. FindBarWin should be renamed to
FindBarViews, but I'm leaving it as is for now.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/113793
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/text_field.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/views/controls/text_field.h b/views/controls/text_field.h index a53c325..3c4571a 100644 --- a/views/controls/text_field.h +++ b/views/controls/text_field.h @@ -71,8 +71,11 @@ class TextField : public View { STYLE_LOWERCASE = 1<<2 }; - TextField::TextField() - : native_view_(NULL), + TextField() + : +#if defined(OS_WIN) + native_view_(NULL), +#endif edit_(NULL), controller_(NULL), style_(STYLE_DEFAULT), @@ -83,8 +86,11 @@ class TextField : public View { num_lines_(1) { SetFocusable(true); } - explicit TextField::TextField(StyleFlags style) - : native_view_(NULL), + explicit TextField(StyleFlags style) + : +#if defined(OS_WIN) + native_view_(NULL), +#endif edit_(NULL), controller_(NULL), style_(style), @@ -122,7 +128,9 @@ class TextField : public View { // Overridden from Chrome::View. virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e); +#if defined(OS_WIN) virtual HWND GetNativeComponent(); +#endif // Returns the text currently displayed in the text field. std::wstring GetText() const; @@ -197,8 +205,10 @@ class TextField : public View { // Resets the background color of the edit. void UpdateEditBackgroundColor(); +#if defined(OS_WIN) // This encapsulates the HWND of the native text field. HWNDView* native_view_; +#endif // This inherits from the native text field. Edit* edit_; |