From 8366ab05cd8541c272e5132e2482e9cfb20cbf27 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 6 Oct 2007 22:10:45 +0000 Subject: [PATCH] don't use using directive, Watcom seems to have problems with it git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/srchctlg.cpp | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp index 3fe46f2ea1..2beebcf613 100644 --- a/src/generic/srchctlg.cpp +++ b/src/generic/srchctlg.cpp @@ -137,9 +137,20 @@ public: // provide access to the base class protected methods to wxSearchCtrl which // needs to forward to them - using wxTextCtrl::DoSetValue; - using wxTextCtrl::DoLoadFile; - using wxTextCtrl::DoSaveFile; + void DoSetValue(const wxString& value, int flags) + { + m_text->DoSetValue(value, flags); + } + + bool DoLoadFile(const wxString& file, int fileType) + { + return m_text->DoLoadFile(file, fileType); + } + + bool DoSaveFile(const wxString& file, int fileType) + { + return m_text->DoSaveFile(file, fileType); + } protected: void OnText(wxCommandEvent& eventText) @@ -903,21 +914,6 @@ wxTextCtrl& operator<<(double d); wxTextCtrl& operator<<(const wxChar c); #endif -void wxSearchCtrl::DoSetValue(const wxString& value, int flags) -{ - m_text->DoSetValue(value, flags); -} - -bool wxSearchCtrl::DoLoadFile(const wxString& file, int fileType) -{ - return m_text->DoLoadFile(file, fileType); -} - -bool wxSearchCtrl::DoSaveFile(const wxString& file, int fileType) -{ - return m_text->DoSaveFile(file, fileType); -} - // do the window-specific processing after processing the update event void wxSearchCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event) {