From: Vadim Zeitlin Date: Fri, 31 Dec 2010 17:39:01 +0000 (+0000) Subject: Add go to first/last and plus/minus art provider icons. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a7cfad3ad6bc8080b33a0878a14b1c02ca33fe3e Add go to first/last and plus/minus art provider icons. These icons will be used in the upcoming new implementation of the print preview frame and as they are also natively supported by GTK+ it makes sense to have support for them in wx itself. Notice that the existing bookmark add/remove icons are already mapped to the icons which look like plus and minus signs respectively in wxGTK but we need plus/minus in print preview in the other ports too so add these icons under explicit names. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/art/first.xpm b/art/first.xpm new file mode 100644 index 0000000000..6660af49e6 --- /dev/null +++ b/art/first.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static const char *const first_xpm[] = { +"16 16 3 1", +" c None", +". c Black", +"X c Gray100", +" ", +" ", +"... . ", +"... .. ", +"... .X. ", +"... .XX........ ", +"....XXXXXXXXXX. ", +"...XXXXXXXXXXX. ", +"...XXXXXXXXXXX. ", +"....XXXXXXXXXX. ", +"... .XX........ ", +"... .X. ", +"... .. ", +"... . ", +" ", +" "}; diff --git a/art/last.xpm b/art/last.xpm new file mode 100644 index 0000000000..66c3bd3382 --- /dev/null +++ b/art/last.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static const char *const last_xpm[] = { +"16 16 3 1", +" c None", +". c Black", +"X c Gray100", +" ", +" ", +" . ...", +" .. ...", +" .X. ...", +" ........XX. ...", +" .XXXXXXXXXX....", +" .XXXXXXXXXXX...", +" .XXXXXXXXXXX...", +" .XXXXXXXXXX....", +" ........XX. ...", +" .X. ...", +" .. ...", +" . ...", +" ", +" "}; diff --git a/art/minus.xpm b/art/minus.xpm new file mode 100644 index 0000000000..d8cc34f362 --- /dev/null +++ b/art/minus.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static const char *const minus_xpm[] = { +"16 16 3 1", +" c None", +". c Black", +"X c Gray100", +" ", +" ", +" ", +" ", +" ", +" ", +" .............. ", +" .XXXXXXXXXXXX. ", +" .XXXXXXXXXXXX. ", +" .............. ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/art/plus.xpm b/art/plus.xpm new file mode 100644 index 0000000000..25d299b305 --- /dev/null +++ b/art/plus.xpm @@ -0,0 +1,22 @@ +/* XPM */ +static const char *const plus_xpm[] = { +"16 16 3 1", +" c None", +". c Black", +"X c Gray100", +" ", +" ", +" .... ", +" .XX. ", +" .XX. ", +" .XX. ", +" ......XX...... ", +" .XXXXXXXXXXXX. ", +" .XXXXXXXXXXXX. ", +" ......XX...... ", +" .XX. ", +" .XX. ", +" .XX. ", +" .... ", +" ", +" "}; diff --git a/include/wx/artprov.h b/include/wx/artprov.h index 2867b76ade..326fbf06cc 100644 --- a/include/wx/artprov.h +++ b/include/wx/artprov.h @@ -66,6 +66,8 @@ typedef wxString wxArtID; #define wxART_GO_DOWN wxART_MAKE_ART_ID(wxART_GO_DOWN) #define wxART_GO_TO_PARENT wxART_MAKE_ART_ID(wxART_GO_TO_PARENT) #define wxART_GO_HOME wxART_MAKE_ART_ID(wxART_GO_HOME) +#define wxART_GOTO_FIRST wxART_MAKE_ART_ID(wxART_GOTO_FIRST) +#define wxART_GOTO_LAST wxART_MAKE_ART_ID(wxART_GOTO_LAST) #define wxART_FILE_OPEN wxART_MAKE_ART_ID(wxART_FILE_OPEN) #define wxART_FILE_SAVE wxART_MAKE_ART_ID(wxART_FILE_SAVE) #define wxART_FILE_SAVE_AS wxART_MAKE_ART_ID(wxART_FILE_SAVE_AS) @@ -101,6 +103,9 @@ typedef wxString wxArtID; #define wxART_UNDO wxART_MAKE_ART_ID(wxART_UNDO) #define wxART_REDO wxART_MAKE_ART_ID(wxART_REDO) +#define wxART_PLUS wxART_MAKE_ART_ID(wxART_PLUS) +#define wxART_MINUS wxART_MAKE_ART_ID(wxART_MINUS) + #define wxART_CLOSE wxART_MAKE_ART_ID(wxART_CLOSE) #define wxART_QUIT wxART_MAKE_ART_ID(wxART_QUIT) diff --git a/interface/wx/artprov.h b/interface/wx/artprov.h index a9f7c2b21b..0fa1b70397 100644 --- a/interface/wx/artprov.h +++ b/interface/wx/artprov.h @@ -79,10 +79,12 @@ typedef class wxString wxArtID; @li wxART_GO_BACK @li wxART_GO_FORWARD @li wxART_GO_UP - @li wxART_GO_DOWN @li wxART_GO_TO_PARENT @li wxART_GO_HOME + @li wxART_GOTO_FIRST (since 2.9.2) + + @li wxART_GOTO_LAST (since 2.9.2) @li wxART_PRINT @li wxART_HELP @li wxART_TIP @@ -96,11 +98,11 @@ typedef class wxString wxArtID; @li wxART_NORMAL_FILE @li wxART_TICK_MARK @li wxART_CROSS_MARK - @li wxART_MISSING_IMAGE @li wxART_NEW @li wxART_FILE_OPEN @li wxART_FILE_SAVE + @li wxART_FILE_SAVE_AS @li wxART_DELETE @li wxART_COPY @@ -108,6 +110,8 @@ typedef class wxString wxArtID; @li wxART_PASTE @li wxART_UNDO @li wxART_REDO + @li wxART_PLUS (since 2.9.2) + @li wxART_MINUS (since 2.9.2) @li wxART_CLOSE @li wxART_QUIT @li wxART_FIND diff --git a/samples/artprov/artbrows.cpp b/samples/artprov/artbrows.cpp index b528dbd45f..596522bfda 100644 --- a/samples/artprov/artbrows.cpp +++ b/samples/artprov/artbrows.cpp @@ -80,6 +80,8 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list, ART_ICON(wxART_GO_DOWN) ART_ICON(wxART_GO_TO_PARENT) ART_ICON(wxART_GO_HOME) + ART_ICON(wxART_GOTO_FIRST) + ART_ICON(wxART_GOTO_LAST) ART_ICON(wxART_PRINT) ART_ICON(wxART_HELP) ART_ICON(wxART_TIP) @@ -104,6 +106,8 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list, ART_ICON(wxART_PASTE) ART_ICON(wxART_UNDO) ART_ICON(wxART_REDO) + ART_ICON(wxART_PLUS) + ART_ICON(wxART_MINUS) ART_ICON(wxART_QUIT) ART_ICON(wxART_FIND) ART_ICON(wxART_FIND_AND_REPLACE) diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index 716189ecfb..c12a849c9d 100644 --- a/src/common/artstd.cpp +++ b/src/common/artstd.cpp @@ -93,6 +93,8 @@ protected: #include "../../art/helpicon.xpm" #include "../../art/tipicon.xpm" #include "../../art/home.xpm" +#include "../../art/first.xpm" +#include "../../art/last.xpm" #include "../../art/repview.xpm" #include "../../art/listview.xpm" #include "../../art/new_dir.xpm" @@ -117,6 +119,8 @@ protected: #include "../../art/new.xpm" #include "../../art/undo.xpm" #include "../../art/redo.xpm" +#include "../../art/plus.xpm" +#include "../../art/minus.xpm" #include "../../art/close.xpm" #include "../../art/quit.xpm" #include "../../art/find.xpm" @@ -149,6 +153,8 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id) ART(wxART_GO_DOWN, down) ART(wxART_GO_TO_PARENT, toparent) ART(wxART_GO_HOME, home) + ART(wxART_GOTO_FIRST, first) + ART(wxART_GOTO_LAST, last) ART(wxART_FILE_OPEN, fileopen) ART(wxART_PRINT, print) ART(wxART_HELP, helpicon) @@ -176,6 +182,8 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id) ART(wxART_DELETE, delete) ART(wxART_UNDO, undo) ART(wxART_REDO, redo) + ART(wxART_PLUS, plus) + ART(wxART_MINUS, minus) ART(wxART_CLOSE, close) ART(wxART_QUIT, quit) ART(wxART_FIND, find) diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp index d31eb8cd5f..2b561c7723 100644 --- a/src/gtk/artgtk.cpp +++ b/src/gtk/artgtk.cpp @@ -81,6 +81,8 @@ wxString wxArtIDToStock(const wxArtID& id) ART(wxART_GO_DOWN, GTK_STOCK_GO_DOWN) ART(wxART_GO_TO_PARENT, GTK_STOCK_GO_UP) ART(wxART_GO_HOME, GTK_STOCK_HOME) + ART(wxART_GOTO_FIRST, GTK_STOCK_GOTO_FIRST) + ART(wxART_GOTO_LAST, GTK_STOCK_GOTO_LAST) ART(wxART_FILE_OPEN, GTK_STOCK_OPEN) ART(wxART_PRINT, GTK_STOCK_PRINT) ART(wxART_HELP, GTK_STOCK_HELP) @@ -113,6 +115,9 @@ wxString wxArtIDToStock(const wxArtID& id) ART(wxART_UNDO, GTK_STOCK_UNDO) ART(wxART_REDO, GTK_STOCK_REDO) + ART(wxART_PLUS, GTK_STOCK_ADD) + ART(wxART_MINUS, GTK_STOCK_REMOVE) + ART(wxART_CLOSE, GTK_STOCK_CLOSE) ART(wxART_QUIT, GTK_STOCK_QUIT)