Window management and sizer layout corrections

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

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index aaae8c273dfd8ad53a1e419fadea2355c6efccc4..4efd8d7da7394b42fd5ec98c414c4c330a7deef2 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -26,18 +26,16 @@
 // General features
 // ----------------------------------------------------------------------------
 
 // General features
 // ----------------------------------------------------------------------------
 

-#define wxUSE_PCX              1 // Utilize PCX images
-
-#define wxUSE_PNM              1 // Utilize PNM images
-
-#define wxUSE_GIF              1 // Utilize GIF images
+#define wxUSE_FILESYSTEM       1 // better have this is you want to compile wxHTML

 
 #if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
 
 #if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )

-#define wxUSE_LONG_LONG        1
+#define wxUSE_LONGLONG        1

 #endif
 
 #define wxUSE_NET_API          1 // Utilize OS/2's UPM netapi's
 
 #endif
 
 #define wxUSE_NET_API          1 // Utilize OS/2's UPM netapi's
 

+#define wxUSE_DATETIME         1 // Utilize the date-time classes
+

 #define wxUSE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp
 
 #define wxUSE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp
 


@@ -60,51 +58,84 @@
 #define wxUSE_TIMEDATE    1
                                 // 0 for no wxTime/wxDate classes
 
 #define wxUSE_TIMEDATE    1
                                 // 0 for no wxTime/wxDate classes
 

+#define wxUSE_MENUS       1
+                                // 0 for no menus
+
+#define wxUSE_JOYSTICK    1
+                                // 0 for no joystick functions
+

 #define wxUSE_CLIPBOARD   1
                                 // 0 for no clipboard functions
 
 #define wxUSE_CLIPBOARD   1
                                 // 0 for no clipboard functions
 

+#define wxUSE_PLOT        1
+                                // 0 for no generic plot functions
+

 #define wxUSE_SPLINES     1
                                     // 0 for no splines
 
 #define wxUSE_DRAG_AND_DROP 1
                                 // 0 for no drag and drop
 
 #define wxUSE_SPLINES     1
                                     // 0 for no splines
 
 #define wxUSE_DRAG_AND_DROP 1
                                 // 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
+
+// Recommended setting: 1
+#define wxUSE_BUTTON       1    // wxButton
+#define wxUSE_BMPBUTTON    1    // wxBitmapButton
+#define wxUSE_CALENDARCTRL 1    // wxCalendarCtrl
+#define wxUSE_CHECKBOX     1    // wxCheckBox
+#define wxUSE_CHECKLISTBOX 1    // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
+#define wxUSE_CHOICE       1    // wxChoice
+#define wxUSE_COMBOBOX     1    // wxComboBox
+#define wxUSE_GAUGE        1    // wxGauge
+#define wxUSE_LISTBOX      1    // wxListBox
+#define wxUSE_LISTCTRL     1    // wxListCtrl
+#define wxUSE_RADIOBOX     1    // wxRadioBox
+#define wxUSE_RADIOBTN     1    // wxRadioButton
+#define wxUSE_SCROLLBAR    1    // wxScrollBar
+#define wxUSE_SLIDER       1    // wxSlider
+#define wxUSE_SPINBTN      1    // wxSpinButton
+#define wxUSE_SPINCTRL     1    // wxSpinCtrl
+#define wxUSE_STATBOX      1    // wxStaticBox
+#define wxUSE_STATLINE     1    // wxStaticLine
+#define wxUSE_STATTEXT     1    // wxStaticText
+#define wxUSE_STATBMP      1    // wxStaticBitmap
+#define wxUSE_TEXTCTRL     1    // wxTextCtrl
+#define wxUSE_TOGGLEBTN    1    // requires wxButton
+#define wxUSE_TREECTRL     1    // wxTreeCtrl
+#define wxUSE_CHOICEDLG    1
+#define wxUSE_COLOURDLG    1
+#define wxUSE_DATAOBJ      1
+#define wxUSE_FILEDLG      1
+#define wxUSE_FONTDLG      1
+#define wxUSE_FONTMAP      1
+#define wxUSE_GRID         1
+#define wxUSE_IMAGLIST     1
+#define wxUSE_LOGGUI       1
+#define wxUSE_LOGWINDOW    1
+#define wxUSE_LOG_DIALOG   1
+#define wxUSE_MIMETYPE     1
+#define wxUSE_MSGDLG       1
+#define wxUSE_NOTEBOOK     1
+#define wxUSE_SPLITTER     1
+#define wxUSE_STOPWATCH    1
+#define wxUSE_TAB_DIALOG   1
+#define wxUSE_WXHTML_HELP  1

 #define wxUSE_BUTTONBAR     1
                                     // Define 1 to use buttonbar classes (enhanced toolbar
                                     // for MS Windows)
 #define wxUSE_BUTTONBAR     1
                                     // Define 1 to use buttonbar classes (enhanced toolbar
                                     // for MS Windows)

