Declarations missing from VC++ 5

[wxWidgets.git] / src / generic / hyperlink.cpp

diff --git a/src/generic/hyperlink.cpp b/src/generic/hyperlink.cpp
index 6f078ca9fee765e0886fc36f1534bfe377a38cf9..fb245d32b22002bed8890b49a244711d0a6c389d 100644 (file)
--- a/src/generic/hyperlink.cpp
+++ b/src/generic/hyperlink.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        hyperlink.cpp
+// Name:        src/generic/hyperlink.cpp

 // Purpose:     Hyperlink control
 // Author:      David Norris <danorris@gmail.com>, Otto Wyss
 // Modified by: Ryan Norton, Francesco Montorsi
 // Purpose:     Hyperlink control
 // Author:      David Norris <danorris@gmail.com>, Otto Wyss
 // Modified by: Ryan Norton, Francesco Montorsi


@@ -17,33 +17,37 @@
 // Pre-compiled header stuff
 //---------------------------------------------------------------------------
 
 // Pre-compiled header stuff
 //---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "hyperlink.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_HYPERLINKCTRL
+

 //---------------------------------------------------------------------------
 // Includes
 //---------------------------------------------------------------------------
 
 #include "wx/hyperlink.h"
 //---------------------------------------------------------------------------
 // Includes
 //---------------------------------------------------------------------------
 
 #include "wx/hyperlink.h"

-#include "wx/utils.h" // for wxLaunchDefaultBrowser
-#include "wx/clipbrd.h"

 
 

+#ifndef WX_PRECOMP
+    #include "wx/utils.h" // for wxLaunchDefaultBrowser
+    #include "wx/dcclient.h"
+    #include "wx/menu.h"
+    #include "wx/log.h"
+    #include "wx/dataobj.h"
+#endif

 
 

-#if wxUSE_HYPERLINKCTRL
+#include "wx/clipbrd.h"

 
 // ============================================================================
 // implementation
 // ============================================================================
 
 IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrl, wxControl)
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrl, wxControl)

+IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
 
 // reserved for internal use only
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
 
 // reserved for internal use only


@@ -69,15 +73,22 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
     const wxString& label, const wxString& url, const wxPoint& pos,
     const wxSize& size, long style, const wxString& name)
 {
     const wxString& label, const wxString& url, const wxPoint& pos,
     const wxSize& size, long style, const wxString& name)
 {

-    wxASSERT_MSG(!url.IsEmpty() || !label.IsEmpty(),
+    wxASSERT_MSG(!url.empty() || !label.empty(),

                  wxT("Both URL and label are empty ?"));
 
     if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
         return false;
 
     // set to non empty strings both the url and the label
                  wxT("Both URL and label are empty ?"));
 
     if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
         return false;
 
     // set to non empty strings both the url and the label

-    SetURL(url.IsEmpty() ? label : url);
-    SetLabel(label.IsEmpty() ? url : label);
+    if(url.empty())
+        SetURL(label);
+    else
+        SetURL(url);
+
+    if(label.empty())
+        SetLabel(url);
+    else
+        SetLabel(label);

 
     // by default the cursor to use in this window is wxCURSOR_HAND
     SetCursor(wxCursor(wxCURSOR_HAND));
 
     // by default the cursor to use in this window is wxCURSOR_HAND
     SetCursor(wxCursor(wxCURSOR_HAND));


@@ -208,12 +219,14 @@ void wxHyperlinkCtrl::OnLeaveWindow(wxMouseEvent& WXUNUSED(event))
 
 void wxHyperlinkCtrl::OnPopUpCopy( wxCommandEvent& WXUNUSED(event) )
 {
 
 void wxHyperlinkCtrl::OnPopUpCopy( wxCommandEvent& WXUNUSED(event) )
 {

+#if wxUSE_CLIPBOARD

     if (!wxTheClipboard->Open())
         return;
 
     wxTextDataObject *data = new wxTextDataObject( m_url );
     wxTheClipboard->SetData( data );
     wxTheClipboard->Close();
     if (!wxTheClipboard->Open())
         return;
 
     wxTextDataObject *data = new wxTextDataObject( m_url );
     wxTheClipboard->SetData( data );
     wxTheClipboard->Close();

+#endif // wxUSE_CLIPBOARD

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