Small speed up to fonts and support for scaling.

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

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index 087b9510d09bbccfd444521d4103325759760917..a780b3a716bfa51f0f94359dd462b61896a77098 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -12,8 +12,8 @@
 #ifndef _WX_NETWORK_ADDRESS_H
 #define _WX_NETWORK_ADDRESS_H
 
 #ifndef _WX_NETWORK_ADDRESS_H
 #define _WX_NETWORK_ADDRESS_H
 

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

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


@@ -42,11 +42,14 @@ public:
   void SetAddress(GAddress *address);
 
   // we need to be able to create copies of the addresses polymorphically (i.e.
   void SetAddress(GAddress *address);
 
   // we need to be able to create copies of the addresses polymorphically (i.e.

-  // wihtout knowing the exact address class)
+  // without knowing the exact address class)

   virtual wxSockAddress *Clone() const = 0;
 
 protected:
   GAddress *m_address;
   virtual wxSockAddress *Clone() const = 0;
 
 protected:
   GAddress *m_address;

+
+private:
+  void Init();

 };
 
 class WXDLLEXPORT wxIPV4address : public wxSockAddress {
 };
 
 class WXDLLEXPORT wxIPV4address : public wxSockAddress {


@@ -98,7 +101,7 @@ public:
 };
 #endif
 
 };
 #endif
 

-#if defined(__UNIX__) && !defined(__WXMAC__)
+#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))

 #include <sys/socket.h>
 #ifndef __VMS__
 # include <sys/un.h>
 #include <sys/socket.h>
 #ifndef __VMS__
 # include <sys/un.h>