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 770a667aaa08b4bedc1badcdd5665e7d6564dcd3..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,7 +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_POPUPWIN     1    //
+#define wxUSE_TIPWINDOW    1    //

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


@@ -117,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


@@ -142,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)


@@ -246,14 +250,17 @@
                                   // Set to 1 for PNM format support
 #define wxUSE_PCX           1
                                   // Set to 1 for PCX format support
                                   // Set to 1 for PNM format support
 #define wxUSE_PCX           1
                                   // Set to 1 for PCX format support

+#define wxUSE_IFF           1
+                                  // Set to 1 for IFF format support

 #define wxUSE_XPM           1
                                   // Set to 1 for XPM format support
 
 #define wxUSE_XPM           1
                                   // Set to 1 for XPM format support
 

+
+#define wxUSE_ICO_CUR       1
+                                  // Set to 1 for MS Icons and Cursors format support
+

 #define wxUSE_SERIAL        1
                                   // Use serialization (requires utils/serialize)
 #define wxUSE_SERIAL        1
                                   // Use serialization (requires utils/serialize)

-#define wxUSE_DYNLIB_CLASS  1
-                                  // Compile in wxLibrary class for run-time
-                                  // DLL loading and function calling

 #define wxUSE_TOOLTIPS      1
                                   // Define to use wxToolTip class and
                                   // wxWindow::SetToolTip() method
 #define wxUSE_TOOLTIPS      1
                                   // Define to use wxToolTip class and
                                   // wxWindow::SetToolTip() method


@@ -311,6 +318,9 @@
 // text entry dialog and wxGetTextFromUser function
 #define wxUSE_TEXTDLG 1
 
 // text entry dialog and wxGetTextFromUser function
 #define wxUSE_TEXTDLG 1
 

+// use the number dialog
+#define wxUSE_NUMBERDLG 1
+

 // wxToolBar class
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1
 // wxToolBar class
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1


@@ -325,14 +335,12 @@
 #define wxUSE_PROGRESSDLG 1
 
 // wxDirDlg class for getting a directory name from user
 #define wxUSE_PROGRESSDLG 1
 
 // wxDirDlg class for getting a directory name from user

-#define wxUSE_DIRDLG 1
+#define wxUSE_DIRDLG  1
+#define wxUSE_DIRDLGG 1

 
 #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
  *


@@ -375,5 +383,22 @@
     #define NO_TEXT_WINDOW_STREAM     1  // defined in textctrl.h for DLL builds
 #endif
 
     #define NO_TEXT_WINDOW_STREAM     1  // defined in textctrl.h for DLL builds
 #endif
 

+#define wxUSE_UNICODE      0
+#define wxUSE_UNICODE_MSLU 0
+
+#define wxUSE_DYNLIB_CLASS  1
+                                  // Compile in wxLibrary class for run-time
+                                  // 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_GENERIC_MDI_AS_NATIVE 1
+

 #endif
     // _WX_SETUP_H_
 #endif
     // _WX_SETUP_H_