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 9fd1dce9ea6e0cc59608ffb158ceb9710807eb32..0ffb51d8836d23aefe7d6b74a79573bca2659ee2 100644 (file)
--- a/interface/wx/dialog.h
+++ b/interface/wx/dialog.h
@@ -167,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


@@ -209,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


@@ -279,7 +279,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


@@ -296,7 +296,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.


@@ -321,7 +321,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.


@@ -343,7 +343,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.


@@ -353,7 +353,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.


@@ -378,7 +378,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.


@@ -386,7 +386,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


@@ -407,7 +407,7 @@ public:
     /**
         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.


@@ -549,7 +549,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.


@@ -566,7 +566,7 @@ public:
 
         @see EndModal(), GetReturnCode(), SetReturnCode()
     */
 
         @see EndModal(), GetReturnCode(), SetReturnCode()
     */

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

 };
 
 
 };
 
 


@@ -599,13 +599,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;

 };
 
 };