make popup on mac behave as on msw

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

diff --git a/include/wx/uri.h b/include/wx/uri.h
index 0fc434d16e37e640d82c66a151ea3541943066e3..b273c37a129aecd453777fdd4cbbd5b0dbce6ae4 100644 (file)
--- a/include/wx/uri.h
+++ b/include/wx/uri.h
@@ -12,10 +12,6 @@
 #ifndef _WX_URI_H_
 #define _WX_URI_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "uri.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -120,9 +116,11 @@ protected:
 
     static void Normalize(wxChar* uri, bool bIgnoreLeads = false);
     static void UpTree(const wxChar* uristart, const wxChar*& uri);
+    static void UpTree(wxString::const_iterator uristart,
+                       wxString::const_iterator& uri);
 
-    static wxChar TranslateEscape(const wxChar* s);
-    static void Escape  (wxString& s, const wxChar& c);
+    static wxUniChar TranslateEscape(const wxString::const_iterator& s);
+    static void Escape(wxString& s, const wxChar& c);
     static bool IsEscape(const wxChar*& uri);
 
     static wxChar CharToHex(const wxChar& c);