Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid conflict between wxWindow::Enable and MyFrame::Enable.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-01-16 16:09:49 +00:00
parent 4219b5e7c7
commit 81ba610721
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
samples/ipc/client.cpp
View File

@@ -192,7 +192,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
wxStaticBox *item14 = new wxStaticBox( this, -1, wxT("Client log") ); wxStaticBox *item14 = new wxStaticBox( this, -1, wxT("Client log") );
wxStaticBoxSizer *item13 = new wxStaticBoxSizer( item14, wxVERTICAL ); 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 ); item13->Add( item15, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
item0->Add( item13, 0, 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()); wxLogTextCtrl *logWindow = new wxLogTextCtrl(GetLog());
delete wxLog::SetActiveTarget(logWindow); delete wxLog::SetActiveTarget(logWindow);
wxLogMessage(_T("Click on Connect to connect to the server")); wxLogMessage(_T("Click on Connect to connect to the server"));
Enable(); EnableControls();
} }
void MyFrame::Enable() void MyFrame::EnableControls()
{ {
GetStart()->Enable(m_client == NULL); GetStart()->Enable(m_client == NULL);
GetServername()->Enable(m_client == NULL); GetServername()->Enable(m_client == NULL);
@@ -269,7 +269,7 @@ void MyFrame::OnServername( wxCommandEvent& WXUNUSED(event) )
if (GetServername()->GetStringSelection() == _T("...")) if (GetServername()->GetStringSelection() == _T("..."))
{ {
wxString s = wxGetTextFromUser(_T("Specify the name of the server"), 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) if (!s.IsEmpty() && s != IPC_SERVICE)
{ {
GetServername()->Insert(s, 0); GetServername()->Insert(s, 0);
@@ -283,7 +283,7 @@ void MyFrame::OnHostname( wxCommandEvent& WXUNUSED(event) )
if (GetHostname()->GetStringSelection() == _T("...")) if (GetHostname()->GetStringSelection() == _T("..."))
{ {
wxString s = wxGetTextFromUser(_T("Specify the name of the host (ignored under DDE)"), 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) if (!s.IsEmpty() && s != IPC_HOST)
{ {
GetHostname()->Insert(s, 0); GetHostname()->Insert(s, 0);
@@ -297,7 +297,7 @@ void MyFrame::OnTopic( wxCommandEvent& WXUNUSED(event) )
if (GetTopic()->GetStringSelection() == _T("...")) if (GetTopic()->GetStringSelection() == _T("..."))
{ {
wxString s = wxGetTextFromUser(_T("Specify the name of the topic"), 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) if (!s.IsEmpty() && s != IPC_TOPIC)
{ {
GetTopic()->Insert(s, 0); GetTopic()->Insert(s, 0);
@@ -458,7 +458,7 @@ bool MyConnection::OnDisconnect()
bool MyConnection::Execute(const wxChar *data, int size, wxIPCFormat format) 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); bool retval = wxConnection::Execute(data, size, format);
if (!retval) if (!retval)
wxLogMessage(_T("Execute failed!")); 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 *MyConnection::Request(const wxString& item, int *size, wxIPCFormat format)
{ {
wxChar *data = wxConnection::Request(item, size, 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; return data;
} }
bool MyConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFormat format) 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); return wxConnection::Poke(item, data, size, format);
} }

3
samples/ipc/client.h
View File

@@ -45,7 +45,7 @@ public:
void OnExit(wxCommandEvent& event); void OnExit(wxCommandEvent& event);
void OnClose(wxCloseEvent& event); void OnClose(wxCloseEvent& event);
void Enable(); void EnableControls();
void Disconnect(); void Disconnect();
protected: protected:
@@ -105,4 +105,3 @@ public:
protected: protected:
MyConnection *m_connection; MyConnection *m_connection;
}; };