Ignore:
Timestamp:
Jan 9, 2017, 11:09:38 AM (3 years ago)
Author:
jrpelegrina
Message:

Update new version: 3.15.02

File:
1 edited

Legend:

Unmodified
Added
Removed
  • filezilla/trunk/fuentes/src/interface/netconfwizard.h

    r130 r3185  
    55#include "wrapengine.h"
    66#include "externalipresolver.h"
    7 #include <wx/socket.h>
    87#include <wx/timer.h>
     8#include "socket.h"
    99
    1010#define NETCONFBUFFERSIZE 100
     
    1212class COptions;
    1313
    14 class CNetConfWizard final : public wxWizard, protected CWrapEngine, protected CEventHandler
     14class CNetConfWizard final : public wxWizard, protected CWrapEngine, protected fz::event_handler
    1515{
    1616public:
     
    3535        void OnPageChanging(wxWizardEvent& event);
    3636        void OnPageChanged(wxWizardEvent& event);
    37         void OnSocketEvent(wxSocketEvent& event);
    3837        void OnRestart(wxCommandEvent& event);
    3938        void OnFinish(wxWizardEvent& event);
     
    4140        void OnExternalIPAddress2(wxCommandEvent&);
    4241
    43         virtual void operator()(CEventBase const& ev);
     42        virtual void operator()(fz::event_base const& ev);
    4443        void OnExternalIPAddress();
     44        void OnSocketEvent(CSocketEventSource*, SocketEventType t, int error);
     45       
     46        void DoOnSocketEvent(CSocketEventSource*, SocketEventType t, int error);
    4547
    4648        void OnReceive();
     
    6668
    6769        // Test data
    68         wxSocketClient* m_socket;
     70        CSocket* m_socket{};
    6971        int m_state;
    7072
     
    8991        wxString m_externalIP;
    9092
    91         wxSocketServer* m_pSocketServer;
    92         wxSocketBase* m_pDataSocket;
     93        CSocket* m_pSocketServer{};
     94        CSocket* m_pDataSocket{};
    9395        int m_listenPort;
    9496        bool gotListReply;
Note: See TracChangeset for help on using the changeset viewer.