Permalink
Browse files

rename Tooltip property to TooltipText to avoid confusion with Framew…

…orkElement::ToolTip
  • Loading branch information...
1 parent 184ac64 commit a645b5150d176b04039094eed2bd679145d80c6a @ataranto committed Feb 29, 2012
@@ -70,8 +70,8 @@ private void model_PropertyChanged(object sender, PropertyChangedEventArgs e)
@string = model.Title;
gui_invoke(() => view.SetTitle(@string));
break;
- case "Tooltip":
- @string = model.Tooltip;
+ case "TooltipText":
+ @string = model.TooltipText;
gui_invoke(() => view.SetTooltip(@string));
break;
case "Address":
@@ -19,9 +19,9 @@ public void Test()
int event_count = 0;
browser_core.PropertyChanged += (sender, e) => event_count++;
- browser_core.Tooltip = "foo";
- browser_core.Tooltip = null;
- browser_core.Tooltip = null;
+ browser_core.TooltipText = "foo";
+ browser_core.TooltipText = null;
+ browser_core.TooltipText = null;
Assert.AreEqual(2, event_count);
}
@@ -114,10 +114,10 @@ namespace WinForms
void set(String^ title) { _browserCore->Title = title; }
}
- virtual property String^ Tooltip
+ virtual property String^ TooltipText
{
- String^ get() { return _browserCore->Tooltip; }
- void set(String^ tooltip) { _browserCore->Tooltip = tooltip; }
+ String^ get() { return _browserCore->TooltipText; }
+ void set(String^ text) { _browserCore->TooltipText = text; }
}
virtual property IBeforePopup^ BeforePopupHandler
@@ -22,11 +22,11 @@ namespace Wpf
void WebView::BrowserCore_PropertyChanged(Object^ sender, PropertyChangedEventArgs^ e)
{
- if (e->PropertyName == "Tooltip")
+ if (e->PropertyName == "TooltipText")
{
_timer->Stop();
- if (String::IsNullOrEmpty(_browserCore->Tooltip))
+ if (String::IsNullOrEmpty(_browserCore->TooltipText))
{
Dispatcher->BeginInvoke(DispatcherPriority::Render,
gcnew Action<String^>(this, &WebView::SetTooltip), nullptr);
@@ -41,7 +41,7 @@ namespace Wpf
void WebView::Timer_Tick(Object^ sender, EventArgs^ e)
{
_timer->Stop();
- SetTooltip(_browserCore->Tooltip);
+ SetTooltip(_browserCore->TooltipText);
}
IntPtr WebView::SourceHook(IntPtr hWnd, int message, IntPtr wParam, IntPtr lParam, bool% handled)
@@ -146,10 +146,10 @@ namespace Wpf
void set(String^ title) { _browserCore->Title = title; }
}
- virtual property String^ Tooltip
+ virtual property String^ TooltipText
{
- String^ get() { return _browserCore->Tooltip; }
- void set(String^ tooltip) { _browserCore->Tooltip = tooltip; }
+ String^ get() { return _browserCore->TooltipText; }
+ void set(String^ text) { _browserCore->TooltipText = text; }
}
virtual property IBeforePopup^ BeforePopupHandler
@@ -82,16 +82,16 @@ namespace CefSharp
}
}
- property String^ Tooltip
+ property String^ TooltipText
{
String^ get() { return _tooltip; }
- void set(String^ tooltip)
+ void set(String^ text)
{
- if (_tooltip != tooltip)
+ if (_tooltip != text)
{
- _tooltip = tooltip;
- PropertyChanged(this, gcnew PropertyChangedEventArgs(L"Tooltip"));
+ _tooltip = text;
+ PropertyChanged(this, gcnew PropertyChangedEventArgs(L"TooltipText"));
}
}
}
@@ -57,7 +57,7 @@ namespace CefSharp
if (tooltip != _tooltip)
{
_tooltip = tooltip;
- _browserControl->Tooltip = _tooltip;
+ _browserControl->TooltipText = _tooltip;
}
return true;
@@ -24,7 +24,7 @@ namespace CefSharp
property String^ Address;
property String^ Title;
- property String^ Tooltip;
+ property String^ TooltipText;
property IBeforePopup^ BeforePopupHandler;
property IBeforeResourceLoad^ BeforeResourceLoadHandler;

0 comments on commit a645b51

Please sign in to comment.