Index: installer/src/installer-lib/interaction.h |
=================================================================== |
--- a/installer/src/installer-lib/interaction.h |
+++ b/installer/src/installer-lib/interaction.h |
@@ -20,7 +20,7 @@ |
* The Windows Installer provides the call MsiProcessMessage, overloaded by a set of message type constants. |
* This class represents those messages with user-provided messages; these ultimately call MessageBox. |
* |
- * \sa |
+ * \sa |
* * MSDN [MsiProcessMessage function](http://msdn.microsoft.com/en-us/library/windows/desktop/aa370354%28v=vs.85%29.aspx) |
* * MSDN [Sending Messages to Windows Installer Using MsiProcessMessage](http://msdn.microsoft.com/en-us/library/windows/desktop/aa371614%28v=vs.85%29.aspx) |
*/ |
@@ -34,18 +34,18 @@ |
error = INSTALLMESSAGE::INSTALLMESSAGE_ERROR, |
warning = INSTALLMESSAGE::INSTALLMESSAGE_WARNING, |
user = INSTALLMESSAGE::INSTALLMESSAGE_USER |
- } ; |
+ }; |
enum class ButtonSet : long |
{ |
defaultButtonSet = 0, |
- ok = MB_OK, |
- okCancel = MB_OKCANCEL, |
- abortRetryIgnore = MB_ABORTRETRYIGNORE, |
- yesNoCancel = MB_YESNOCANCEL, |
- yesNo = MB_YESNO, |
+ ok = MB_OK, |
+ okCancel = MB_OKCANCEL, |
+ abortRetryIgnore = MB_ABORTRETRYIGNORE, |
+ yesNoCancel = MB_YESNOCANCEL, |
+ yesNo = MB_YESNO, |
retryCancel = MB_RETRYCANCEL |
- } ; |
+ }; |
enum class DefaultButton : long |
{ |
@@ -53,7 +53,7 @@ |
one = MB_DEFBUTTON1, |
two = MB_DEFBUTTON2, |
three = MB_DEFBUTTON3 |
- } ; |
+ }; |
enum class Icon : long |
{ |
@@ -61,30 +61,30 @@ |
warningIcon = MB_ICONWARNING, ///< exclamation point |
informationIcon = MB_ICONINFORMATION, ///< lowercase letter "i" in a circle |
errorIcon = MB_ICONERROR ///< stop sign |
- } ; |
+ }; |
/** |
* Ordinary constructor, wide string |
*/ |
InstallerMessageBox( |
- std::wstring message, |
- Box box = Box::user, |
- ButtonSet buttonset = ButtonSet::defaultButtonSet, |
+ std::wstring message, |
+ Box box = Box::user, |
+ ButtonSet buttonset = ButtonSet::defaultButtonSet, |
DefaultButton defaultButton = DefaultButton::defaultButton, |
Icon icon = Icon::defaultIcon |
- ) ; |
+ ); |
/** |
* Ordinary constructor, regular string |
*/ |
InstallerMessageBox( |
- std::string message, |
- Box box = Box::user, |
- ButtonSet buttonset = ButtonSet::defaultButtonSet, |
+ std::string message, |
+ Box box = Box::user, |
+ ButtonSet buttonset = ButtonSet::defaultButtonSet, |
DefaultButton defaultButton = DefaultButton::defaultButton, |
Icon icon = Icon::defaultIcon |
- ) ; |
-} ; |
+ ); |
+}; |
/** |
* Error for any non-handled return value from Session.WriteMessage(). |
@@ -93,8 +93,8 @@ |
: std::logic_error |
{ |
UnexpectedReturnValueFromMessageBox() |
- : std::logic_error( "Unexpected return value from message box." ) |
+ : std::logic_error("Unexpected return value from message box.") |
{} |
-} ; |
+}; |
#endif |