corrected wxICON for Mac OS (Classic and X)

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index c7af59835a7a7449171a152ba49b34a23f22f982..6b0a7c489dfc93d041c6d22fbef26cf98b962482 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -65,7 +65,7 @@
 #undef __WXGTK127__
 
 /* Define this if your version of GTK+ is greater than 1.3 */
 #undef __WXGTK127__
 
 /* Define this if your version of GTK+ is greater than 1.3 */

-#undef __WXGTK13__
+#undef __WXGTK20__

 
 /*
  * Define to 1 for Unix[-like] system
 
 /*
  * Define to 1 for Unix[-like] system


@@ -143,6 +143,10 @@
 #define wxUSE_ODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0
 #define wxUSE_ODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0

+/*
+ * Use freetype
+ */
+#define wxUSE_FREETYPE 0

 /*
  * Use Threads
  */
 /*
  * Use Threads
  */


@@ -175,6 +179,11 @@
  */
 #define wxUSE_ON_FATAL_EXCEPTION 0
 
  */
 #define wxUSE_ON_FATAL_EXCEPTION 0
 

+/*
+ * Use wxSingleInstanceChecker class
+ */
+#define wxUSE_SNGLINST_CHECKER 0
+

 /*
  * Use constraints mechanism
  */
 /*
  * Use constraints mechanism
  */


@@ -185,11 +194,51 @@
  */
 #define wxUSE_VALIDATORS 0
 
  */
 #define wxUSE_VALIDATORS 0
 

+/*
+ * Use wxControl
+ */
+#define wxUSE_CONTROLS 0
+
+/*
+   Use wxPopupWindow (useful in wxUniv only for now)
+*/
+#define wxUSE_POPUPWIN 0
+

 /*
  * Use accelerators
  */
 #define wxUSE_ACCEL 0
 
 /*
  * Use accelerators
  */
 #define wxUSE_ACCEL 0
 

+/*
+ * Use wxCalendarCtrl
+ */
+#define wxUSE_CALENDARCTRL 0
+
+/*
+ * Use wxFileDialog
+ */
+#define wxUSE_FILEDLG 0
+
+/*
+ * Use wxFontDialog
+ */
+#define wxUSE_FONTDLG 0
+
+/*
+ * Use wxMimeTypesManager and related classes
+ */
+#define wxUSE_MIMETYPE 0
+
+/*
+ * Use wxMessageDialog (and wxMessageBox)
+ */
+#define wxUSE_MSGDLG 0
+
+/*
+ * Use wxNumberEntryDialog
+ */
+#define wxUSE_NUMBERDLG 0
+

 /*
  * Use wxTextEntryDialog
  */
 /*
  * Use wxTextEntryDialog
  */


@@ -205,16 +254,45 @@
  */
 #define wxUSE_PROGRESSDLG 0
 
  */
 #define wxUSE_PROGRESSDLG 0
 

+/*
+ * Use chooser dialog
+ */
+#define wxUSE_CHOICEDLG 0
+
+/*
+ * Use colour picker dialog
+ */
+#define wxUSE_COLOURDLG 0
+

 /*
  * Use directory chooser dialog
  */
 #define wxUSE_DIRDLG 0
 
 /*
  * Use directory chooser dialog
  */
 #define wxUSE_DIRDLG 0
 

+/*
+ * Use property sheet classes
+ */
+#define wxUSE_PROPSHEET 0
+
+/*
+ * Use wxWizard
+ */
+#define wxUSE_WIZARDDLG 0
+
+/*
+ * Use splash screen
+ */
+#define wxUSE_SPLASH 0
+

 /*
  * Joystick support (Linux/GTK only)
  */
 #define wxUSE_JOYSTICK 0
 
 /*
  * Joystick support (Linux/GTK only)
  */
 #define wxUSE_JOYSTICK 0
 

+/*
+ * Use this control
+ */
+#define wxUSE_BUTTON 0

 /*
  * Use this control
  */
 /*
  * Use this control
  */


@@ -265,13 +343,13 @@
  */
 #define wxUSE_LISTCTRL 0
 /*
  */
 #define wxUSE_LISTCTRL 0
 /*

- * Use this control
+ * Use wxMenuBar, wxMenuItem and wxMenu

  */
  */

-#define wxUSE_NOTEBOOK 0
+#define wxUSE_MENUS 0

 /*
 /*

- * Use wxPlot class
+ * Use this control

  */
  */

