Updated version to 2.5.4

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

diff --git a/include/wx/uri.h b/include/wx/uri.h
index a92b83692936fa7dcd6c4a23092fa9a3f279a5da..a2a1ac498dadd445311cf6cf5f08efcf021b39e2 100644 (file)
--- a/include/wx/uri.h
+++ b/include/wx/uri.h
@@ -11,7 +11,7 @@
 #ifndef _WX_URI_H_
 #define _WX_URI_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "uri.h"
 #endif
 
@@ -52,7 +52,7 @@ enum wxURIFlags
 // Originally based off of RFC 2396 - then
 // extended to meet the newer RFC 2396.bis
 // specifications.
-class wxURI : public wxObject
+class WXDLLIMPEXP_BASE wxURI : public wxObject
 {
 public:
     wxURI();
@@ -122,7 +122,7 @@ protected:
     static void Escape  (wxString& s, const wxChar& c);
     static bool IsEscape(const wxChar*& uri);
 
-    static wxInt32 CharToHex(const wxChar& c);
+    static wxChar CharToHex(const wxChar& c);
 
     static bool IsUnreserved (const wxChar& c);
     static bool IsReserved (const wxChar& c);