From 5f2c545c7f4cb9c80088d50f79c6946c1215c7df Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 19 Apr 2006 01:03:10 +0000 Subject: [PATCH 1/1] regenerated using build/update-setup-h to have wxUSE_DISPLAY and wxUSE_DATAVIEWCTRL changes in all versions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/setup0.h | 39 +++++++++++++++++++++++++++++----- include/wx/motif/setup0.h | 39 +++++++++++++++++++++++++++++----- include/wx/msw/setup0.h | 30 +++++++++++++++++++++----- include/wx/msw/wince/setup.h | 41 ++++++++++++++++++++++++++++++------ include/wx/os2/setup0.h | 39 +++++++++++++++++++++++++++++----- include/wx/palmos/setup0.h | 39 +++++++++++++++++++++++++++++----- 6 files changed, 196 insertions(+), 31 deletions(-) diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index caca6bd07f..61169e8269 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -247,10 +247,29 @@ // Recommended setting: 0 unless you do plan to develop MT applications #define wxUSE_THREADS 1 -// If enabled (1), compiles wxWidgets streams classes +// If enabled, compiles wxWidgets streams classes +// +// wx stream classes are used for image IO, process IO redirection, network +// protocols implementation and much more and so disabling this results in a +// lot of other functionality being lost. +// +// Default is 1 +// +// Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 -// Use standard C++ streams if 1. If 0, use wxWin streams implementation only. +// Use standard C++ streams if 1 instead of wx streams in some places. If +// disabled (default), wx streams are used everywhere and wxWidgets doesn't +// depend on the standard streams library. +// +// Notice that enabling this does not replace wx streams with std streams +// everywhere, in a lot of places wx streams are used no matter what. +// +// Default is 0 +// +// Recommended setting: 1 if you use the standard streams anyhow and so +// dependency on the standard streams library is not a +// problem #define wxUSE_STD_IOSTREAM 0 // Enable conversion to standard C++ string if 1. @@ -543,6 +562,7 @@ #define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) #define wxUSE_CHOICE 1 // wxChoice #define wxUSE_COMBOBOX 1 // wxComboBox +#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl #define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl #define wxUSE_GAUGE 1 // wxGauge #define wxUSE_LISTBOX 1 // wxListBox @@ -622,6 +642,14 @@ // Recommended setting: 1 #define wxUSE_TREEBOOK 1 +// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of +// tabs +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_TOOLBOOK 1 + // wxTabDialog is a generic version of wxNotebook but it is incompatible with // the new class. It shouldn't be used in new code. // @@ -665,12 +693,13 @@ #define wxUSE_CARET 1 // Use wxDisplay class: it allows enumerating all displays on a system and -// working with them. +// their geometries as well as finding the display on which the given point or +// window lies. // -// Default is 0 because it isn't yet implemented on all platforms +// Default is 1. // // Recommended setting: 1 if you need it, can be safely set to 0 otherwise -#define wxUSE_DISPLAY 0 +#define wxUSE_DISPLAY 1 // Miscellaneous geometry code: needed for Canvas library #define wxUSE_GEOMETRY 1 diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 3fe50fbb10..4f2bde5aba 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -246,10 +246,29 @@ // Recommended setting: 0 unless you do plan to develop MT applications #define wxUSE_THREADS 1 -// If enabled (1), compiles wxWidgets streams classes +// If enabled, compiles wxWidgets streams classes +// +// wx stream classes are used for image IO, process IO redirection, network +// protocols implementation and much more and so disabling this results in a +// lot of other functionality being lost. +// +// Default is 1 +// +// Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 -// Use standard C++ streams if 1. If 0, use wxWin streams implementation only. +// Use standard C++ streams if 1 instead of wx streams in some places. If +// disabled (default), wx streams are used everywhere and wxWidgets doesn't +// depend on the standard streams library. +// +// Notice that enabling this does not replace wx streams with std streams +// everywhere, in a lot of places wx streams are used no matter what. +// +// Default is 0 +// +// Recommended setting: 1 if you use the standard streams anyhow and so +// dependency on the standard streams library is not a +// problem #define wxUSE_STD_IOSTREAM 0 // Enable conversion to standard C++ string if 1. @@ -542,6 +561,7 @@ #define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) #define wxUSE_CHOICE 1 // wxChoice #define wxUSE_COMBOBOX 1 // wxComboBox +#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl #define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl #define wxUSE_GAUGE 1 // wxGauge #define wxUSE_LISTBOX 1 // wxListBox @@ -621,6 +641,14 @@ // Recommended setting: 1 #define wxUSE_TREEBOOK 1 +// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of +// tabs +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_TOOLBOOK 1 + // wxTabDialog is a generic version of wxNotebook but it is incompatible with // the new class. It shouldn't be used in new code. // @@ -664,12 +692,13 @@ #define wxUSE_CARET 1 // Use wxDisplay class: it allows enumerating all displays on a system and -// working with them. +// their geometries as well as finding the display on which the given point or +// window lies. // -// Default is 0 because it isn't yet implemented on all platforms +// Default is 1. // // Recommended setting: 1 if you need it, can be safely set to 0 otherwise -#define wxUSE_DISPLAY 0 +#define wxUSE_DISPLAY 1 // Miscellaneous geometry code: needed for Canvas library #define wxUSE_GEOMETRY 1 diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 9dff5ecc8b..a212bc2446 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -246,10 +246,29 @@ // Recommended setting: 0 unless you do plan to develop MT applications #define wxUSE_THREADS 1 -// If enabled (1), compiles wxWidgets streams classes +// If enabled, compiles wxWidgets streams classes +// +// wx stream classes are used for image IO, process IO redirection, network +// protocols implementation and much more and so disabling this results in a +// lot of other functionality being lost. +// +// Default is 1 +// +// Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 -// Use standard C++ streams if 1. If 0, use wxWin streams implementation only. +// Use standard C++ streams if 1 instead of wx streams in some places. If +// disabled (default), wx streams are used everywhere and wxWidgets doesn't +// depend on the standard streams library. +// +// Notice that enabling this does not replace wx streams with std streams +// everywhere, in a lot of places wx streams are used no matter what. +// +// Default is 0 +// +// Recommended setting: 1 if you use the standard streams anyhow and so +// dependency on the standard streams library is not a +// problem #define wxUSE_STD_IOSTREAM 0 // Enable conversion to standard C++ string if 1. @@ -542,6 +561,7 @@ #define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) #define wxUSE_CHOICE 1 // wxChoice #define wxUSE_COMBOBOX 1 // wxComboBox +#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl #define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl #define wxUSE_GAUGE 1 // wxGauge #define wxUSE_LISTBOX 1 // wxListBox @@ -559,7 +579,6 @@ #define wxUSE_TEXTCTRL 1 // wxTextCtrl #define wxUSE_TOGGLEBTN 1 // requires wxButton #define wxUSE_TREECTRL 1 // wxTreeCtrl -#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. @@ -673,9 +692,10 @@ #define wxUSE_CARET 1 // Use wxDisplay class: it allows enumerating all displays on a system and -// working with them. +// their geometries as well as finding the display on which the given point or +// window lies. // -// Default is 0 because it isn't yet implemented on all platforms +// Default is 1. // // Recommended setting: 1 if you need it, can be safely set to 0 otherwise #define wxUSE_DISPLAY 1 diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index 0a2f18b8bf..4b7ed472de 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -246,10 +246,29 @@ // Recommended setting: 0 unless you do plan to develop MT applications #define wxUSE_THREADS 1 -// If enabled (1), compiles wxWidgets streams classes +// If enabled, compiles wxWidgets streams classes +// +// wx stream classes are used for image IO, process IO redirection, network +// protocols implementation and much more and so disabling this results in a +// lot of other functionality being lost. +// +// Default is 1 +// +// Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 -// Use standard C++ streams if 1. If 0, use wxWin streams implementation only. +// Use standard C++ streams if 1 instead of wx streams in some places. If +// disabled (default), wx streams are used everywhere and wxWidgets doesn't +// depend on the standard streams library. +// +// Notice that enabling this does not replace wx streams with std streams +// everywhere, in a lot of places wx streams are used no matter what. +// +// Default is 0 +// +// Recommended setting: 1 if you use the standard streams anyhow and so +// dependency on the standard streams library is not a +// problem #define wxUSE_STD_IOSTREAM 0 // Enable conversion to standard C++ string if 1. @@ -470,7 +489,7 @@ // Default is 1. // // Recommended setting: 1 -#define wxUSE_MEDIACTRL 0 +#define wxUSE_MEDIACTRL 1 // Use GStreamer for Unix (req a lot of dependancies) // @@ -542,6 +561,7 @@ #define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) #define wxUSE_CHOICE 1 // wxChoice #define wxUSE_COMBOBOX 1 // wxComboBox +#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl #define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl #define wxUSE_GAUGE 1 // wxGauge #define wxUSE_LISTBOX 1 // wxListBox @@ -621,6 +641,14 @@ // Recommended setting: 1 #define wxUSE_TREEBOOK 1 +// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of +// tabs +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_TOOLBOOK 1 + // wxTabDialog is a generic version of wxNotebook but it is incompatible with // the new class. It shouldn't be used in new code. // @@ -664,12 +692,13 @@ #define wxUSE_CARET 1 // Use wxDisplay class: it allows enumerating all displays on a system and -// working with them. +// their geometries as well as finding the display on which the given point or +// window lies. // -// Default is 0 because it isn't yet implemented on all platforms +// Default is 1. // // Recommended setting: 1 if you need it, can be safely set to 0 otherwise -#define wxUSE_DISPLAY 0 +#define wxUSE_DISPLAY 1 // Miscellaneous geometry code: needed for Canvas library #define wxUSE_GEOMETRY 1 diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index f4849271bc..524c93c98d 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -246,10 +246,29 @@ // Recommended setting: 0 unless you do plan to develop MT applications #define wxUSE_THREADS 1 -// If enabled (1), compiles wxWidgets streams classes +// If enabled, compiles wxWidgets streams classes +// +// wx stream classes are used for image IO, process IO redirection, network +// protocols implementation and much more and so disabling this results in a +// lot of other functionality being lost. +// +// Default is 1 +// +// Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 -// Use standard C++ streams if 1. If 0, use wxWin streams implementation only. +// Use standard C++ streams if 1 instead of wx streams in some places. If +// disabled (default), wx streams are used everywhere and wxWidgets doesn't +// depend on the standard streams library. +// +// Notice that enabling this does not replace wx streams with std streams +// everywhere, in a lot of places wx streams are used no matter what. +// +// Default is 0 +// +// Recommended setting: 1 if you use the standard streams anyhow and so +// dependency on the standard streams library is not a +// problem #define wxUSE_STD_IOSTREAM 0 // Enable conversion to standard C++ string if 1. @@ -542,6 +561,7 @@ #define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) #define wxUSE_CHOICE 1 // wxChoice #define wxUSE_COMBOBOX 1 // wxComboBox +#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl #define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl #define wxUSE_GAUGE 1 // wxGauge #define wxUSE_LISTBOX 1 // wxListBox @@ -621,6 +641,14 @@ // Recommended setting: 1 #define wxUSE_TREEBOOK 1 +// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of +// tabs +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_TOOLBOOK 1 + // wxTabDialog is a generic version of wxNotebook but it is incompatible with // the new class. It shouldn't be used in new code. // @@ -664,12 +692,13 @@ #define wxUSE_CARET 1 // Use wxDisplay class: it allows enumerating all displays on a system and -// working with them. +// their geometries as well as finding the display on which the given point or +// window lies. // -// Default is 0 because it isn't yet implemented on all platforms +// Default is 1. // // Recommended setting: 1 if you need it, can be safely set to 0 otherwise -#define wxUSE_DISPLAY 0 +#define wxUSE_DISPLAY 1 // Miscellaneous geometry code: needed for Canvas library #define wxUSE_GEOMETRY 1 diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h index 832905f4f2..0676921c3c 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -246,10 +246,29 @@ // Recommended setting: 0 unless you do plan to develop MT applications #define wxUSE_THREADS 1 -// If enabled (1), compiles wxWidgets streams classes +// If enabled, compiles wxWidgets streams classes +// +// wx stream classes are used for image IO, process IO redirection, network +// protocols implementation and much more and so disabling this results in a +// lot of other functionality being lost. +// +// Default is 1 +// +// Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 -// Use standard C++ streams if 1. If 0, use wxWin streams implementation only. +// Use standard C++ streams if 1 instead of wx streams in some places. If +// disabled (default), wx streams are used everywhere and wxWidgets doesn't +// depend on the standard streams library. +// +// Notice that enabling this does not replace wx streams with std streams +// everywhere, in a lot of places wx streams are used no matter what. +// +// Default is 0 +// +// Recommended setting: 1 if you use the standard streams anyhow and so +// dependency on the standard streams library is not a +// problem #define wxUSE_STD_IOSTREAM 0 // Enable conversion to standard C++ string if 1. @@ -542,6 +561,7 @@ #define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) #define wxUSE_CHOICE 1 // wxChoice #define wxUSE_COMBOBOX 1 // wxComboBox +#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl #define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl #define wxUSE_GAUGE 1 // wxGauge #define wxUSE_LISTBOX 1 // wxListBox @@ -621,6 +641,14 @@ // Recommended setting: 1 #define wxUSE_TREEBOOK 1 +// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of +// tabs +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_TOOLBOOK 1 + // wxTabDialog is a generic version of wxNotebook but it is incompatible with // the new class. It shouldn't be used in new code. // @@ -664,12 +692,13 @@ #define wxUSE_CARET 1 // Use wxDisplay class: it allows enumerating all displays on a system and -// working with them. +// their geometries as well as finding the display on which the given point or +// window lies. // -// Default is 0 because it isn't yet implemented on all platforms +// Default is 1. // // Recommended setting: 1 if you need it, can be safely set to 0 otherwise -#define wxUSE_DISPLAY 0 +#define wxUSE_DISPLAY 1 // Miscellaneous geometry code: needed for Canvas library #define wxUSE_GEOMETRY 1 -- 2.47.2