From 93d381756808d466a91e844d4ed10600a87c7a32 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 27 Feb 2000 21:04:26 +0000 Subject: [PATCH] minimalistic build fixes (mostly #if wxUSE_something) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/notebook.h | 3 +++ include/wx/gtk1/notebook.h | 3 +++ src/common/paper.cpp | 5 +++++ src/gtk/notebook.cpp | 4 ++++ src/gtk1/notebook.cpp | 4 ++++ 5 files changed, 19 insertions(+) diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h index 9106055672..ef09df8f89 100644 --- a/include/wx/gtk/notebook.h +++ b/include/wx/gtk/notebook.h @@ -140,8 +140,11 @@ public: // implementation // -------------- +#if wxUSE_CONSTRAINTS void SetConstraintSizes(bool recurse); bool DoPhase(int phase); +#endif + void ApplyWidgetStyle(); // report if window belongs to notebook diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h index 9106055672..ef09df8f89 100644 --- a/include/wx/gtk1/notebook.h +++ b/include/wx/gtk1/notebook.h @@ -140,8 +140,11 @@ public: // implementation // -------------- +#if wxUSE_CONSTRAINTS void SetConstraintSizes(bool recurse); bool DoPhase(int phase); +#endif + void ApplyWidgetStyle(); // report if window belongs to notebook diff --git a/src/common/paper.cpp b/src/common/paper.cpp index 37dff8558d..653309aafa 100644 --- a/src/common/paper.cpp +++ b/src/common/paper.cpp @@ -22,6 +22,9 @@ #include "wx/defs.h" +#if wxUSE_PRINTING_ARCHITECTURE + + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/settings.h" @@ -305,3 +308,5 @@ void wxPrintPaperModule::OnExit() wxThePrintPaperDatabase = NULL; } +#endif // wxUSE_PRINTING_ARCHITECTURE + diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 7744b3e1c3..1034747a3f 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -651,6 +651,8 @@ wxNotebookPage *wxNotebook::GetPage( int page ) const return nb_page->m_client; } +#if wxUSE_CONSTRAINTS + // override these 2 functions to do nothing: everything is done in OnSize void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) ) { @@ -663,6 +665,8 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) return TRUE; } +#endif + void wxNotebook::ApplyWidgetStyle() { // TODO, font for labels etc diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 7744b3e1c3..1034747a3f 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -651,6 +651,8 @@ wxNotebookPage *wxNotebook::GetPage( int page ) const return nb_page->m_client; } +#if wxUSE_CONSTRAINTS + // override these 2 functions to do nothing: everything is done in OnSize void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) ) { @@ -663,6 +665,8 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) return TRUE; } +#endif + void wxNotebook::ApplyWidgetStyle() { // TODO, font for labels etc -- 2.45.2