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
This commit is contained in:
@@ -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;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user