don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/socket.h b/include/wx/socket.h
index 6895d8987c33dace8e3e7ebdc42c0bbfa3cd1629..e6b11b1f255f4f60fab40aa1f5d8cb4816bb882b 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -93,6 +93,9 @@ enum wxSocketType
 };
 
 
 };
 
 

+// event
+class WXDLLIMPEXP_FWD_NET wxSocketEvent;
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_NET, wxEVT_SOCKET, wxSocketEvent);

 
 // --------------------------------------------------------------------------
 // wxSocketBase
 
 // --------------------------------------------------------------------------
 // wxSocketBase


@@ -162,7 +165,7 @@ public:
 
     wxSocketFlags GetFlags() const { return m_flags; }
     void SetFlags(wxSocketFlags flags);
 
     wxSocketFlags GetFlags() const { return m_flags; }
     void SetFlags(wxSocketFlags flags);

-    void SetTimeout(long seconds);
+    virtual void SetTimeout(long seconds);

     long GetTimeout() const { return m_timeout; }
 
     bool GetOption(int level, int optname, void *optval, int *optlen);
     long GetTimeout() const { return m_timeout; }
 
     bool GetOption(int level, int optname, void *optval, int *optlen);


@@ -204,21 +207,19 @@ private:
     // wait until the given flags are set for this socket or the given timeout
     // (or m_timeout) expires
     //
     // wait until the given flags are set for this socket or the given timeout
     // (or m_timeout) expires
     //

-    // notice that wxSOCKET_LOST_FLAG is always taken into account but the
-    // return value depends on whether it is included in flags or not: if it
-    // is, and the connection is indeed lost, true is returned, but if it isn't
-    // then the function returns false in this case
-    //
-    // false is always returned if we returned because of the timeout expiration
-    bool DoWait(long timeout, wxSocketEventFlags flags);
+    // notice that wxSOCKET_LOST_FLAG is always taken into account and the
+    // function returns -1 if the connection was lost; otherwise it returns
+    // true if any of the events specified by flags argument happened or false
+    // if the timeout expired
+    int DoWait(long timeout, wxSocketEventFlags flags);

 
     // a helper calling DoWait() using the same convention as the public
     // WaitForXXX() functions use, i.e. use our timeout if seconds == -1 or the
     // specified timeout otherwise
 
     // a helper calling DoWait() using the same convention as the public
     // WaitForXXX() functions use, i.e. use our timeout if seconds == -1 or the
     // specified timeout otherwise

-    bool DoWait(long seconds, long milliseconds, wxSocketEventFlags flags);
+    int DoWait(long seconds, long milliseconds, wxSocketEventFlags flags);

 
     // another helper calling DoWait() using our m_timeout
 
     // another helper calling DoWait() using our m_timeout

-    bool DoWaitWithTimeout(wxSocketEventFlags flags)
+    int DoWaitWithTimeout(wxSocketEventFlags flags)

     {
         return DoWait(m_timeout*1000, flags);
     }
     {
         return DoWait(m_timeout*1000, flags);
     }


@@ -270,7 +271,7 @@ private:
     friend class wxSocketReadGuard;
     friend class wxSocketWriteGuard;
 
     friend class wxSocketReadGuard;
     friend class wxSocketWriteGuard;
 

-    DECLARE_NO_COPY_CLASS(wxSocketBase)
+    wxDECLARE_NO_COPY_CLASS(wxSocketBase);

     DECLARE_CLASS(wxSocketBase)
 };
 
     DECLARE_CLASS(wxSocketBase)
 };
 


@@ -290,7 +291,7 @@ public:
 
     bool WaitForAccept(long seconds = -1, long milliseconds = 0);
 
 
     bool WaitForAccept(long seconds = -1, long milliseconds = 0);
 

-    DECLARE_NO_COPY_CLASS(wxSocketServer)
+    wxDECLARE_NO_COPY_CLASS(wxSocketServer);

     DECLARE_CLASS(wxSocketServer)
 };
 
     DECLARE_CLASS(wxSocketServer)
 };
 


@@ -329,7 +330,7 @@ private:
     int m_initialRecvBufferSize;
     int m_initialSendBufferSize;
 
     int m_initialRecvBufferSize;
     int m_initialSendBufferSize;
 

-    DECLARE_NO_COPY_CLASS(wxSocketClient)
+    wxDECLARE_NO_COPY_CLASS(wxSocketClient);

     DECLARE_CLASS(wxSocketClient)
 };
 
     DECLARE_CLASS(wxSocketClient)
 };
 


@@ -358,7 +359,7 @@ public:
      */
 
 private:
      */
 
 private:

-    DECLARE_NO_COPY_CLASS(wxDatagramSocket)
+    wxDECLARE_NO_COPY_CLASS(wxDatagramSocket);

     DECLARE_CLASS(wxDatagramSocket)
 };
 
     DECLARE_CLASS(wxDatagramSocket)
 };
 


@@ -381,6 +382,7 @@ public:
     void *GetClientData() const { return m_clientData; }
 
     virtual wxEvent *Clone() const { return new wxSocketEvent(*this); }
     void *GetClientData() const { return m_clientData; }
 
     virtual wxEvent *Clone() const { return new wxSocketEvent(*this); }

+    virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_SOCKET; }

 
 public:
     wxSocketNotify  m_event;
 
 public:
     wxSocketNotify  m_event;


@@ -393,7 +395,7 @@ public:
 typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&);
 
 #define wxSocketEventHandler(func) \
 typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&);
 
 #define wxSocketEventHandler(func) \

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSocketEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxSocketEventFunction, func)

 
 #define EVT_SOCKET(id, func) \
     wx__DECLARE_EVT1(wxEVT_SOCKET, id, wxSocketEventHandler(func))
 
 #define EVT_SOCKET(id, func) \
     wx__DECLARE_EVT1(wxEVT_SOCKET, id, wxSocketEventHandler(func))