-#define wxUSE_PLOT 0
+#define wxUSE_NOTEBOOK 0

 /*
  * Use this control
  */
 /*
  * Use this control
  */


@@ -320,6 +398,15 @@
  * Use this control
  */
 #define wxUSE_STATUSBAR 0
  * Use this control
  */
 #define wxUSE_STATUSBAR 0

+#define wxUSE_STATTEXT 0
+/*
+ * Use this control
+ */
+#define wxUSE_STATUSBAR 0
+/*
+ * Use this control
+ */
+#define wxUSE_TOGGLEBTN 0

 /*
  * Use Tab dialog class - obsolete, use wxNotebook instead
  */
 /*
  * Use Tab dialog class - obsolete, use wxNotebook instead
  */


@@ -327,6 +414,11 @@
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
 
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
 

+/*
+ * Use wxTextCtrl
+ */
+#define wxUSE_TEXTCTRL 0
+

 /*
  * Use wxToollBar
  */
 /*
  * Use wxToollBar
  */


@@ -344,7 +436,7 @@
 #define wxUSE_TOOLBAR_SIMPLE 0
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
 #define wxUSE_TOOLBAR_SIMPLE 0
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)

-#define wxUSE_OWNER_DRAWN 1 
+#define wxUSE_OWNER_DRAWN 1

   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif


@@ -360,18 +452,48 @@
  */
 #define wxUSE_LONGLONG 0
 
  */
 #define wxUSE_LONGLONG 0
 

+/*
+ * Use geometry classes
+ */
+#define wxUSE_GEOMETRY 0
+
+/*
+ * Use wxCmdLineParser class
+ */
+#define wxUSE_CMDLINE_PARSER 0
+/*
+ * Use wxDateTime
+ */
+#define wxUSE_DATETIME 0

 /*
  * Use wxFile class
  */
 #define wxUSE_FILE 0
 /*
  * Use wxFile class
  */
 #define wxUSE_FILE 0

+/*
+ * Use wxFFile class
+ */
+#define wxUSE_FFILE 0

 /*
  * Use wxTextFile class
  */
 #define wxUSE_TEXTFILE 0
 /*
  * Use wxTextFile class
  */
 #define wxUSE_TEXTFILE 0

+

 /*
  * Use log classes and logging functions
  */
 #define wxUSE_LOG 0
 /*
  * Use log classes and logging functions
  */
 #define wxUSE_LOG 0

+/*
+ * Use log window
+ */
+#define wxUSE_LOGWINDOW 0
+/*
+ * Use standard GUI logger
+ */
+#define wxUSE_LOGGUI 0
+/*
+ * Use wxStopWatch
+ */
+#define wxUSE_STOPWATCH 0

 /*
  * Use time and date classes
  */
 /*
  * Use time and date classes
  */


@@ -384,6 +506,10 @@
  * Use config system
  */
 #define wxUSE_CONFIG 0
  * Use config system
  */
 #define wxUSE_CONFIG 0

+/*
+ * Use font mapping/conversion classes
+ */
+#define wxUSE_FONTMAP 0

 /*
  * Use intl system
  */
 /*
  * Use intl system
  */


@@ -414,6 +540,11 @@
  */
 #define wxUSE_DYNLIB_CLASS 0
 
  */
 #define wxUSE_DYNLIB_CLASS 0
 

+/*
+ * Use wxTimer
+ */
+#define wxUSE_TIMER 0
+

 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
  * Use consistent PostScript fonts for AFM and printing (!)
 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
  * Use consistent PostScript fonts for AFM and printing (!)


@@ -467,6 +598,10 @@
  * Use clipboard
  */
 #define wxUSE_CLIPBOARD 0
  * Use clipboard
  */
 #define wxUSE_CLIPBOARD 0

+/*
+ * Use wxDataObject
+ */
+#define wxUSE_DATAOBJ 0

 /*
  * Use tooltips
  */
 /*
  * Use tooltips
  */


@@ -567,6 +702,7 @@
  * Support for metafiles
  */
 #define wxUSE_METAFILE 0
  * Support for metafiles
  */
 #define wxUSE_METAFILE 0

