X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c105dda0810d927d8531e4949ada0b407a1cbebd..f2049b683752950d1fe91aec07318e7f2122ff16:/src/common/hyperlnkcmn.cpp

diff --git a/src/common/hyperlnkcmn.cpp b/src/common/hyperlnkcmn.cpp
index d72bca7601..20ff7acc52 100644
--- a/src/common/hyperlnkcmn.cpp
+++ b/src/common/hyperlnkcmn.cpp
@@ -42,18 +42,75 @@
 // implementation
 // ============================================================================
 
+wxDEFINE_FLAGS( wxHyperlinkStyle )
+wxBEGIN_FLAGS( wxHyperlinkStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxHL_CONTEXTMENU)
+wxFLAGS_MEMBER(wxHL_ALIGN_LEFT)
+wxFLAGS_MEMBER(wxHL_ALIGN_RIGHT)
+wxFLAGS_MEMBER(wxHL_ALIGN_CENTRE)
+wxEND_FLAGS( wxHyperlinkStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI( wxHyperlinkCtrl, wxControl, "wx/hyperlink.h")
+
 IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
+wxDEFINE_EVENT( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEvent );
+
+wxBEGIN_PROPERTIES_TABLE(wxHyperlinkCtrl)
+wxPROPERTY( Label, wxString, SetLabel, GetLabel, wxString(), \
+           0 /*flags*/, wxT("The link label"), wxT("group") )
+
+wxPROPERTY( URL, wxString, SetURL, GetURL, wxString(), \
+           0 /*flags*/, wxT("The link URL"), wxT("group") )
+wxPROPERTY_FLAGS( WindowStyle, wxHyperlinkStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/,     \
+                 wxT("The link style"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxHyperlinkCtrl)
 
-const wxChar wxHyperlinkCtrlNameStr[] = wxT("hyperlink");
+wxCONSTRUCTOR_7( wxHyperlinkCtrl, wxWindow*, Parent, wxWindowID, Id, wxString, \
+                Label, wxString, URL, wxPoint, Position, wxSize, Size, long, WindowStyle )
+
+
+const char wxHyperlinkCtrlNameStr[] = "hyperlink";
 
 // ----------------------------------------------------------------------------
 // wxHyperlinkCtrlBase
 // ----------------------------------------------------------------------------
 
-#ifdef __WXDEBUG__
-void wxHyperlinkCtrlBase::CheckParams(const wxString& label, const wxString& url, long style)
+void
+wxHyperlinkCtrlBase::CheckParams(const wxString& label,
+                                 const wxString& url,
+                                 long style)
 {
+#if wxDEBUG_LEVEL
     wxASSERT_MSG(!url.empty() || !label.empty(),
                  wxT("Both URL and label are empty ?"));
 
@@ -62,16 +119,24 @@ void wxHyperlinkCtrlBase::CheckParams(const wxString& label, const wxString& url
                     (int)((style & wxHL_ALIGN_RIGHT) != 0);
     wxASSERT_MSG(alignment == 1,
         wxT("Specify exactly one align flag!"));
+#else // !wxDEBUG_LEVEL
+    wxUnusedVar(label);
+    wxUnusedVar(url);
+    wxUnusedVar(style);
+#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
 }
-#endif
 
 void wxHyperlinkCtrlBase::SendEvent()
 {
     wxString url = GetURL();
     wxHyperlinkEvent linkEvent(this, GetId(), url);
     if (!GetEventHandler()->ProcessEvent(linkEvent))     // was the event skipped ?
+    {
         if (!wxLaunchDefaultBrowser(url))
+        {
             wxLogWarning(wxT("Could not launch the default browser with url '%s' !"), url.c_str());
+        }
+    }
 }
 
 #endif // wxUSE_HYPERLINKCTRL