Remove the Innotek for OS/2 addition...configure now deals with this correctly on...

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

diff --git a/include/wx/url.h b/include/wx/url.h
index f9cfdbdb75b8646ce1f833bbe53c7bb70184a3b3..59d8428060fdcaa038e872d5b85bf82d09d473e1 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -6,14 +6,14 @@
 // Created:     20/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     20/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_URL_H
 #define _WX_URL_H
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_URL_H
 #define _WX_URL_H
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "url.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -37,7 +37,18 @@ typedef enum {
   wxURL_PROTOERR
 } wxURLError;
 
   wxURL_PROTOERR
 } wxURLError;
 

-class WXDLLEXPORT wxURL : public wxObject
+#if wxUSE_URL_NATIVE
+class WXDLLIMPEXP_NET wxURL;
+
+class WXDLLIMPEXP_NET wxURLNativeImp : public wxObject
+{
+public:
+    virtual ~wxURLNativeImp() { }
+    virtual wxInputStream *GetInputStream(wxURL *owner) = 0;
+};
+#endif // wxUSE_URL_NATIVE
+
+class WXDLLIMPEXP_NET wxURL : public wxObject

 {
 public:
     wxURL(const wxString& url);
 {
 public:
     wxURL(const wxString& url);


@@ -72,6 +83,14 @@ protected:
     wxHTTP *m_proxy;
 #endif // wxUSE_SOCKETS
 
     wxHTTP *m_proxy;
 #endif // wxUSE_SOCKETS
 

+#if wxUSE_URL_NATIVE
+    friend class wxURLNativeImp;
+    // pointer to a native URL implementation object
+    wxURLNativeImp *m_nativeImp;
+    // Creates on the heap and returns a native 
+    // implementation object for the current platform.
+    static wxURLNativeImp *CreateNativeImpObject();
+#endif

     wxProtoInfo *m_protoinfo;
     wxProtocol *m_protocol;
 
     wxProtoInfo *m_protoinfo;
     wxProtocol *m_protocol;