implement button support for pre-XP systems (or with themes disabled); using only...

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

diff --git a/src/common/hyperlnkcmn.cpp b/src/common/hyperlnkcmn.cpp
index d72bca76011db7eba1468f784f503f9a9a7f3753..582147736d0679088e240fa1e487e69c4777038d 100644 (file)
--- a/src/common/hyperlnkcmn.cpp
+++ b/src/common/hyperlnkcmn.cpp
@@ -43,17 +43,20 @@
 // ============================================================================
 
 IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)
 // ============================================================================
 
 IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
+wxDEFINE_EVENT( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEvent );

 
 

-const wxChar wxHyperlinkCtrlNameStr[] = wxT("hyperlink");
+const char wxHyperlinkCtrlNameStr[] = "hyperlink";

 
 // ----------------------------------------------------------------------------
 // wxHyperlinkCtrlBase
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // 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 ?"));
 
     wxASSERT_MSG(!url.empty() || !label.empty(),
                  wxT("Both URL and label are empty ?"));
 


@@ -62,8 +65,12 @@ 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!"));
                     (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()
 {
 
 void wxHyperlinkCtrlBase::SendEvent()
 {