undo the last change as it results in buildbot configuration error

[wxWidgets.git] / interface / wx / sysopt.h

diff --git a/interface/wx/sysopt.h b/interface/wx/sysopt.h
index d4143c8ffadc6cd9a4cbb9fa081fc5d6e1c10e5b..2b595766dc2389150a057659d5932dfe02a2975c 100644 (file)
--- a/interface/wx/sysopt.h
+++ b/interface/wx/sysopt.h
@@ -53,6 +53,12 @@
         appearance but not all fonts are available in this quality,
         e.g. the Terminal font in small sizes is not and this option may be
         used if wider fonts selection is more important than higher quality.
         appearance but not all fonts are available in this quality,
         e.g. the Terminal font in small sizes is not and this option may be
         used if wider fonts selection is more important than higher quality.

+    @flag{wince.dialog.real-ok-cancel}
+        The PocketPC guidelines recommend for Ok/Cancel dialogs to use an OK button
+        located inside the caption bar and implement Cancel functionality through
+        Undo outside the dialog.
+        wxDialog::CreateButtonSizer will follow the native behaviour on WinCE but
+        it can be overridden with real wxButtons by setting the option below to 1.

     @endFlagTable
 
 
     @endFlagTable
 
 


@@ -86,10 +92,10 @@
     @flag{window-default-variant}
         The default variant used by windows (cast to integer from the wxWindowVariant enum).
         Also known as wxWINDOW_DEFAULT_VARIANT.
     @flag{window-default-variant}
         The default variant used by windows (cast to integer from the wxWindowVariant enum).
         Also known as wxWINDOW_DEFAULT_VARIANT.

-    flag{mac.listctrl.always_use_generic}
+    @flag{mac.listctrl.always_use_generic}

         Tells wxListCtrl to use the generic control even when it is capable of
         using the native control instead. Also knwon as wxMAC_ALWAYS_USE_GENERIC_LISTCTRL.
         Tells wxListCtrl to use the generic control even when it is capable of
         using the native control instead. Also knwon as wxMAC_ALWAYS_USE_GENERIC_LISTCTRL.

-    flag{mac.textcontrol-use-spell-checker}
+    @flag{mac.textcontrol-use-spell-checker}

         This option only has effect for Mac OS X 10.4 and higher.
         If 1 activates the spell checking in wxTextCtrl.
     @endFlagTable
         This option only has effect for Mac OS X 10.4 and higher.
         If 1 activates the spell checking in wxTextCtrl.
     @endFlagTable


@@ -116,10 +122,9 @@
     The compile-time option to include or exclude this functionality is wxUSE_SYSTEM_OPTIONS.
 
     @library{wxbase}
     The compile-time option to include or exclude this functionality is wxUSE_SYSTEM_OPTIONS.
 
     @library{wxbase}

-    @category{misc}
+    @category{cfg}

 
 

-    @see wxSystemOptions::SetOption, wxSystemOptions::GetOptionInt,
-    wxSystemOptions::HasOption
+    @see wxSystemSettings

 */
 class wxSystemOptions : public wxObject
 {
 */
 class wxSystemOptions : public wxObject
 {