Set TOOLKIT_LOWERCASE correctly for the various flavors of wxOSX

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

diff --git a/interface/wx/dialog.h b/interface/wx/dialog.h
index 3052b2e0e57fdc871638ecc7bde7ee3a5c9c8ff5..0ffb51d8836d23aefe7d6b74a79573bca2659ee2 100644 (file)
--- a/interface/wx/dialog.h
+++ b/interface/wx/dialog.h
@@ -18,7 +18,6 @@ enum wxDialogLayoutAdaptationMode
 
 /**
     @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
@@ -168,13 +167,13 @@ public:
              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.
     */
-    ~wxDialog();
+    virtual ~wxDialog();
 
     /**
         Adds an identifier to be regarded as a main button for the
@@ -210,7 +209,7 @@ public:
                 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
@@ -280,7 +279,7 @@ public:
 
         @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
@@ -297,7 +296,7 @@ public:
         @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.
@@ -322,7 +321,7 @@ public:
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */
-    int GetLayoutAdaptationLevel();
+    int GetLayoutAdaptationLevel() const;
 
     /**
         Gets the adaptation mode, overriding the global adaptation flag.
@@ -344,7 +343,7 @@ public:
 
         @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
     */
-    wxArrayInt GetMainButtonIds();
+    wxArrayInt& GetMainButtonIds();
 
     /**
         Gets the return code for this window.
@@ -354,7 +353,7 @@ public:
 
         @see SetReturnCode(), ShowModal(), EndModal()
     */
-    int GetReturnCode();
+    int GetReturnCode() const;
 
     /**
         On PocketPC, a dialog is automatically provided with an empty toolbar.
@@ -379,7 +378,7 @@ public:
                  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.
@@ -387,7 +386,7 @@ public:
         @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
@@ -408,7 +407,7 @@ public:
     /**
         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.
@@ -550,7 +549,7 @@ public:
             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.
@@ -567,14 +566,13 @@ public:
 
         @see EndModal(), GetReturnCode(), SetReturnCode()
     */
-    int ShowModal();
+    virtual int ShowModal();
 };
 
 
 
 /**
     @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
@@ -601,13 +599,13 @@ public:
     /**
         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.
     */
-    bool DoLayoutAdaptation(wxDialog* dialog);
+    virtual bool DoLayoutAdaptation(wxDialog* dialog) = 0;
 };