Make storing non-trivial data in wxThreadSpecificInfo possible.

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

diff --git a/interface/wx/msgdlg.h b/interface/wx/msgdlg.h
index 5d2d37361a3633d280f5d85c816c5a1473635709..6bc5426f2ef69832bbf656461f932d457a3f0710 100644 (file)
--- a/interface/wx/msgdlg.h
+++ b/interface/wx/msgdlg.h
@@ -2,10 +2,15 @@
 // Name:        msgdlg.h
 // Purpose:     interface of wxMessageDialog
 // Author:      wxWidgets team
 // Name:        msgdlg.h
 // Purpose:     interface of wxMessageDialog
 // Author:      wxWidgets team

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+/**
+    Default message box caption string.
+*/
+const char wxMessageBoxCaptionStr[] = "Message";
+
+

 /**
     @class wxMessageDialog
 
 /**
     @class wxMessageDialog
 


@@ -27,7 +32,7 @@
         appearance or be specially positioned if its label is not changed from
         the default one. Notice that using this button is not supported when
         showing a message box from non-main thread in wxOSX/Cocoa and it is not
         appearance or be specially positioned if its label is not changed from
         the default one. Notice that using this button is not supported when
         showing a message box from non-main thread in wxOSX/Cocoa and it is not

-        supported in wxOSX/Carbon at all. @since 2.9.3.
+        supported in wxOSX/Carbon at all. Available since wxWidgets 2.9.3.

     @style{wxNO_DEFAULT}
         Makes the "No" button default, can only be used with @c wxYES_NO.
     @style{wxCANCEL_DEFAULT}
     @style{wxNO_DEFAULT}
         Makes the "No" button default, can only be used with @c wxYES_NO.
     @style{wxCANCEL_DEFAULT}


@@ -62,6 +67,15 @@
         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
         explicitly.
         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
         explicitly.

+    @style{wxICON_AUTH_NEEDED}
+        Displays an authentication needed symbol. This style is only supported
+        for message dialogs under wxMSW when a task dialog is used to implement
+        them (i.e. when running under Windows Vista or later). In other cases
+        the default icon selection logic will be used. Note this can be
+        combined with other styles to provide a fallback. For instance, using
+        wxICON_AUTH_NEEDED | wxICON_QUESTION will show a shield symbol on
+        Windows Vista or above and a question symbol on other platforms.
+        Available since wxWidgets 2.9.5

     @style{wxSTAY_ON_TOP}
         Makes the message box stay on top of all other windows and not only
         just its parent (currently implemented only under MSW and GTK).
     @style{wxSTAY_ON_TOP}
         Makes the message box stay on top of all other windows and not only
         just its parent (currently implemented only under MSW and GTK).


@@ -314,8 +328,8 @@ public:
     @header{wx/msgdlg.h}
 */
 int wxMessageBox(const wxString& message,
     @header{wx/msgdlg.h}
 */
 int wxMessageBox(const wxString& message,

-                 const wxString& caption = "Message",
-                 int style = wxOK,
+                 const wxString& caption = wxMessageBoxCaptionStr,
+                 int style = wxOK | wxCENTRE,

                  wxWindow* parent = NULL,
                  int x = wxDefaultCoord,
                  int y = wxDefaultCoord);
                  wxWindow* parent = NULL,
                  int x = wxDefaultCoord,
                  int y = wxDefaultCoord);