declare wxEntry() as taking char **Argv, not char *argv[]

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

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 5ed88ccc0a6313858af952a3abaad87d6e710929..5942f3926647244a54b8caac286da28ed5f617c0 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -377,6 +377,22 @@
 // wxSystemOptions class
 #define wxUSE_SYSTEM_OPTIONS 1
 
 // wxSystemOptions class
 #define wxUSE_SYSTEM_OPTIONS 1
 

+// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
+// or wxURL you need to set this to 1.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_PROTOCOL 1
+
+// The settings for the individual URL schemes
+#define wxUSE_PROTOCOL_FILE 1
+#define wxUSE_PROTOCOL_FTP 1
+#define wxUSE_PROTOCOL_HTTP 1
+
+// Define this to use wxURL class.
+#define wxUSE_URL 1
+

 // Support for regular expression matching via wxRegEx class: enable this to
 // use POSIX regular expressions in your code. You need to compile regex
 // library from src/regex to use it under Windows.
 // Support for regular expression matching via wxRegEx class: enable this to
 // use POSIX regular expressions in your code. You need to compile regex
 // library from src/regex to use it under Windows.


@@ -692,7 +708,7 @@
 #define wxUSE_HTML          1
 
 // OpenGL canvas
 #define wxUSE_HTML          1
 
 // OpenGL canvas

-#define wxUSE_GLCANVAS       1
+#define wxUSE_GLCANVAS       0

 
 // wxTreeLayout class
 #define wxUSE_TREELAYOUT     1
 
 // wxTreeLayout class
 #define wxUSE_TREELAYOUT     1


@@ -722,8 +738,8 @@
 //
 // Default is 1.
 //
 //
 // Default is 1.
 //

-// Recommended setting: 0 for Mac OS as drag and drop is not yet implemented
-#define wxUSE_DRAG_AND_DROP 0
+// Recommended setting: 1
+#define wxUSE_DRAG_AND_DROP 1

 
 // ----------------------------------------------------------------------------
 // miscellaneous settings
 
 // ----------------------------------------------------------------------------
 // miscellaneous settings


@@ -850,9 +866,15 @@
 // Set to 1 for PCX format support
 #define wxUSE_PCX           1
 
 // Set to 1 for PCX format support
 #define wxUSE_PCX           1
 

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

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

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

 // Set to 1 to compile in wxPalette class
 #define wxUSE_PALETTE       1
 
 // Set to 1 to compile in wxPalette class
 #define wxUSE_PALETTE       1
 


@@ -929,11 +951,11 @@
 #endif
 
 // Set this to 1 to enable support for the owner-drawn menu and listboxes. This
 #endif
 
 // Set this to 1 to enable support for the owner-drawn menu and listboxes. This

-// is required by wxUSE_CHECKLISTBOX.
+// is not required on mac by wxUSE_CHECKLISTBOX.

 //
 // Default is 1.
 //
 //
 // Default is 1.
 //

-// Recommended setting: 1, set to 0 for a small library size reduction
+// Recommended setting: O as not implemented on mac

 #define wxUSE_OWNER_DRAWN 0
 
 // ----------------------------------------------------------------------------
 #define wxUSE_OWNER_DRAWN 0
 
 // ----------------------------------------------------------------------------


@@ -995,19 +1017,6 @@
 #define wxUSE_DEBUG_NEW_ALWAYS          0
 #endif // wxUSE_MFC
 
 #define wxUSE_DEBUG_NEW_ALWAYS          0
 #endif // wxUSE_MFC
 

-// ODBC classes aren't Unicode-compatible yet
-#if wxUSE_UNICODE
-#undef wxUSE_ODBC
-#define wxUSE_ODBC 0
-#endif
-
-#if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)
-// Can't use OLE drag and drop in Windows 3.1 because we don't know how
-// to implement UUIDs
-// GnuWin32 doesn't have appropriate headers for e.g. IUnknown.
-#undef wxUSE_DRAG_AND_DROP
-#define wxUSE_DRAG_AND_DROP 0
-#endif

 
 // Only WIN32 supports wxStatusBar95
 #if !defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
 
 // Only WIN32 supports wxStatusBar95
 #if !defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR


@@ -1015,10 +1024,12 @@
 #define wxUSE_NATIVE_STATUSBAR 0
 #endif
 
 #define wxUSE_NATIVE_STATUSBAR 0
 #endif
 

+/* NOT TRUE ON MAC 

 #if !wxUSE_OWNER_DRAWN
 #undef wxUSE_CHECKLISTBOX
 #define wxUSE_CHECKLISTBOX 0
 #endif
 #if !wxUSE_OWNER_DRAWN
 #undef wxUSE_CHECKLISTBOX
 #define wxUSE_CHECKLISTBOX 0
 #endif

+*/

 
 // Salford C++ doesn't like some of the memory operator definitions
 #ifdef __SALFORDC__
 
 // Salford C++ doesn't like some of the memory operator definitions
 #ifdef __SALFORDC__