don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h
index 1d1a74d91eb5f42db405e89342fe1ca7c38c9180..2678203ff9757e864285c87ecc48ffd9c7b2fa96 100644 (file)
--- a/include/wx/hyperlink.h
+++ b/include/wx/hyperlink.h
@@ -80,15 +80,13 @@ public:
     void SendEvent();
 };
 
     void SendEvent();
 };
 

-#ifndef __WXDEBUG__
-inline void wxHyperlinkCtrlBase::CheckParams(const wxString&, const wxString&, long) { }
-#endif
-

 // ----------------------------------------------------------------------------
 // wxHyperlinkEvent
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxHyperlinkEvent
 // ----------------------------------------------------------------------------
 

-extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_HYPERLINK;
+class WXDLLIMPEXP_FWD_ADV wxHyperlinkEvent;
+
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_COMMAND_HYPERLINK, wxHyperlinkEvent );

 
 //
 // An event fired when the user clicks on the label in a hyperlink control.
 
 //
 // An event fired when the user clicks on the label in a hyperlink control.


@@ -129,7 +127,7 @@ private:
 typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
 
 #define wxHyperlinkEventHandler(func) \
 typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
 
 #define wxHyperlinkEventHandler(func) \

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxHyperlinkEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxHyperlinkEventFunction, func)

 
 #define EVT_HYPERLINK(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_HYPERLINK, id, wxHyperlinkEventHandler(fn))
 
 #define EVT_HYPERLINK(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_HYPERLINK, id, wxHyperlinkEventHandler(fn))