minimalistic build fixes (mostly #if wxUSE_something)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user