From 42f2e3e9bb8f56021910132e9f5b104cbb618250 Mon Sep 17 00:00:00 2001 From: David Webster Date: Mon, 22 Oct 2001 22:12:59 +0000 Subject: [PATCH] no message git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/choice.h | 12 ------------ include/wx/os2/setup0.h | 5 ++++- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h index 6289745486..11358cd4dd 100644 --- a/include/wx/os2/choice.h +++ b/include/wx/os2/choice.h @@ -74,18 +74,6 @@ protected: virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); -private: - // Virtual function hiding supression -/* - inline virtual void DoSetClientData( void *data ) - { wxWindowBase::DoSetClientData(data); } - inline virtual void DoSetClientObject( wxClientData *data ) - { wxWindowBase::DoSetClientObject(data); } - inline virtual wxClientData *DoGetClientObject() const - { return(wxWindowBase::DoGetClientObject());} - inline virtual void *DoGetClientData() const - { return(wxWindowBase::DoGetClientData());} -*/ }; #endif // _WX_CHOICE_H_ diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index a22a59e0cd..21080fc043 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -368,6 +368,9 @@ #define wxUSE_SPLASH 1 -#define NO_TEXT_WINDOW_STREAM 1 +#if (!(defined(WXUSINGDLL) || defined(WXMAKINGDLL))) + #define NO_TEXT_WINDOW_STREAM 1 // defined in textctrl.h for DLL builds +#endif + #endif // _WX_SETUP_H_ -- 2.45.2