wxChar -> char

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

diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h
index 586f1c583d1ea8844e5123fbe2af04520160c749..9e0f90ddc16577a15d6cad9fb7317fee1e719592 100644 (file)
--- a/include/wx/hyperlink.h
+++ b/include/wx/hyperlink.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_HYPERLINK_H__
-#define _WX_HYPERLINK_H__
+#ifndef _WX_HYPERLINK_H_
+#define _WX_HYPERLINK_H_
 
 #include "wx/defs.h"
 
@@ -69,12 +69,8 @@ public:
     //       wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important !
 
 protected:
-#ifdef __WXDEBUG__
     // checks for validity some of the ctor/Create() function parameters
     void CheckParams(const wxString& label, const wxString& url, long style);
-#else
-    void CheckParams() {}
-#endif
 
 public:
     // not part of the public API but needs to be public as used by
@@ -82,6 +78,9 @@ public:
     void SendEvent();
 };
 
+#ifndef __WXDEBUG__
+inline void wxHyperlinkCtrlBase::CheckParams(const wxString&, const wxString&, long) { }
+#endif
 
 // ----------------------------------------------------------------------------
 // wxHyperlinkEvent
@@ -144,7 +143,7 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
 
 
 
-#if defined(__WXGTK210__)
+#if defined(__WXGTK210__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/hyperlink.h"
 #else
     #include "wx/generic/hyperlink.h"
@@ -154,4 +153,4 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
 
 #endif // wxUSE_HYPERLINKCTRL
 
-#endif // _WX_HYPERLINK_H__
+#endif // _WX_HYPERLINK_H_