Smartphone fix due to separated implementation of wxFileDialog.

[wxWidgets.git] / include / wx / msw / wince / setup.h

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index a836f82a02041fb8e08b4f055467b948f6a9b416..747deedc126919a32934eb16e39c03fb35c44651 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -67,7 +67,7 @@
 // Generic comment about debugging settings: they are very useful if you don't
 // use any other memory leak detection tools such as Purify/BoundsChecker, but
 // are probably redundant otherwise. Also, Visual C++ CRT has the same features
 // Generic comment about debugging settings: they are very useful if you don't
 // use any other memory leak detection tools such as Purify/BoundsChecker, but
 // are probably redundant otherwise. Also, Visual C++ CRT has the same features

-// as wxWindows memory debugging subsystem built in since version 5.0 and you
+// as wxWidgets memory debugging subsystem built in since version 5.0 and you

 // may prefer to use it instead of built in memory debugging code because it is
 // faster and more fool proof.
 //
 // may prefer to use it instead of built in memory debugging code because it is
 // faster and more fool proof.
 //


@@ -136,7 +136,7 @@
 // Unicode support
 // ----------------------------------------------------------------------------
 
 // Unicode support
 // ----------------------------------------------------------------------------
 

-// Set wxUSE_UNICODE to 1 to compile wxWindows in Unicode mode: wxChar will be
+// Set wxUSE_UNICODE to 1 to compile wxWidgets in Unicode mode: wxChar will be

 // defined as wchar_t, wxString will use Unicode internally. If you set this
 // to 1, you must use wxT() macro for all literal strings in the program.
 //
 // defined as wchar_t, wxString will use Unicode internally. If you set this
 // to 1, you must use wxT() macro for all literal strings in the program.
 //


@@ -151,7 +151,7 @@
     #define wxUSE_UNICODE 1
 #endif
 
     #define wxUSE_UNICODE 1
 #endif
 

-// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
+// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode

 // and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
 // This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
 // http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note that
 // and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
 // This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
 // http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note that


@@ -248,7 +248,7 @@
 // Recommended setting: 0 unless you do plan to develop MT applications
 #define wxUSE_THREADS 1
 
 // Recommended setting: 0 unless you do plan to develop MT applications
 #define wxUSE_THREADS 1
 

-// If enabled (1), compiles wxWindows streams classes
+// If enabled (1), compiles wxWidgets streams classes

 #define wxUSE_STREAMS       1
 
 // Use standard C++ streams if 1. If 0, use wxWin streams implementation.
 #define wxUSE_STREAMS       1
 
 // Use standard C++ streams if 1. If 0, use wxWin streams implementation.


@@ -399,7 +399,7 @@
 
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different

-// from wxWindows one.
+// from wxWidgets one.

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


@@ -483,7 +483,7 @@
 // Recommended setting: 1 (may be set to 0)
 #define wxUSE_TIPWINDOW    1
 
 // Recommended setting: 1 (may be set to 0)
 #define wxUSE_TIPWINDOW    1
 

-// Each of the settings below corresponds to one wxWindows control. They are
+// Each of the settings below corresponds to one wxWidgets control. They are

 // all switched on by default but may be disabled if you are sure that your
 // program (including any standard dialogs it can show!) doesn't need them and
 // if you desperately want to save some space. If you use any of these you must
 // all switched on by default but may be disabled if you are sure that your
 // program (including any standard dialogs it can show!) doesn't need them and
 // if you desperately want to save some space. If you use any of these you must


@@ -522,7 +522,11 @@
 // Default is 1
 //
 // Recommended setting: 1
 // Default is 1
 //
 // Recommended setting: 1

+#ifdef __SMARTPHONE__
+#define wxUSE_STATUSBAR    0
+#else

 #define wxUSE_STATUSBAR    1
 #define wxUSE_STATUSBAR    1

+#endif

 
 // Two status bar implementations are available under Win32: the generic one
 // or the wrapper around native control. For native look and feel the native
 
 // Two status bar implementations are available under Win32: the generic one
 // or the wrapper around native control. For native look and feel the native


@@ -543,9 +547,6 @@
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1
 
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1
 

-// this setting is obsolete, value is ignored
-#define wxUSE_BUTTONBAR    1
-

 // wxNotebook is a control with several "tabs" located on one of its sides. It
 // may be used ot logically organise the data presented to the user instead of
 // putting everything in one huge dialog. It replaces wxTabControl and related
 // wxNotebook is a control with several "tabs" located on one of its sides. It
 // may be used ot logically organise the data presented to the user instead of
 // putting everything in one huge dialog. It replaces wxTabControl and related


@@ -778,6 +779,15 @@
 // Set to 0 to disable document/view architecture
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
 
 // Set to 0 to disable document/view architecture
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
 

+// Set to 0 to disable MDI support.
+//
+// Requires wxUSE_NOTEBOOK under platforms other than MSW.
+//
+// Default is 1.
+//
+// Recommended setting: 1, can be safely set to 0.
+#define wxUSE_MDI 0
+

 // Set to 0 to disable MDI document/view architecture
 #define wxUSE_MDI_ARCHITECTURE    0
 
 // Set to 0 to disable MDI document/view architecture
 #define wxUSE_MDI_ARCHITECTURE    0
 


@@ -984,7 +994,7 @@
 // Windows-only settings
 // ----------------------------------------------------------------------------
 
 // Windows-only settings
 // ----------------------------------------------------------------------------
 

-// Set this to 1 if you want to use wxWindows and MFC in the same program. This
+// Set this to 1 if you want to use wxWidgets and MFC in the same program. This

 // will override some other settings (see below)
 //
 // Default is 0.
 // will override some other settings (see below)
 //
 // Default is 0.


@@ -1061,27 +1071,6 @@
 // (notably, wxNotebook pages)
 #define wxUSE_UXTHEME_AUTO      0
 
 // (notably, wxNotebook pages)
 #define wxUSE_UXTHEME_AUTO      0
 

-// Set to 1 if you want to maintain a PocketPC-style UI on
-// Windows CE .NET. If 0, wxWindows will use a commandbar
-// for the menubar, and a normal separate toolbar as per the
-// desktop implementation. If 1, wxWindows will combine
-// the toolbar and menubar as per the PocketPC implementation.
-//
-// Note that at present, the dynamic loading of PocketPC
-// shell functions on WinCE .NET is not yet done, and a
-// simple commandbar implementation is used instead of the
-// PocketPC one. The intention is to use the PocketPC style
-// when available (when wxUSE_POCKETPC_UI is 1).
-//
-// So if you're using WinCE .NET, and wxUSE_POCKETPC_UI is 0,
-// you will be able to create separate toolbars and menubars,
-// but _not_ the combined toolbar/menubar.
-
-// NOW OBSOLETE: we test WIN32_PLATFORM_PSPC and WIN32_PLATFORM_WFSP
-// instead
-
-// #define wxUSE_POCKETPC_UI       1
-

 // ----------------------------------------------------------------------------
 // obsolete settings
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // obsolete settings
 // ----------------------------------------------------------------------------