Fixed wxDatePickerCtrl under OS X

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

diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h
index 6f9db016ca133af25b98415efb08b5e3ace5319e..eb45cd94668ee0001c7782bd778323c59409b1f9 100644 (file)
--- a/include/wx/hyperlink.h
+++ b/include/wx/hyperlink.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_HYPERLINK_H__
-#define _WX_HYPERLINK_H__
+#ifndef _WX_HYPERLINK_H_
+#define _WX_HYPERLINK_H_

 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 


@@ -69,6 +69,8 @@ public:
     //       wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important !
 
 protected:
     //       wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important !
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     // checks for validity some of the ctor/Create() function parameters
     void CheckParams(const wxString& label, const wxString& url, long style);
 
     // checks for validity some of the ctor/Create() function parameters
     void CheckParams(const wxString& label, const wxString& url, long style);
 


@@ -86,10 +88,7 @@ inline void wxHyperlinkCtrlBase::CheckParams(const wxString&, const wxString&, l
 // wxHyperlinkEvent
 // ----------------------------------------------------------------------------
 
 // wxHyperlinkEvent
 // ----------------------------------------------------------------------------
 

-// Declare an event identifier.
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_HYPERLINK, 3700)
-END_DECLARE_EVENT_TYPES()
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_HYPERLINK;

 
 //
 // 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.


@@ -135,15 +134,8 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
 #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))
 

-#ifdef _WX_DEFINE_DATE_EVENTS_
-    DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
-
-    IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)
-#endif
-
-

 
 

-#if defined(__WXGTK210__)
+#if defined(__WXGTK210__) && !defined(__WXUNIVERSAL__)

     #include "wx/gtk/hyperlink.h"
 #else
     #include "wx/generic/hyperlink.h"
     #include "wx/gtk/hyperlink.h"
 #else
     #include "wx/generic/hyperlink.h"


@@ -153,4 +145,4 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
 
 #endif // wxUSE_HYPERLINKCTRL
 
 
 #endif // wxUSE_HYPERLINKCTRL
 

-#endif // _WX_HYPERLINK_H__
+#endif // _WX_HYPERLINK_H_