From 81ba610721b385d27d8b4ccf7996ba9b32ea26e3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 16 Jan 2006 16:09:49 +0000 Subject: [PATCH] Avoid conflict between wxWindow::Enable and MyFrame::Enable. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/ipc/client.cpp | 39 +++++++++++++++++++-------------------- samples/ipc/client.h | 5 ++--- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp index e0380dd666..c405fce062 100644 --- a/samples/ipc/client.cpp +++ b/samples/ipc/client.cpp @@ -112,15 +112,15 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title) SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); // add the controls to the frame - wxString strs4[] = + wxString strs4[] = { IPC_SERVICE, _T("...") }; - wxString strs5[] = + wxString strs5[] = { IPC_HOST, _T("...") }; - wxString strs6[] = + wxString strs6[] = { IPC_TOPIC, _T("...") }; @@ -192,7 +192,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title) wxStaticBox *item14 = new wxStaticBox( this, -1, wxT("Client log") ); wxStaticBoxSizer *item13 = new wxStaticBoxSizer( item14, wxVERTICAL ); - wxTextCtrl *item15 = new wxTextCtrl( this, ID_LOG, wxT(""), wxDefaultPosition, wxSize(500,140), wxTE_MULTILINE ); + wxTextCtrl *item15 = new wxTextCtrl( this, ID_LOG, wxEmptyString, wxDefaultPosition, wxSize(500,140), wxTE_MULTILINE ); item13->Add( item15, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); item0->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -208,10 +208,10 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title) wxLogTextCtrl *logWindow = new wxLogTextCtrl(GetLog()); delete wxLog::SetActiveTarget(logWindow); wxLogMessage(_T("Click on Connect to connect to the server")); - Enable(); + EnableControls(); } -void MyFrame::Enable() +void MyFrame::EnableControls() { GetStart()->Enable(m_client == NULL); GetServername()->Enable(m_client == NULL); @@ -269,7 +269,7 @@ void MyFrame::OnServername( wxCommandEvent& WXUNUSED(event) ) if (GetServername()->GetStringSelection() == _T("...")) { wxString s = wxGetTextFromUser(_T("Specify the name of the server"), - _T("Server Name"), _(""), this); + _T("Server Name"), wxEmptyString, this); if (!s.IsEmpty() && s != IPC_SERVICE) { GetServername()->Insert(s, 0); @@ -283,7 +283,7 @@ void MyFrame::OnHostname( wxCommandEvent& WXUNUSED(event) ) if (GetHostname()->GetStringSelection() == _T("...")) { wxString s = wxGetTextFromUser(_T("Specify the name of the host (ignored under DDE)"), - _T("Host Name"), _(""), this); + _T("Host Name"), wxEmptyString, this); if (!s.IsEmpty() && s != IPC_HOST) { GetHostname()->Insert(s, 0); @@ -297,7 +297,7 @@ void MyFrame::OnTopic( wxCommandEvent& WXUNUSED(event) ) if (GetTopic()->GetStringSelection() == _T("...")) { wxString s = wxGetTextFromUser(_T("Specify the name of the topic"), - _T("Topic Name"), _(""), this); + _T("Topic Name"), wxEmptyString, this); if (!s.IsEmpty() && s != IPC_TOPIC) { GetTopic()->Insert(s, 0); @@ -308,24 +308,24 @@ void MyFrame::OnTopic( wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnDisconnect(wxCommandEvent& WXUNUSED(event)) { - Disconnect(); + Disconnect(); } void MyFrame::Disconnect() { - delete m_client; + delete m_client; m_client = NULL; Enable(); } void MyFrame::OnStartAdvise(wxCommandEvent& WXUNUSED(event)) { - m_client->GetConnection()->StartAdvise(_T("something")); + m_client->GetConnection()->StartAdvise(_T("something")); } void MyFrame::OnStopAdvise(wxCommandEvent& WXUNUSED(event)) { - m_client->GetConnection()->StopAdvise(_T("something")); + m_client->GetConnection()->StopAdvise(_T("something")); } void MyFrame::OnExecute(wxCommandEvent& WXUNUSED(event)) @@ -382,7 +382,7 @@ bool MyClient::Connect(const wxString& sHost, const wxString& sService, const wx { // suppress the log messages from MakeConnection() wxLogNull nolog; - + m_connection = (MyConnection *)MakeConnection(sHost, sService, sTopic); return m_connection != NULL; } @@ -426,7 +426,7 @@ void MyConnection::Log(const wxString& command, const wxString& topic, else s.Printf(_T("%s(topic=\"%s\",item=\"%s\","), command.c_str(), topic.c_str(), item.c_str()); - if (format == wxIPC_TEXT || format == wxIPC_UNICODETEXT) + if (format == wxIPC_TEXT || format == wxIPC_UNICODETEXT) wxLogMessage(_T("%s\"%s\",%d)"), s.c_str(), data, size); else if (format == wxIPC_PRIVATE) { @@ -438,7 +438,7 @@ void MyConnection::Log(const wxString& command, const wxString& topic, else wxLogMessage(_T("%s...,%d)"), s.c_str(), size); } - else if (format == wxIPC_INVALID) + else if (format == wxIPC_INVALID) wxLogMessage(_T("%s[invalid data],%d)"), s.c_str(), size); } @@ -458,7 +458,7 @@ bool MyConnection::OnDisconnect() bool MyConnection::Execute(const wxChar *data, int size, wxIPCFormat format) { - Log(_T("Execute"), _T(""), _T(""), (wxChar *)data, size, format); + Log(_T("Execute"), wxEmptyString, wxEmptyString, (wxChar *)data, size, format); bool retval = wxConnection::Execute(data, size, format); if (!retval) wxLogMessage(_T("Execute failed!")); @@ -468,13 +468,12 @@ bool MyConnection::Execute(const wxChar *data, int size, wxIPCFormat format) wxChar *MyConnection::Request(const wxString& item, int *size, wxIPCFormat format) { wxChar *data = wxConnection::Request(item, size, format); - Log(_T("Request"), _T(""), item, data, size ? *size : -1, format); + Log(_T("Request"), wxEmptyString, item, data, size ? *size : -1, format); return data; } bool MyConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFormat format) { - Log(_T("Poke"), _T(""), item, data, size, format); + Log(_T("Poke"), wxEmptyString, item, data, size, format); return wxConnection::Poke(item, data, size, format); } - diff --git a/samples/ipc/client.h b/samples/ipc/client.h index 8c04e41c7f..c9e06778ff 100644 --- a/samples/ipc/client.h +++ b/samples/ipc/client.h @@ -45,7 +45,7 @@ public: void OnExit(wxCommandEvent& event); void OnClose(wxCloseEvent& event); - void Enable(); + void EnableControls(); void Disconnect(); protected: @@ -86,7 +86,7 @@ public: virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); virtual bool OnAdvise(const wxString& topic, const wxString& item, wxChar *data, int size, wxIPCFormat format); virtual bool OnDisconnect(); -protected: +protected: void Log(const wxString& command, const wxString& topic, const wxString& item, wxChar *data, int size, wxIPCFormat format); }; @@ -105,4 +105,3 @@ public: protected: MyConnection *m_connection; }; - -- 2.45.2