always declare wxAppInitializerFunction() as returning wxApp, whether we use gcc...

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

diff --git a/include/wx/url.h b/include/wx/url.h
index b941e10e168110ec739b8c1523ca1bd3e958b70a..4caf68165285b2857f79c2af99389dd6934b4485 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -12,17 +12,18 @@
 #ifndef _WX_URL_H
 #define _WX_URL_H
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "url.h"
 #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"
 
-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP
   #include "wx/protocol/http.h"
 #endif
 
@@ -35,7 +36,7 @@ typedef enum {
   wxURL_CONNERR,
   wxURL_PROTOERR
 } wxURLError;
-  
+
 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)
-    DECLARE_NO_COPY_CLASS(wxURL);
+    DECLARE_NO_COPY_CLASS(wxURL)
 
     DECLARE_DYNAMIC_CLASS(wxURL)
 };
 
-#endif
+#endif // wxUSE_URL
+
+#endif // _WX_URL_H
+