avoid a bug in Carbon headers

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

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 4efd8d7da7394b42fd5ec98c414c4c330a7deef2..acdfde82796f4a4d1d63ee62b56898d05152cfc1 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -22,6 +22,8 @@
 // define this to 0 when building wxBase library
 #define wxUSE_GUI            1
 
 // define this to 0 when building wxBase library
 #define wxUSE_GUI            1
 

+//define this to 1 when adding support for multiple displays/screens
+#define wxUSE_DISPLAY        0

 // ----------------------------------------------------------------------------
 // General features
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // General features
 // ----------------------------------------------------------------------------


@@ -77,8 +79,8 @@
                                 // 0 for no drag and drop
 
 #define wxUSE_CONTROLS     1    // Do not change
                                 // 0 for no drag and drop
 
 #define wxUSE_CONTROLS     1    // Do not change

-#define wxUSE_POPUPWIN     0    // OS/2 does not use this
-#define wxUSE_TIPWINDOW    0    // hence this is unavailable
+#define wxUSE_POPUPWIN     1    //
+#define wxUSE_TIPWINDOW    1    //

 
 // Recommended setting: 1
 #define wxUSE_BUTTON       1    // wxButton
 
 // Recommended setting: 1
 #define wxUSE_BUTTON       1    // wxButton


@@ -118,6 +120,7 @@
 #define wxUSE_MIMETYPE     1
 #define wxUSE_MSGDLG       1
 #define wxUSE_NOTEBOOK     1
 #define wxUSE_MIMETYPE     1
 #define wxUSE_MSGDLG       1
 #define wxUSE_NOTEBOOK     1

+#define wxUSE_LISTBOOK     1

 #define wxUSE_SPLITTER     1
 #define wxUSE_STOPWATCH    1
 #define wxUSE_TAB_DIALOG   1
 #define wxUSE_SPLITTER     1
 #define wxUSE_STOPWATCH    1
 #define wxUSE_TAB_DIALOG   1


@@ -143,7 +146,7 @@
 #define wxUSE_RESOURCE_LOADING_IN_OS2     1
                                     // Use dynamic icon/cursor loading/saving code
                                     // under OS2.
 #define wxUSE_RESOURCE_LOADING_IN_OS2     1
                                     // Use dynamic icon/cursor loading/saving code
                                     // under OS2.

-#define wxUSE_WX_RESOURCES        1
+#define wxUSE_WX_RESOURCES        0

                                   // Use .wxr resource mechanism (requires PrologIO library)
 
 // support for startup tips (wxShowTip &c)
                                   // Use .wxr resource mechanism (requires PrologIO library)
 
 // support for startup tips (wxShowTip &c)


@@ -338,9 +341,6 @@
 #define wxUSE_OWNER_DRAWN             1
                                     // Owner-drawn menus and listboxes
 
 #define wxUSE_OWNER_DRAWN             1
                                     // Owner-drawn menus and listboxes
 

-#define wxUSE_NEW_GRID 1
-                                // Define 1 to use the new drid classes
-

 /*
  * Any platform
  *
 /*
  * Any platform
  *


@@ -391,11 +391,14 @@
                                   // DLL loading and function calling
 #define wxUSE_DYNAMIC_LOADER 0
 
                                   // DLL loading and function calling
 #define wxUSE_DYNAMIC_LOADER 0
 

+#define wxUSE_WCHAR_T           1

 #define wxUSE_PROTOCOL          1
 #define wxUSE_URL               1
 #define wxUSE_PROTOCOL_HTTP     1
 #define wxUSE_PROTOCOL_FTP      1
 #define wxUSE_PROTOCOL_FILE     1
 
 #define wxUSE_PROTOCOL          1
 #define wxUSE_URL               1
 #define wxUSE_PROTOCOL_HTTP     1
 #define wxUSE_PROTOCOL_FTP      1
 #define wxUSE_PROTOCOL_FILE     1
 

+#define wxUSE_GENERIC_MDI_AS_NATIVE 1
+

 #endif
     // _WX_SETUP_H_
 #endif
     // _WX_SETUP_H_