Merge in from trunk r67662 to r64801

[wxWidgets.git] / docs / doxygen / overviews / dialog.h

diff --git a/docs/doxygen/overviews/dialog.h b/docs/doxygen/overviews/dialog.h
index e140628d37523b47eaefe96d825411f771477fea..a3850f7916d178de7304857a0545bee5c007ef56 100644 (file)
--- a/docs/doxygen/overviews/dialog.h
+++ b/docs/doxygen/overviews/dialog.h
@@ -3,7 +3,7 @@
 // Purpose:     topic overview
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     topic overview
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -22,7 +22,7 @@ be used for placing controls, with the following exceptions:
     until the dialog box is dismissed.
 
 For a set of dialog convenience functions, including file selection, see
     until the dialog box is dismissed.
 
 For a set of dialog convenience functions, including file selection, see

-@ref page_func_cat_dialog.
+@ref group_funcmacro_dialog.

 
 See also wxTopLevelWindow and wxWindow for inherited
 member functions. Validation of data in controls is covered in @ref overview_validator.
 
 See also wxTopLevelWindow and wxWindow for inherited
 member functions. Validation of data in controls is covered in @ref overview_validator.


@@ -67,7 +67,7 @@ within wxDialog::Show or wxDialog::ShowModal:
 @li If that search failed too, wxWidgets finds 'loose' standard buttons (in any kind of sizer)
     and adds them to a wxStdDialogButtonSizer.
     If no standard buttons were found, the whole dialog content will scroll.
 @li If that search failed too, wxWidgets finds 'loose' standard buttons (in any kind of sizer)
     and adds them to a wxStdDialogButtonSizer.
     If no standard buttons were found, the whole dialog content will scroll.

-@li All the children apart from standard buttons are reparented onto a new wxScrolledWindow
+@li All the children apart from standard buttons are reparented onto a new ::wxScrolledWindow

     object, using the old top-level sizer for the scrolled window and creating a new top-level
     sizer to lay out the scrolled window and standard button sizer.
 
     object, using the old top-level sizer for the scrolled window and creating a new top-level
     sizer to lay out the scrolled window and standard button sizer.