-#define wxUSE_GAUGE         1
-                                    // Define 1 to use Microsoft's gauge (Windows)
-                                    // or Bull's gauge (Motif) library (both in contrib).
-#define wxUSE_COMBOBOX      1
-                                    // Define 1 to use COMBOXBOX control (Windows)
-                                    // or FWW's ComboBox widget (Motif).
-#define wxUSE_CHOICE      1
-                                    // Define 1 to use CHOICE

 
 #define wxUSE_RADIOBUTTON   1
                                     // Define 1 to use radio button control
 
 #define wxUSE_RADIOBUTTON   1
                                     // Define 1 to use radio button control

-#define wxUSE_RADIOBTN   1
-                                    // Unfortunately someone introduced this one, too

 
 #define wxUSE_SCROLLBAR   1
                                     // Define 1 to compile contributed wxScrollBar class
 
 
 #define wxUSE_SCROLLBAR   1
                                     // Define 1 to compile contributed wxScrollBar class
 

-#define wxUSE_CHECKBOX 1
-                                    // Define 1 to compile checkbox
-
-#define wxUSE_LISTBOX 1
-                                    // Define 1 to compile listbox
-
-#define wxUSE_SPINBTN 1
-                                    // Define 1 to compile spin button
-
-// use wxStaticLine class (separator line in the dialog)?
-#define wxUSE_STATLINE 1
-
-#define wxUSE_CHECKLISTBOX 1
-                                    // Define 1 to compile check listbox

 #define wxUSE_CARET       1
                                     // Define 1 to use wxCaret class
 #define wxUSE_CARET       1
                                     // Define 1 to use wxCaret class

+#define wxUSE_TREECTRL    1
+                                    // Define 1 to use wxTree* classes

 #define wxUSE_XPM_IN_OS2  1
                                     // Define 1 to support the XPM package in wxBitmap.
 #define wxUSE_IMAGE_LOADING_IN_OS2        1
 #define wxUSE_XPM_IN_OS2  1
                                     // Define 1 to support the XPM package in wxBitmap.
 #define wxUSE_IMAGE_LOADING_IN_OS2        1


@@ -144,7 +175,11 @@
                                   // since you may well need to output
                                   // an error log in a production
                                   // version (or non-debugging beta)
                                   // since you may well need to output
                                   // an error log in a production
                                   // version (or non-debugging beta)

+#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+#else

 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1

+#endif

                                   // In debug mode, cause new and delete to be redefined globally.
                                   // If this causes problems (e.g. link errors), set this to 0.
 
                                   // In debug mode, cause new and delete to be redefined globally.
                                   // If this causes problems (e.g. link errors), set this to 0.
 


@@ -159,16 +194,26 @@
                                   // Set this to 0 if your compiler can't cope
                                   // with omission of prototype parameters.
 
                                   // Set this to 0 if your compiler can't cope
                                   // with omission of prototype parameters.
 

-#define wxUSE_ODBC                0
+#define wxUSE_ODBC                1

                                   // Define 1 to use ODBC classes
 
                                   // Define 1 to use ODBC classes
 

-#define wxODBC_FWD_ONLY_CURSORS   1
-                                  // Some databases/ODBC drivers only allow forward scrolling cursors.
-                                  // Unless you specifically want to use backward scrolling
-                                  // cursors, and you know that all of the databases/ODBC drivers
-                                  // that you will use these odbc classes with allow backward
-                                  // scrolling cursors, this setting should remain set to 1
-                                  // for maximum database/driver compatibilty
+#define wxODBC_FWD_ONLY_CURSORS        1
+                                  // For backward compatibility reasons, this parameter now only
+                                  // controls the default scrolling method used by cursors.  This
+                                  // default behavior can be overriden by setting the second param
+                                  // of wxDB::GetDbConnection() to indicate whether the connection
+                                  // (and any wxTable()s that use the connection) should support
+                                  // forward only scrolling of cursors, or both forward and backward
+                                  // Support for backward scrolling cursors is dependent on the
+                                  // data source as well as the ODBC driver being used.
+
+#define wxODBC_BACKWARD_COMPATABILITY 0
+                                  // Default is 0.  Set to 1 to use the deprecated classes, enum
+                                  // types, function, member variables.  With a setting of 1, full
+                                  // backward compatability with the 2.0.x release is possible.
+                                  // It is STRONGLY recommended that this be set to 0, as
+                                  // future development will be done only on the non-deprecated
+                                  // functions/classes/member variables/etc.

 
 #define wxUSE_IOSTREAMH     1
                                   // VC++ 4.2 and above allows <iostream> and <iostream.h>
 
 #define wxUSE_IOSTREAMH     1
                                   // VC++ 4.2 and above allows <iostream> and <iostream.h>


