Make semantic wxICON_XXX styles the canonical ones
Make wxICON_WARNING and wxICON_ERROR the primary constants for their purpose and define their visual Windows-based synonyms wxICON_HAND and wxICON_EXCLAMATION in terms of the semantic ones, instead of the other way around.
This commit is contained in:
@@ -2007,13 +2007,13 @@ enum wxBorder
|
|||||||
#define wxNO_DEFAULT 0x00000080 /* only valid with wxYES_NO */
|
#define wxNO_DEFAULT 0x00000080 /* only valid with wxYES_NO */
|
||||||
#define wxCANCEL_DEFAULT 0x80000000 /* only valid with wxCANCEL */
|
#define wxCANCEL_DEFAULT 0x80000000 /* only valid with wxCANCEL */
|
||||||
|
|
||||||
#define wxICON_EXCLAMATION 0x00000100
|
#define wxICON_WARNING 0x00000100
|
||||||
#define wxICON_HAND 0x00000200
|
#define wxICON_ERROR 0x00000200
|
||||||
#define wxICON_WARNING wxICON_EXCLAMATION
|
|
||||||
#define wxICON_ERROR wxICON_HAND
|
|
||||||
#define wxICON_QUESTION 0x00000400
|
#define wxICON_QUESTION 0x00000400
|
||||||
#define wxICON_INFORMATION 0x00000800
|
#define wxICON_INFORMATION 0x00000800
|
||||||
#define wxICON_STOP wxICON_HAND
|
#define wxICON_EXCLAMATION wxICON_WARNING
|
||||||
|
#define wxICON_HAND wxICON_ERROR
|
||||||
|
#define wxICON_STOP wxICON_ERROR
|
||||||
#define wxICON_ASTERISK wxICON_INFORMATION
|
#define wxICON_ASTERISK wxICON_INFORMATION
|
||||||
|
|
||||||
#define wxHELP 0x00001000
|
#define wxHELP 0x00001000
|
||||||
|
@@ -50,12 +50,10 @@ const char wxMessageBoxCaptionStr[] = "Message";
|
|||||||
used to prevent the dialog from using the default icon based on @c
|
used to prevent the dialog from using the default icon based on @c
|
||||||
wxYES_NO presence as explained in @c wxICON_QUESTION and @c
|
wxYES_NO presence as explained in @c wxICON_QUESTION and @c
|
||||||
wxICON_INFORMATION documentation below.
|
wxICON_INFORMATION documentation below.
|
||||||
@style{wxICON_EXCLAMATION}
|
|
||||||
Displays an exclamation, or warning, icon in the dialog.
|
|
||||||
@style{wxICON_ERROR}
|
@style{wxICON_ERROR}
|
||||||
Displays an error icon in the dialog.
|
Displays an error icon in the dialog.
|
||||||
@style{wxICON_HAND}
|
@style{wxICON_WARNING}
|
||||||
Displays an error symbol, this is a MSW-inspired synonym for @c wxICON_ERROR.
|
Displays a warning icon in the dialog.
|
||||||
@style{wxICON_QUESTION}
|
@style{wxICON_QUESTION}
|
||||||
Displays a question mark symbol. This icon is automatically used
|
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.
|
||||||
@@ -68,6 +66,10 @@ const char wxMessageBoxCaptionStr[] = "Message";
|
|||||||
Displays an information symbol. This icon is used by default if
|
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
|
@c wxYES_NO is not given so it is usually unnecessary to specify it
|
||||||
explicitly.
|
explicitly.
|
||||||
|
@style{wxICON_EXCLAMATION}
|
||||||
|
Alias for @c wxICON_WARNING.
|
||||||
|
@style{wxICON_HAND}
|
||||||
|
Alias for @c wxICON_ERROR.
|
||||||
@style{wxICON_AUTH_NEEDED}
|
@style{wxICON_AUTH_NEEDED}
|
||||||
Displays an authentication needed symbol. This style is only supported
|
Displays an authentication needed symbol. This style is only supported
|
||||||
for message dialogs under wxMSW when a task dialog is used to implement
|
for message dialogs under wxMSW when a task dialog is used to implement
|
||||||
|
Reference in New Issue
Block a user