make wxSetEnv compatible with ANSI and Unicode, deprecate passing NULL to it in favou...

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

diff --git a/include/wx/socket.h b/include/wx/socket.h
index ac1c7d36403f830c8b613c35b9d1bfa376d78dd8..3c61361a56d651539675aa0f07d9bf56801041a9 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -108,11 +108,12 @@ public:
   bool Destroy();
 
   // state
   bool Destroy();
 
   // state

-  inline bool Ok() const { return (m_socket != NULL); };
-  inline bool Error() const { return m_error; };
-  inline bool IsConnected() const { return m_connected; };
-  inline bool IsData() { return WaitForRead(0, 0); };
-  inline bool IsDisconnected() const { return !IsConnected(); };
+  inline bool Ok() const { return IsOk(); }
+  inline bool IsOk() const { return (m_socket != NULL); }
+  inline bool Error() const { return m_error; }
+  inline bool IsConnected() const { return m_connected; }
+  inline bool IsData() { return WaitForRead(0, 0); }
+  inline bool IsDisconnected() const { return !IsConnected(); }

   inline wxUint32 LastCount() const { return m_lcount; }
   inline wxSocketError LastError() const { return (wxSocketError)m_socket->GetError(); }
   void SaveState();
   inline wxUint32 LastCount() const { return m_lcount; }
   inline wxSocketError LastError() const { return (wxSocketError)m_socket->GetError(); }
   void SaveState();


@@ -121,6 +122,7 @@ public:
   // addresses
   virtual bool GetLocal(wxSockAddress& addr_man) const;
   virtual bool GetPeer(wxSockAddress& addr_man) const;
   // addresses
   virtual bool GetLocal(wxSockAddress& addr_man) const;
   virtual bool GetPeer(wxSockAddress& addr_man) const;

+  virtual bool SetLocal(wxIPV4address& local);

 
   // base IO
   virtual bool  Close();
 
   // base IO
   virtual bool  Close();


@@ -132,7 +134,7 @@ public:
   wxSocketBase& Write(const void *buffer, wxUint32 nbytes);
   wxSocketBase& WriteMsg(const void *buffer, wxUint32 nbytes);
 
   wxSocketBase& Write(const void *buffer, wxUint32 nbytes);
   wxSocketBase& WriteMsg(const void *buffer, wxUint32 nbytes);
 

-  void InterruptWait() { m_interrupt = true; };
+  void InterruptWait() { m_interrupt = true; }

   bool Wait(long seconds = -1, long milliseconds = 0);
   bool WaitForRead(long seconds = -1, long milliseconds = 0);
   bool WaitForWrite(long seconds = -1, long milliseconds = 0);
   bool Wait(long seconds = -1, long milliseconds = 0);
   bool WaitForRead(long seconds = -1, long milliseconds = 0);
   bool WaitForWrite(long seconds = -1, long milliseconds = 0);


@@ -144,7 +146,7 @@ public:
 
   bool GetOption(int level, int optname, void *optval, int *optlen);
   bool SetOption(int level, int optname, const void *optval, int optlen);
 
   bool GetOption(int level, int optname, void *optval, int *optlen);
   bool SetOption(int level, int optname, const void *optval, int optlen);

-  inline wxUint32 GetLastIOSize() const { return m_lcount; };
+  inline wxUint32 GetLastIOSize() const { return m_lcount; }

 
   // event handling
   void *GetClientData() const { return m_clientData; }
 
   // event handling
   void *GetClientData() const { return m_clientData; }


@@ -201,6 +203,7 @@ private:
   wxList        m_states;           // stack of states
   bool          m_interrupt;        // interrupt ongoing wait operations?
   bool          m_beingDeleted;     // marked for delayed deletion?
   wxList        m_states;           // stack of states
   bool          m_interrupt;        // interrupt ongoing wait operations?
   bool          m_beingDeleted;     // marked for delayed deletion?

+  wxIPV4address m_localAddress;     // bind to local address?

 
   // pushback buffer
   void         *m_unread;           // pushback buffer
 
   // pushback buffer
   void         *m_unread;           // pushback buffer


@@ -217,7 +220,7 @@ private:
   // the initialization count, GSocket is initialized if > 0
   static size_t m_countInit;
 
   // the initialization count, GSocket is initialized if > 0
   static size_t m_countInit;
 

-    DECLARE_NO_COPY_CLASS(wxSocketBase)
+  DECLARE_NO_COPY_CLASS(wxSocketBase)

 };
 
 
 };
 
 


@@ -254,9 +257,13 @@ public:
   virtual ~wxSocketClient();
 
   virtual bool Connect(wxSockAddress& addr, bool wait = true);
   virtual ~wxSocketClient();
 
   virtual bool Connect(wxSockAddress& addr, bool wait = true);

+  bool Connect(wxSockAddress& addr, wxSockAddress& local, bool wait = true);

 
   bool WaitOnConnect(long seconds = -1, long milliseconds = 0);
 
 
   bool WaitOnConnect(long seconds = -1, long milliseconds = 0);
 

+private:
+  virtual bool DoConnect(wxSockAddress& addr, wxSockAddress* local, bool wait = true);
+

   DECLARE_NO_COPY_CLASS(wxSocketClient)
 };
 
   DECLARE_NO_COPY_CLASS(wxSocketClient)
 };