added clipboard events (wxEVT_COMMAND_TEXT_COPY/CUT/PASTE) and implemented them for...

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 19944671c51a11b70a1fa08aed49116f6b9e62dd..3ece422a3443c6860cbe73e1ea6f7f7ec329a471 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        url.cpp
+// Name:        src/common/url.cpp

 // Purpose:     URL parser
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     URL parser
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -9,25 +9,25 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "url.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
 
 #if wxUSE_URL
 
 #endif
 
 #if wxUSE_URL
 

-#include "wx/string.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/module.h"

 #include "wx/url.h"
 
 #include "wx/url.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+#endif
+
+#include "wx/module.h"
+

 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 


@@ -332,7 +332,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
             return;
 
         wxString hostname = tmp_str(0, pos),
             return;
 
         wxString hostname = tmp_str(0, pos),

-        port = tmp_str(pos+1, tmp_str.Length()-pos);
+        port = tmp_str(pos+1, tmp_str.length()-pos);

         wxIPV4address addr;
 
         if (!addr.Hostname(hostname))
         wxIPV4address addr;
 
         if (!addr.Hostname(hostname))


@@ -375,7 +375,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
             return;
 
         hostname = tmp_str(0, pos);
             return;
 
         hostname = tmp_str(0, pos);

-        port = tmp_str(pos+1, tmp_str.Length()-pos);
+        port = tmp_str(pos+1, tmp_str.length()-pos);

 
         addr.Hostname(hostname);
         addr.Service(port);
 
         addr.Hostname(hostname);
         addr.Service(port);