@@ -182,25 +227,37 @@
                                   // Use standard C++ streams if 1. If 0, use wxWin
                                   // streams implementation.
 
                                   // Use standard C++ streams if 1. If 0, use wxWin
                                   // streams implementation.
 

-#define wxUSE_WXCONFIG      1
-                                  // if enabled, compiles built-in OS independent wxConfig
-                                  // class and it's file (any platform) and registry (Win)
-                                  // based implementations

 #define wxUSE_THREADS       1
                                   // support for multithreaded applications: if
                                   // 1, compile in thread classes (thread.h)
                                   // and make the library thread safe
 #define wxUSE_ZLIB          1
                                   // Use zlib for compression in streams and PNG code
 #define wxUSE_THREADS       1
                                   // support for multithreaded applications: if
                                   // 1, compile in thread classes (thread.h)
                                   // and make the library thread safe
 #define wxUSE_ZLIB          1
                                   // Use zlib for compression in streams and PNG code

+#define wxUSE_IMAGE         1
+                                  // Set to 1 for wxImage support (recommended).

 #define wxUSE_LIBPNG        1
 #define wxUSE_LIBPNG        1

-                                  // Use PNG bitmap code
+                                  // Set to 1 for PNG format support

 #define wxUSE_LIBJPEG       1
 #define wxUSE_LIBJPEG       1

-                                  // Use JPEG bitmap code
+                                  // Set to 1 for JPEG format support
+#define wxUSE_LIBTIFF       1
+                                  // Set to 1 for TIFF format support
+#define wxUSE_GIF           1
+                                  // Set to 1 for GIF format support
+#define wxUSE_PNM           1
+                                  // 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_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


@@ -218,6 +275,7 @@
 #define wxUSE_ZIPSTREAM     1
                                   // input stream for reading from zip archives
 
 #define wxUSE_ZIPSTREAM     1
                                   // input stream for reading from zip archives
 

+#define wxUSE_TIMER         1     // use the timer class

 /*
  * Finer detail
  *
 /*
  * Finer detail
  *


@@ -231,6 +289,11 @@
 // use wxFile class - required by i18n code, wxConfig and others - recommended
 #define wxUSE_FILE                1
 
 // use wxFile class - required by i18n code, wxConfig and others - recommended
 #define wxUSE_FILE                1
 

+#define wxUSE_FFILE         1
+
+// use wxTextBuffer class: required by wxTextFile
+#define wxUSE_TEXTBUFFER    1
+

 // use wxTextFile class: requires wxFile, required by wxConfig
 #define wxUSE_TEXTFILE            1
 
 // use wxTextFile class: requires wxFile, required by wxConfig
 #define wxUSE_TEXTFILE            1
 


@@ -252,6 +315,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


@@ -266,11 +332,15 @@
 #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
  *


@@ -290,5 +360,42 @@
 #define wxUSE_GENERIC_DIALOGS_IN_OS2 0
                                 // Define 1 to use generic dialogs in Windows, even though
                                 // they duplicate native common dialog (e.g. wxColourDialog)
 #define wxUSE_GENERIC_DIALOGS_IN_OS2 0
                                 // Define 1 to use generic dialogs in Windows, even though
                                 // they duplicate native common dialog (e.g. wxColourDialog)

+
+#define wxUSE_SNGLINST_CHECKER  1
+
+#define wxUSE_GEOMETRY  1
+                                // needed for wxCanvas
+#define wxUSE_MENUS               1
+
+#define wxUSE_WAVE                1
+
+#define wxUSE_REGEX               1
+
+#define wxUSE_FINDREPLDLG         1 // Find replace dialog
+
+#define wxUSE_PALETTE             1
+
+#define wxUSE_CMDLINE_PARSER      1
+
+#define wxUSE_SPLASH              1
+
+#if (!(defined(WXUSINGDLL) || defined(WXMAKINGDLL)))
+    #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_PROTOCOL          1
+#define wxUSE_URL               1
+#define wxUSE_PROTOCOL_HTTP     1
+#define wxUSE_PROTOCOL_FTP      1
+#define wxUSE_PROTOCOL_FILE     1
+

 #endif
     // _WX_SETUP_H_
 #endif
     // _WX_SETUP_H_