no message

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-10-22 22:12:59 +00:00
parent 275c4ae474
commit 42f2e3e9bb
2 changed files with 4 additions and 13 deletions

View File

@@ -74,18 +74,6 @@ protected:
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO); 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_ #endif // _WX_CHOICE_H_

View File

@@ -368,6 +368,9 @@
#define wxUSE_SPLASH 1 #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 #endif
// _WX_SETUP_H_ // _WX_SETUP_H_