+#define wxUSE_ENH_METAFILE 0

 
 /*
  * wxMiniFrame
 
 /*
  * wxMiniFrame


@@ -589,13 +725,18 @@
  * A class that shows info window when app is busy
  * (works exactly like wxBusyCursor)
  */
  * A class that shows info window when app is busy
  * (works exactly like wxBusyCursor)
  */

-#define wxUSE_BUSYINFO 0 
+#define wxUSE_BUSYINFO 0

 
 /*
  * Zip stream for accessing files stored inside .zip archives
  */
 #define wxUSE_ZIPSTREAM 0
 
 
 /*
  * Zip stream for accessing files stored inside .zip archives
  */
 #define wxUSE_ZIPSTREAM 0
 

+/*
+ * wxImage support
+ */
+#define wxUSE_IMAGE 0
+

 /*
  * GIF image format support
  */
 /*
  * GIF image format support
  */


@@ -610,7 +751,12 @@
  * PNM image format support
  */
 #define wxUSE_PNM 0
  * PNM image format support
  */
 #define wxUSE_PNM 0

- 
+
+/*
+ * XPM image format support
+ */
+#define wxUSE_XPM 0
+

 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.


@@ -643,6 +789,9 @@
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 

+/* iconv()'s 2nd argument is char ** and not const char ** */
+#undef WX_ICONV_TAKES_CHAR
+

 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 


@@ -664,6 +813,12 @@
 /* Define if you have sched_yield */
 #undef HAVE_SCHED_YIELD
 
 /* Define if you have sched_yield */
 #undef HAVE_SCHED_YIELD
 

+/* Define if you have pthread_mutexattr_t and functions to work with it */
+#undef HAVE_PTHREAD_MUTEXATTR_T
+
+/* Define if you have PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP */
+#undef HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+

 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 


@@ -703,6 +858,9 @@
 /* The number of bytes in a char.  */
 #undef SIZEOF_CHAR
 
 /* The number of bytes in a char.  */
 #undef SIZEOF_CHAR
 

+/* The number of bytes in a wchar_t.  */
+#undef SIZEOF_WCHAR_T
+

 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 


@@ -718,12 +876,24 @@
 /* The number of bytes in a short.  */
 #undef SIZEOF_SHORT
 
 /* The number of bytes in a short.  */
 #undef SIZEOF_SHORT
 

+/* Define if size_t on your machine is the same type as unsigned int. */
+#undef wxSIZE_T_IS_UINT
+
+/* Define if size_t on your machine is the same type as unsigned long. */
+#undef wxSIZE_T_IS_ULONG
+

 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 
 /* Define if you have the dlerror function.  */
 #undef HAVE_DLERROR
 
 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 
 /* Define if you have the dlerror function.  */
 #undef HAVE_DLERROR
 

+/* Define if you have Posix fnctl() function. */
+#undef HAVE_FCNTL
+
+/* Define if you have BSD flock() function. */
+#undef HAVE_FLOCK
+

 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 
 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 


@@ -736,6 +906,12 @@
 /* Define if you have the nanosleep function.  */
 #undef HAVE_NANOSLEEP
 
 /* Define if you have the nanosleep function.  */
 #undef HAVE_NANOSLEEP
 

+/* Define if you have the putenv function.  */
+#undef HAVE_PUTENV
+
+/* Define if you have the setenv function.  */
+#undef HAVE_SETENV
+

 /* Define if you have the shl_load function.  */
 #undef HAVE_SHL_LOAD
 
 /* Define if you have the shl_load function.  */
 #undef HAVE_SHL_LOAD
 


@@ -775,13 +951,28 @@
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 

+/* Define if you have the <fcntl.h> header file.  */
+#undef HAVE_FCNTL_H
+

 /* Define if you have the <wchar.h> header file.  */
 #undef HAVE_WCHAR_H
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
 /* Define if you have the <wchar.h> header file.  */
 #undef HAVE_WCHAR_H
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 

+/* Define if you have the <iconv.h> header file.  */
+#undef HAVE_ICONV_H
+
+/* Test for GLIBC 2.2 iconv() */
+#undef WX_ICONV_TAKES_CHAR
+
+/* Define if you have the <langinfo.h> header file.  */
+#undef HAVE_LANGINFO_H
+

 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 

+/* now check the settings self consistency */
+#include "wx/chkconf.h"
+

 #endif /* __WX_SETUP_H__ */
 #endif /* __WX_SETUP_H__ */