From 0b481c72b66ac928426f5f1ab70c5ededd3334af Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 14 Jan 2003 19:40:55 +0000 Subject: [PATCH] compilation fix for wxUSE_CONSTRAINTS==0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/notebook.h | 4 ++++ src/msw/notebook.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 4fd14d30da..94a70e68c4 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -117,11 +117,15 @@ public: // base class virtuals // ------------------- + virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnScroll(int orientation, WXWORD nSBCode, WXWORD pos, WXHWND control); + +#if wxUSE_CONSTRAINTS virtual void SetConstraintSizes(bool recurse = TRUE); virtual bool DoPhase(int nPhase); +#endif // wxUSE_CONSTRAINTS protected: // common part of all ctors diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index cec5d7ff52..41bb070524 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -603,6 +603,8 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // wxNotebook base class virtuals // ---------------------------------------------------------------------------- +#if wxUSE_CONSTRAINTS + // override these 2 functions to do nothing: everything is done in OnSize void wxNotebook::SetConstraintSizes(bool WXUNUSED(recurse)) @@ -616,6 +618,8 @@ bool wxNotebook::DoPhase(int WXUNUSED(nPhase)) return TRUE; } +#endif // wxUSE_CONSTRAINTS + // ---------------------------------------------------------------------------- // wxNotebook Windows message handlers // ----------------------------------------------------------------------------