Window management and sizer layout corrections

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

diff --git a/include/wx/url.h b/include/wx/url.h
index b941e10e168110ec739b8c1523ca1bd3e958b70a..f9cfdbdb75b8646ce1f833bbe53c7bb70184a3b3 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -16,13 +16,14 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-// wxWindows header
-#include "wx/object.h"
+#include "wx/defs.h"
+
+#if wxUSE_URL

 
 

-// wxSocket headers
+#include "wx/object.h"

 #include "wx/protocol/protocol.h"
 
 #include "wx/protocol/protocol.h"
 

-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP

   #include "wx/protocol/http.h"
 #endif
 
   #include "wx/protocol/http.h"
 #endif
 


@@ -35,7 +36,7 @@ typedef enum {
   wxURL_CONNERR,
   wxURL_PROTOERR
 } wxURLError;
   wxURL_CONNERR,
   wxURL_PROTOERR
 } wxURLError;

-  
+

 class WXDLLEXPORT wxURL : public wxObject
 {
 public:
 class WXDLLEXPORT wxURL : public wxObject
 {
 public:


@@ -92,9 +93,12 @@ protected:
 private:
     // VZ: can't use default copy ctor for this class, should write a correct
     //     one! (TODO)
 private:
     // VZ: can't use default copy ctor for this class, should write a correct
     //     one! (TODO)

-    DECLARE_NO_COPY_CLASS(wxURL);
+    DECLARE_NO_COPY_CLASS(wxURL)

 
     DECLARE_DYNAMIC_CLASS(wxURL)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxURL)
 };
 

-#endif
+#endif // wxUSE_URL
+
+#endif // _WX_URL_H
+