minimalistic build fixes (mostly #if wxUSE_something)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 910605567220a72d932dd07079bd545784a3eaa5..ef09df8f89db3e5c7422838ee0685b4d2abcc917 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -140,8 +140,11 @@ public:
     // implementation
     // --------------
 
     // implementation
     // --------------
 

+#if wxUSE_CONSTRAINTS

     void SetConstraintSizes(bool recurse);
     bool DoPhase(int phase);
     void SetConstraintSizes(bool recurse);
     bool DoPhase(int phase);

+#endif
+

     void ApplyWidgetStyle();
 
     // report if window belongs to notebook  
     void ApplyWidgetStyle();
 
     // report if window belongs to notebook  

diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index 910605567220a72d932dd07079bd545784a3eaa5..ef09df8f89db3e5c7422838ee0685b4d2abcc917 100644 (file)
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -140,8 +140,11 @@ public:
     // implementation
     // --------------
 
     // implementation
     // --------------
 

+#if wxUSE_CONSTRAINTS

     void SetConstraintSizes(bool recurse);
     bool DoPhase(int phase);
     void SetConstraintSizes(bool recurse);
     bool DoPhase(int phase);

+#endif
+

     void ApplyWidgetStyle();
 
     // report if window belongs to notebook  
     void ApplyWidgetStyle();
 
     // report if window belongs to notebook  

diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index 37dff8558d99e736f2bf06a307f082cfff3b8dfd..653309aafa7bb8b7d3b813d1dfd279d772b84ca1 100644 (file)
--- a/src/common/paper.cpp
+++ b/src/common/paper.cpp
@@ -22,6 +22,9 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+
+

 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/settings.h"
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/settings.h"


@@ -305,3 +308,5 @@ void wxPrintPaperModule::OnExit()
     wxThePrintPaperDatabase = NULL;
 }
 
     wxThePrintPaperDatabase = NULL;
 }
 

+#endif // wxUSE_PRINTING_ARCHITECTURE
+

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 7744b3e1c367739a096fb92b304cb8b6fd94bf25..1034747a3f465fe318796c69ef796c81866878ae 100644 (file)
--- 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;
 }
 
         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) )
 {
 // 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;
 }
 
     return TRUE;
 }
 

+#endif
+

 void wxNotebook::ApplyWidgetStyle()
 {
     // TODO, font for labels etc
 void wxNotebook::ApplyWidgetStyle()
 {
     // TODO, font for labels etc

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 7744b3e1c367739a096fb92b304cb8b6fd94bf25..1034747a3f465fe318796c69ef796c81866878ae 100644 (file)
--- 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;
 }
 
         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) )
 {
 // 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;
 }
 
     return TRUE;
 }
 

+#endif
+

 void wxNotebook::ApplyWidgetStyle()
 {
     // TODO, font for labels etc
 void wxNotebook::ApplyWidgetStyle()
 {
     // TODO, font for labels etc