Make wxMDIParentFrame a regular top level window

[wxWidgets.git] / include / wx / msw / setup0.h

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index ab50ac6dc60ce95e72896513887c08533d1f56c9..354ab7a76a09619616bed7a4aac8f1acfeffb181 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -45,14 +45,14 @@
 #define WXWIN_COMPATIBILITY_2 0
 
 // This setting determines the compatibility with 2.2 API: set it to 1 to
 #define WXWIN_COMPATIBILITY_2 0
 
 // This setting determines the compatibility with 2.2 API: set it to 1 to

-// enable it but please consider to update your code instead of doing it.
+// enable it but please consider updating your code instead.

 //
 // Default is 0
 //
 // Recommended setting: 0 (please update your code)
 #define WXWIN_COMPATIBILITY_2_2 1
 
 //
 // Default is 0
 //
 // Recommended setting: 0 (please update your code)
 #define WXWIN_COMPATIBILITY_2_2 1
 

-// This setting determines the compatibility with 2.2 API: set it to 0 to
+// This setting determines the compatibility with 2.4 API: set it to 0 to

 // flag all cases of using deprecated functions.
 //
 // Default is 1 but please try building your code with 0 as the default will
 // flag all cases of using deprecated functions.
 //
 // Default is 1 but please try building your code with 0 as the default will


@@ -160,7 +160,7 @@
 //
 // Unicode is currently only fully supported under Windows NT/2000/XP
 // (Windows 9x doesn't support it and the programs compiled in Unicode mode
 //
 // Unicode is currently only fully supported under Windows NT/2000/XP
 // (Windows 9x doesn't support it and the programs compiled in Unicode mode

-// will not run under 9x -- but see wxUSE_UNICODE_MSLU bellow).
+// will not run under 9x -- but see wxUSE_UNICODE_MSLU below).

 //
 // Default is 0
 //
 //
 // Default is 0
 //


@@ -545,20 +545,13 @@
 // Recommended setting: 0 (use wxNotebook)
 #define wxUSE_TAB_DIALOG    0
 
 // Recommended setting: 0 (use wxNotebook)
 #define wxUSE_TAB_DIALOG    0
 

-// wxGrid class comes in two flavours: the original (pre wxWin 2.2) one and
-// the new, much imporved and enhanced version. The new version is backwards
-// compatible with the old one and should be used whenever possible, i.e. if
-// you set wxUSE_GRID to 1, set wxUSE_NEW_GRID to 1 too.
+// wxGrid class

 //
 // Default is 1 for both options.
 //
 //
 // Default is 1 for both options.
 //

-// Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using
-// wxGrid and 100% backwards compatibality (with all old wxGrid quirks) is
-// essential.
+// Recommended setting: 1

 //
 //

-// WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit.

 #define wxUSE_GRID         1
 #define wxUSE_GRID         1

-#define wxUSE_NEW_GRID     1

 
 // ----------------------------------------------------------------------------
 // Miscellaneous GUI stuff
 
 // ----------------------------------------------------------------------------
 // Miscellaneous GUI stuff


@@ -1150,9 +1143,6 @@
 
 #undef wxUSE_ODBC
 #define wxUSE_ODBC                0
 
 #undef wxUSE_ODBC
 #define wxUSE_ODBC                0

-
-#undef wxUSE_NEW_GRID
-#define wxUSE_NEW_GRID            0

 #endif
 
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
 #endif
 
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)