Trigger wxLog auto-creation when getting old logger in wxLogChain ctor.

[wxWidgets.git] / src / common / hyperlnkcmn.cpp

diff --git a/src/common/hyperlnkcmn.cpp b/src/common/hyperlnkcmn.cpp
index 582147736d0679088e240fa1e487e69c4777038d..3128d072af67e965e8dcf0d5c661c9f816db99de 100644 (file)
--- a/src/common/hyperlnkcmn.cpp
+++ b/src/common/hyperlnkcmn.cpp
@@ -42,8 +42,62 @@
 // implementation
 // ============================================================================
 
 // 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)
 IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)

-wxDEFINE_EVENT( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEvent );
+wxDEFINE_EVENT( wxEVT_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)
+
+wxCONSTRUCTOR_7( wxHyperlinkCtrl, wxWindow*, Parent, wxWindowID, Id, wxString, \
+                Label, wxString, URL, wxPoint, Position, wxSize, Size, long, WindowStyle )
+

 
 const char wxHyperlinkCtrlNameStr[] = "hyperlink";
 
 
 const char wxHyperlinkCtrlNameStr[] = "hyperlink";
 


@@ -77,8 +131,12 @@ void wxHyperlinkCtrlBase::SendEvent()
     wxString url = GetURL();
     wxHyperlinkEvent linkEvent(this, GetId(), url);
     if (!GetEventHandler()->ProcessEvent(linkEvent))     // was the event skipped ?
     wxString url = GetURL();
     wxHyperlinkEvent linkEvent(this, GetId(), url);
     if (!GetEventHandler()->ProcessEvent(linkEvent))     // was the event skipped ?

+    {

         if (!wxLaunchDefaultBrowser(url))
         if (!wxLaunchDefaultBrowser(url))

+        {

             wxLogWarning(wxT("Could not launch the default browser with url '%s' !"), url.c_str());
             wxLogWarning(wxT("Could not launch the default browser with url '%s' !"), url.c_str());

+        }
+    }

 }
 
 #endif // wxUSE_HYPERLINKCTRL
 }
 
 #endif // wxUSE_HYPERLINKCTRL