X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2690830ea0c100902aa85eb98a56506a5a98ce0d..ff1b5f81af5dce8dac0c134f0e01adffc5334347:/include/wx/dialup.h?ds=sidebyside diff --git a/include/wx/dialup.h b/include/wx/dialup.h index e5e4f74281..d14a6c8870 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -9,24 +9,24 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_NET_H -#define _WX_NET_H +#ifndef _WX_DIALUP_H +#define _WX_DIALUP_H -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dialup.h" #endif #if wxUSE_DIALUP_MANAGER +#include "wx/event.h" + // ---------------------------------------------------------------------------- // misc // ---------------------------------------------------------------------------- class WXDLLEXPORT wxArrayString; -extern const wxChar *wxEmptyString; - -#define WXDIALUP_MANAGER_DEFAULT_BEACONHOST T("www.yahoo.com") +#define WXDIALUP_MANAGER_DEFAULT_BEACONHOST wxT("www.yahoo.com") // ---------------------------------------------------------------------------- // A class which groups functions dealing with connecting to the network from a @@ -148,14 +148,19 @@ public: // Sets the commands to start up the network and to hang up again. Used by // the Unix implementations only. virtual void - SetConnectCommand(const wxString& commandDial = T("/usr/bin/pon"), - const wxString& commandHangup = T("/usr/bin/poff")) = 0; + SetConnectCommand(const wxString& commandDial = wxT("/usr/bin/pon"), + const wxString& commandHangup = wxT("/usr/bin/poff")) = 0; }; // ---------------------------------------------------------------------------- -// DIALUP events processing +// wxDialUpManager events // ---------------------------------------------------------------------------- +BEGIN_DECLARE_EVENT_TYPES() + DECLARE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED, 450) + DECLARE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED, 451) +END_DECLARE_EVENT_TYPES() + // the event class for the dialup events class WXDLLEXPORT wxDialUpEvent : public wxEvent { @@ -174,15 +179,24 @@ public: // process (i.e. does it result from our own attempt to establish the // connection)? bool IsOwnEvent() const { return m_id != 0; } + + // implement the base class pure virtual + virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); } + +private: + DECLARE_NO_ASSIGN_CLASS(wxDialUpEvent) }; // the type of dialup event handler function -typedef void (wxObject::*wxDialUpEventFunction)(wxDialUpEvent&); +typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&); // macros to catch dialup events -#define EVT_DIALUP_CONNECTED(func) { wxEVT_DIALUP_CONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL}, -#define EVT_DIALUP_DISCONNECTED(func) { wxEVT_DIALUP_DISCONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL}, +#define EVT_DIALUP_CONNECTED(func) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_DIALUP_CONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL), +#define EVT_DIALUP_DISCONNECTED(func) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_DIALUP_DISCONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL), + #endif // wxUSE_DIALUP_MANAGER -#endif // _WX_NET_H +#endif // _WX_DIALUP_H