document wxFSVolume (fixes #3977)

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

diff --git a/interface/wx/dialog.h b/interface/wx/dialog.h
index 3052b2e0e57fdc871638ecc7bde7ee3a5c9c8ff5..702595a34c20a131842e722118664013e052a17f 100644 (file)
--- a/interface/wx/dialog.h
+++ b/interface/wx/dialog.h
@@ -18,7 +18,6 @@ enum wxDialogLayoutAdaptationMode
 
 /**
     @class wxDialog
 
 /**
     @class wxDialog

-    @wxheader{dialog.h}

 
     A dialog box is a window with a title bar and sometimes a system menu,
     which can be moved around the screen. It can contain controls and other
 
     A dialog box is a window with a title bar and sometimes a system menu,
     which can be moved around the screen. It can contain controls and other


@@ -168,13 +167,13 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,

-             const wxString& name = "dialogBox");
+             const wxString& name = wxDialogNameStr);

 
     /**
         Destructor. Deletes any child windows before deleting the physical
         window.
     */
 
     /**
         Destructor. Deletes any child windows before deleting the physical
         window.
     */

-    ~wxDialog();
+    virtual ~wxDialog();

 
     /**
         Adds an identifier to be regarded as a main button for the
 
     /**
         Adds an identifier to be regarded as a main button for the


@@ -191,7 +190,7 @@ public:
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */

-    bool CanDoLayoutAdapation();
+    virtual bool CanDoLayoutAdaptation();

 
     /**
         Centres the dialog box on the display.
 
     /**
         Centres the dialog box on the display.


@@ -210,7 +209,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_DIALOG_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_DIALOG_STYLE,

-                const wxString& name = "dialogBox");
+                const wxString& name = wxDialogNameStr);

 
     /**
         Creates a sizer with standard buttons. @a flags is a bit list of the
 
     /**
         Creates a sizer with standard buttons. @a flags is a bit list of the


@@ -252,7 +251,7 @@ public:
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */

-    bool DoLayoutAdapation();
+    virtual bool DoLayoutAdaptation();

 
     /**
         This function is called when the titlebar OK button is pressed
 
     /**
         This function is called when the titlebar OK button is pressed


@@ -260,6 +259,8 @@ public:
         GetAffirmativeId() is sent by default. You can override this function.
         If the function returns @false, wxWidgets will call Close() for the
         dialog.
         GetAffirmativeId() is sent by default. You can override this function.
         If the function returns @false, wxWidgets will call Close() for the
         dialog.

+
+        @onlyfor{wxmsw}

     */
     virtual bool DoOK();
 
     */
     virtual bool DoOK();
 


@@ -280,7 +281,7 @@ public:
 
         @see ShowModal(), GetReturnCode(), SetReturnCode()
     */
 
         @see ShowModal(), GetReturnCode(), SetReturnCode()
     */

-    void EndModal(int retCode);
+    virtual void EndModal(int retCode);

 
     /**
         Gets the identifier of the button which works like standard OK button
 
     /**
         Gets the identifier of the button which works like standard OK button


@@ -297,7 +298,7 @@ public:
         @ref overview_dialog "layout adaptation code" to know that only the
         pages need to be made scrollable.
     */
         @ref overview_dialog "layout adaptation code" to know that only the
         pages need to be made scrollable.
     */

-    wxWindow* GetContentWindow() const;
+    virtual wxWindow* GetContentWindow() const;

 
     /**
         Gets the identifier of the button to map presses of @c ESC button to.
 
     /**
         Gets the identifier of the button to map presses of @c ESC button to.


@@ -322,7 +323,7 @@ public:
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */

-    int GetLayoutAdaptationLevel();
+    int GetLayoutAdaptationLevel() const;

 
     /**
         Gets the adaptation mode, overriding the global adaptation flag.
 
     /**
         Gets the adaptation mode, overriding the global adaptation flag.


@@ -344,7 +345,7 @@ public:
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */

-    wxArrayInt GetMainButtonIds();
+    wxArrayInt& GetMainButtonIds();

 
     /**
         Gets the return code for this window.
 
     /**
         Gets the return code for this window.


@@ -354,7 +355,7 @@ public:
 
         @see SetReturnCode(), ShowModal(), EndModal()
     */
 
         @see SetReturnCode(), ShowModal(), EndModal()
     */

-    int GetReturnCode();
+    int GetReturnCode() const;

 
     /**
         On PocketPC, a dialog is automatically provided with an empty toolbar.
 
     /**
         On PocketPC, a dialog is automatically provided with an empty toolbar.


@@ -363,6 +364,8 @@ public:
         supported.
 
         This function is not available on any other platform.
         supported.
 
         This function is not available on any other platform.

+
+        @onlyfor{wxmsw}

     */
     wxToolBar* GetToolBar() const;
 
     */
     wxToolBar* GetToolBar() const;
 


@@ -379,7 +382,7 @@ public:
                  Iconize(@false) will bring the window to the front, as does
                  Show(@true).
     */
                  Iconize(@false) will bring the window to the front, as does
                  Show(@true).
     */

-    void Iconize(bool iconize);
+    virtual void Iconize(bool iconize = true);

 
     /**
         Returns @true if the dialog box is iconized. Windows only.
 
     /**
         Returns @true if the dialog box is iconized. Windows only.


@@ -387,7 +390,7 @@ public:
         @remarks Always returns @false under Windows since dialogs cannot be
                  iconized.
     */
         @remarks Always returns @false under Windows since dialogs cannot be
                  iconized.
     */

-    bool IsIconized() const;
+    virtual bool IsIconized() const;

 
     /**
         A static function returning @true if layout adaptation is enabled for
 
     /**
         A static function returning @true if layout adaptation is enabled for


@@ -401,14 +404,16 @@ public:
         Returns @true if @a id is in the array of identifiers to be regarded as
         the main buttons for the non-scrolling area of a dialog.
 
         Returns @true if @a id is in the array of identifiers to be regarded as
         the main buttons for the non-scrolling area of a dialog.
 

+        @onlyfor{wxmsw}
+

         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */

-    bool IsMainButton(wxWindowID& id) const;
+    bool IsMainButtonId(wxWindowID id) const;

 
     /**
         Returns @true if the dialog box is modal, @false otherwise.
     */
 
     /**
         Returns @true if the dialog box is modal, @false otherwise.
     */

-    bool IsModal() const;
+    virtual bool IsModal() const;

 
     /**
         The default handler for wxEVT_SYS_COLOUR_CHANGED.
 
     /**
         The default handler for wxEVT_SYS_COLOUR_CHANGED.


@@ -550,7 +555,7 @@ public:
             otherwise the box is hidden. If @false and the dialog is modal,
             control is returned to the calling program.
     */
             otherwise the box is hidden. If @false and the dialog is modal,
             control is returned to the calling program.
     */

-    bool Show(bool show);
+    virtual bool Show(bool show = 1);

 
     /**
         Shows a modal dialog.
 
     /**
         Shows a modal dialog.


@@ -567,14 +572,13 @@ public:
 
         @see EndModal(), GetReturnCode(), SetReturnCode()
     */
 
         @see EndModal(), GetReturnCode(), SetReturnCode()
     */

-    int ShowModal();
+    virtual int ShowModal();

 };
 
 
 
 /**
     @class wxDialogLayoutAdapter
 };
 
 
 
 /**
     @class wxDialogLayoutAdapter

-    @wxheader{dialog.h}

 
     This abstract class is the base for classes that help wxWidgets peform
     run-time layout adaptation of dialogs. Principally, this is to cater for
 
     This abstract class is the base for classes that help wxWidgets peform
     run-time layout adaptation of dialogs. Principally, this is to cater for


@@ -601,13 +605,13 @@ public:
     /**
         Override this to returns @true if adaptation can and should be done.
     */
     /**
         Override this to returns @true if adaptation can and should be done.
     */

-    bool CanDoLayoutAdaptation(wxDialog* dialog);
+    virtual bool CanDoLayoutAdaptation(wxDialog* dialog) = 0;

 
     /**
         Override this to perform layout adaptation, such as making parts of the
         dialog scroll and resizing the dialog to fit the display. Normally this
         function will be called just before the dialog is shown.
     */
 
     /**
         Override this to perform layout adaptation, such as making parts of the
         dialog scroll and resizing the dialog to fit the display. Normally this
         function will be called just before the dialog is shown.
     */

-    bool DoLayoutAdaptation(wxDialog* dialog);
+    virtual bool DoLayoutAdaptation(wxDialog* dialog) = 0;

 };
 
 };