Set TOOLKIT_LOWERCASE correctly for the various flavors of wxOSX

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

diff --git a/interface/wx/msgdlg.h b/interface/wx/msgdlg.h
index e484febad13f39ca72702656cd3e9c8b7ce80b0a..781ec79cf9ef3ede8a33dde296139f64b58b3566 100644 (file)
--- a/interface/wx/msgdlg.h
+++ b/interface/wx/msgdlg.h
@@ -15,14 +15,13 @@
     @library{wxcore}
     @category{cmndlg}
 
     @library{wxcore}
     @category{cmndlg}
 

-    @see @ref overview_wxmessagedialogoverview "wxMessageDialog overview"
+    @see @ref overview_cmndlg_msg

 */
 class wxMessageDialog : public wxDialog
 {
 public:
     /**
         Constructor specifying the message box properties.
 */
 class wxMessageDialog : public wxDialog
 {
 public:
     /**
         Constructor specifying the message box properties.

-

         Use ShowModal() to show the dialog.
 
         @a style may be a bit list of the following identifiers:
         Use ShowModal() to show the dialog.
 
         @a style may be a bit list of the following identifiers:


@@ -56,8 +55,7 @@ public:
             wxICON_ERROR.
         @style{wxICON_QUESTION}
             Displays a question mark symbol. This icon is automatically used
             wxICON_ERROR.
         @style{wxICON_QUESTION}
             Displays a question mark symbol. This icon is automatically used

-            with @c wxYES_NO so it's usually unnecessary to specify it
-            explicitly.
+            with @c wxYES_NO so it's usually unnecessary to specify it explicitly.

         @style{wxICON_INFORMATION}
             Displays an information symbol. This icon is used by default if @c
             wxYES_NO is not given so it is usually unnecessary to specify it
         @style{wxICON_INFORMATION}
             Displays an information symbol. This icon is used by default if @c
             wxYES_NO is not given so it is usually unnecessary to specify it


@@ -67,8 +65,8 @@ public:
             implemented only under MSW).
         @endStyleTable
 
             implemented only under MSW).
         @endStyleTable
 

-        Notice that not all styles are compatible: only one of @c wxOK and @c
-        wxYES_NO may be specified (and one of them must be specified) and at
+        Notice that not all styles are compatible: only one of @c wxOK and
+        @c wxYES_NO may be specified (and one of them must be specified) and at

         most one default button style can be used and it is only valid if the
         corresponding button is shown in the message box.
 
         most one default button style can be used and it is only valid if the
         corresponding button is shown in the message box.
 


@@ -84,7 +82,7 @@ public:
             Dialog position (ignored under MSW).
     */
     wxMessageDialog(wxWindow* parent, const wxString& message,
             Dialog position (ignored under MSW).
     */
     wxMessageDialog(wxWindow* parent, const wxString& message,

-                    const wxString& caption = "Message box",
+                    const wxString& caption = wxMessageBoxCaptionStr,

                     long style = wxOK | wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 
                     long style = wxOK | wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 


@@ -98,34 +96,36 @@ public:
         which don't support extended messages, it is simply appended to the
         normal message with a new line separating them.
     */
         which don't support extended messages, it is simply appended to the
         normal message with a new line separating them.
     */

-    void SetExtendedMessage(const wxString extendedMessage);
+    virtual void SetExtendedMessage(const wxString& extendedMessage);

 
     /**
         Sets the message shown by the dialog.
     */
 
     /**
         Sets the message shown by the dialog.
     */

-    void SetMessage(const wxString msg);
+    virtual void SetMessage(const wxString& message);

 
     /**
         Overrides the default labels of the OK and Cancel buttons.
 
         Please see the remarks in SetYesNoLabels() documentation.
     */
 
     /**
         Overrides the default labels of the OK and Cancel buttons.
 
         Please see the remarks in SetYesNoLabels() documentation.
     */

-    bool SetOKCancelLabels(const ButtonLabel& ok, const ButtonLabel& cancel);
+    virtual bool SetOKCancelLabels(const ButtonLabel& ok,
+                                   const ButtonLabel& cancel);

 
     /**
         Overrides the default label of the OK button.
 
         Please see the remarks in SetYesNoLabels() documentation.
     */
 
     /**
         Overrides the default label of the OK button.
 
         Please see the remarks in SetYesNoLabels() documentation.
     */

-    bool SetOKLabel(const ButtonLabel& ok);
+    virtual bool SetOKLabel(const ButtonLabel& ok);

 
     /**
         Overrides the default labels of the Yes, No and Cancel buttons.
 
         Please see the remarks in SetYesNoLabels() documentation.
     */
 
     /**
         Overrides the default labels of the Yes, No and Cancel buttons.
 
         Please see the remarks in SetYesNoLabels() documentation.
     */

-    bool SetYesNoCancelLabels(const ButtonLabel& yes, const ButtonLabel& no,
-                              const ButtonLabel& cancel);
+    virtual bool SetYesNoCancelLabels(const ButtonLabel& yes,
+                                      const ButtonLabel& no,
+                                      const ButtonLabel& cancel);

 
     /**
         Overrides the default labels of the Yes and No buttons.
 
     /**
         Overrides the default labels of the Yes and No buttons.


@@ -157,16 +157,15 @@ public:
             dlg.SetMessage(_("Do you really want to quit?"));
         @endcode
     */
             dlg.SetMessage(_("Do you really want to quit?"));
         @endcode
     */

-    bool SetYesNoLabels(const ButtonLabel& yes, const ButtonLabel& no);
+    virtual bool SetYesNoLabels(const ButtonLabel& yes, const ButtonLabel& no);

 
     /**
 
     /**

-        Shows the dialog, returning one of wxID_OK, wxID_CANCEL, wxID_YES,
-        wxID_NO.
+        Shows the dialog, returning one of wxID_OK, wxID_CANCEL, wxID_YES, wxID_NO.

 
         Notice that this method returns the identifier of the button which was
         clicked unlike wxMessageBox() function.
     */
 
         Notice that this method returns the identifier of the button which was
         clicked unlike wxMessageBox() function.
     */

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

 };
 
 
 };