Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minimalistic build fixes (mostly #if wxUSE_something)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-02-27 21:04:26 +00:00
parent 8eb9501e82
commit 93d3817568
5 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/gtk/notebook.h
View File

@@ -140,8 +140,11 @@ public:
// implementation // implementation
// -------------- // --------------
#if wxUSE_CONSTRAINTS
void SetConstraintSizes(bool recurse); void SetConstraintSizes(bool recurse);
bool DoPhase(int phase); bool DoPhase(int phase);
#endif
void ApplyWidgetStyle(); void ApplyWidgetStyle();
// report if window belongs to notebook // report if window belongs to notebook

3
include/wx/gtk1/notebook.h
View File

@@ -140,8 +140,11 @@ public:
// implementation // implementation
// -------------- // --------------
#if wxUSE_CONSTRAINTS
void SetConstraintSizes(bool recurse); void SetConstraintSizes(bool recurse);
bool DoPhase(int phase); bool DoPhase(int phase);
#endif
void ApplyWidgetStyle(); void ApplyWidgetStyle();
// report if window belongs to notebook // report if window belongs to notebook

5
src/common/paper.cpp
View File

@@ -22,6 +22,9 @@
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_PRINTING_ARCHITECTURE
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/settings.h" #include "wx/settings.h"
@@ -305,3 +308,5 @@ void wxPrintPaperModule::OnExit()
wxThePrintPaperDatabase = NULL; wxThePrintPaperDatabase = NULL;
} }
#endif // wxUSE_PRINTING_ARCHITECTURE

4
src/gtk/notebook.cpp
View File

@@ -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 // override these 2 functions to do nothing: everything is done in OnSize
void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) ) void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
{ {
@@ -663,6 +665,8 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
return TRUE; return TRUE;
} }
#endif
void wxNotebook::ApplyWidgetStyle() void wxNotebook::ApplyWidgetStyle()
{ {
// TODO, font for labels etc // TODO, font for labels etc

4
src/gtk1/notebook.cpp
View File

@@ -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 // override these 2 functions to do nothing: everything is done in OnSize
void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) ) void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
{ {
@@ -663,6 +665,8 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
return TRUE; return TRUE;
} }
#endif
void wxNotebook::ApplyWidgetStyle() void wxNotebook::ApplyWidgetStyle()
{ {
// TODO, font for labels etc // TODO, font for labels etc