projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
default style now applies to the text entered by the user as well (patch 574789)
[wxWidgets.git]
/
include
/
wx
/
artprov.h
diff --git
a/include/wx/artprov.h
b/include/wx/artprov.h
index 01cb255a9a61463476565f60fac08ad351ba59ca..cd4821d5bc21c39d694e34038a0e7372d1fd54b3 100644
(file)
--- a/
include/wx/artprov.h
+++ b/
include/wx/artprov.h
@@
-34,14
+34,15
@@
typedef wxString wxArtID;
// Art clients
// ----------------------------------------------------------------------------
// Art clients
// ----------------------------------------------------------------------------
-#define wxART_TOOLBAR
_T("toolbar_C")
-#define wxART_MENU
_T("menu_C")
-#define wxART_FRAME_ICON
_T("frame_icon_C")
+#define wxART_TOOLBAR _T("toolbar_C")
+#define wxART_MENU _T("menu_C")
+#define wxART_FRAME_ICON _T("frame_icon_C")
-#define wxART_CMN_DIALOG _T("cmn_dialog_C")
-#define wxART_HELP_BROWSER _T("help_browser_C")
+#define wxART_CMN_DIALOG _T("cmn_dialog_C")
+#define wxART_HELP_BROWSER _T("help_browser_C")
+#define wxART_MESSAGE_BOX _T("message_box_C")
-#define wxART_OTHER
_T("other_C")
+#define wxART_OTHER _T("other_C")
// ----------------------------------------------------------------------------
// Art IDs
// ----------------------------------------------------------------------------
// Art IDs
@@
-73,6
+74,10
@@
typedef wxString wxArtID;
#define wxART_NORMAL_FILE _T("normal_file")
#define wxART_TICK_MARK _T("tick")
#define wxART_CROSS_MARK _T("cross")
#define wxART_NORMAL_FILE _T("normal_file")
#define wxART_TICK_MARK _T("tick")
#define wxART_CROSS_MARK _T("cross")
+#define wxART_ERROR _T("error")
+#define wxART_QUESTION _T("question")
+#define wxART_WARNING _T("warning")
+#define wxART_INFORMATION _T("information")
// ----------------------------------------------------------------------------
// wxArtProvider class
// ----------------------------------------------------------------------------
// wxArtProvider class
@@
-112,11
+117,7
@@
protected:
// lifetime for each requested wxArtID.
virtual wxBitmap CreateBitmap(const wxArtID& WXUNUSED(id),
const wxArtClient& WXUNUSED(client),
// lifetime for each requested wxArtID.
virtual wxBitmap CreateBitmap(const wxArtID& WXUNUSED(id),
const wxArtClient& WXUNUSED(client),
- const wxSize& WXUNUSED(size))
- {
- wxFAIL_MSG(_T("pure virtual method wxArtProvider::CreateBitmap called!"));
- return wxNullBitmap;
- }
+ const wxSize& WXUNUSED(size)) = 0;
private:
// list of providers:
private:
// list of providers: