Must clear property selection in wxPGProperty::SetChoices() or risk a crash

[wxWidgets.git] / interface / wx / hyperlink.h

diff --git a/interface/wx/hyperlink.h b/interface/wx/hyperlink.h
index 115db369cbaf0e5257dd86b1a3c26f5eb8bffcd5..d2e4725735ebac97ccebf58d18388cf57084dea0 100644 (file)
--- a/interface/wx/hyperlink.h
+++ b/interface/wx/hyperlink.h
@@ -71,7 +71,7 @@ public:
            wxBORDER_NONE|wxHL_CONTEXTMENU|wxHL_ALIGN_CENTRE.
     @endStyleTable
 
-    @beginEventTable{wxHyperlinkEvent}
+    @beginEventEmissionTable{wxHyperlinkEvent}
     @event{EVT_HYPERLINK(id, func)}
         The hyperlink was (left) clicked. If this event is not handled in user's
         code (or it's skipped; see wxEvent::Skip), then a call to wxLaunchDefaultBrowser
@@ -91,13 +91,13 @@ public:
     /**
         Constructor. See Create() for more info.
     */
-    wxHyperLink(wxWindow* parent, wxWindowID id,
-                const wxString& label,
-                const wxString& url,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxHL_DEFAULT_STYLE,
-                const wxString& name = "hyperlink");
+    wxHyperLinkCtrl(wxWindow* parent, wxWindowID id,
+                    const wxString& label,
+                    const wxString& url,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long style = wxHL_DEFAULT_STYLE,
+                    const wxString& name = wxHyperlinkCtrlNameStr);
 
     /**
         Creates the hyperlink control.