AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add go to first/last and plus/minus art provider icons.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin 2010-12-31 17:39:01 +00:00
parent 19be42b760
commit a7cfad3ad6
9 changed files with 116 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
art/first.xpm Normal file
View File

@ -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. ",
"... .. ",
"... . ",
" ",
" "};

22
art/last.xpm Normal file
View File

@ -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. ...",
" .. ...",
" . ...",
" ",
" "};

22
art/minus.xpm Normal file
View File

@ -0,0 +1,22 @@
/* XPM */
static const char *const minus_xpm[] = {
"16 16 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
" ",
" ",
" ",
" ",
" .............. ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" .............. ",
" ",
" ",
" ",
" ",
" ",
" "};

22
art/plus.xpm Normal file
View File

@ -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. ",
" .... ",
" ",
" "};

5
include/wx/artprov.h
View File

@ -66,6 +66,8 @@ typedef wxString wxArtID;
#define wxART_GO_DOWN wxART_MAKE_ART_ID(wxART_GO_DOWN) #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_TO_PARENT wxART_MAKE_ART_ID(wxART_GO_TO_PARENT)
#define wxART_GO_HOME wxART_MAKE_ART_ID(wxART_GO_HOME) #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_OPEN wxART_MAKE_ART_ID(wxART_FILE_OPEN)
#define wxART_FILE_SAVE wxART_MAKE_ART_ID(wxART_FILE_SAVE) #define wxART_FILE_SAVE wxART_MAKE_ART_ID(wxART_FILE_SAVE)
#define wxART_FILE_SAVE_AS wxART_MAKE_ART_ID(wxART_FILE_SAVE_AS) #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_UNDO wxART_MAKE_ART_ID(wxART_UNDO)
#define wxART_REDO wxART_MAKE_ART_ID(wxART_REDO) #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_CLOSE wxART_MAKE_ART_ID(wxART_CLOSE)
#define wxART_QUIT wxART_MAKE_ART_ID(wxART_QUIT) #define wxART_QUIT wxART_MAKE_ART_ID(wxART_QUIT)

8
interface/wx/artprov.h
View File

@ -79,10 +79,12 @@ typedef class wxString wxArtID;
@li wxART_GO_BACK @li wxART_GO_BACK
@li wxART_GO_FORWARD @li wxART_GO_FORWARD
@li wxART_GO_UP @li wxART_GO_UP
</td><td>
@li wxART_GO_DOWN @li wxART_GO_DOWN
@li wxART_GO_TO_PARENT @li wxART_GO_TO_PARENT
@li wxART_GO_HOME @li wxART_GO_HOME
@li wxART_GOTO_FIRST (since 2.9.2)
</td><td>
@li wxART_GOTO_LAST (since 2.9.2)
@li wxART_PRINT @li wxART_PRINT
@li wxART_HELP @li wxART_HELP
@li wxART_TIP @li wxART_TIP
@ -96,11 +98,11 @@ typedef class wxString wxArtID;
@li wxART_NORMAL_FILE @li wxART_NORMAL_FILE
@li wxART_TICK_MARK @li wxART_TICK_MARK
@li wxART_CROSS_MARK @li wxART_CROSS_MARK
</td><td>
@li wxART_MISSING_IMAGE @li wxART_MISSING_IMAGE
@li wxART_NEW @li wxART_NEW
@li wxART_FILE_OPEN @li wxART_FILE_OPEN
@li wxART_FILE_SAVE @li wxART_FILE_SAVE
</td><td>
@li wxART_FILE_SAVE_AS @li wxART_FILE_SAVE_AS
@li wxART_DELETE @li wxART_DELETE
@li wxART_COPY @li wxART_COPY
@ -108,6 +110,8 @@ typedef class wxString wxArtID;
@li wxART_PASTE @li wxART_PASTE
@li wxART_UNDO @li wxART_UNDO
@li wxART_REDO @li wxART_REDO
@li wxART_PLUS (since 2.9.2)
@li wxART_MINUS (since 2.9.2)
@li wxART_CLOSE @li wxART_CLOSE
@li wxART_QUIT @li wxART_QUIT
@li wxART_FIND @li wxART_FIND

4
samples/artprov/artbrows.cpp
View File

@ -80,6 +80,8 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list,
ART_ICON(wxART_GO_DOWN) ART_ICON(wxART_GO_DOWN)
ART_ICON(wxART_GO_TO_PARENT) ART_ICON(wxART_GO_TO_PARENT)
ART_ICON(wxART_GO_HOME) ART_ICON(wxART_GO_HOME)
ART_ICON(wxART_GOTO_FIRST)
ART_ICON(wxART_GOTO_LAST)
ART_ICON(wxART_PRINT) ART_ICON(wxART_PRINT)
ART_ICON(wxART_HELP) ART_ICON(wxART_HELP)
ART_ICON(wxART_TIP) ART_ICON(wxART_TIP)
@ -104,6 +106,8 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list,
ART_ICON(wxART_PASTE) ART_ICON(wxART_PASTE)
ART_ICON(wxART_UNDO) ART_ICON(wxART_UNDO)
ART_ICON(wxART_REDO) ART_ICON(wxART_REDO)
ART_ICON(wxART_PLUS)
ART_ICON(wxART_MINUS)
ART_ICON(wxART_QUIT) ART_ICON(wxART_QUIT)
ART_ICON(wxART_FIND) ART_ICON(wxART_FIND)
ART_ICON(wxART_FIND_AND_REPLACE) ART_ICON(wxART_FIND_AND_REPLACE)

8
src/common/artstd.cpp
View File

@ -93,6 +93,8 @@ protected:
#include "../../art/helpicon.xpm" #include "../../art/helpicon.xpm"
#include "../../art/tipicon.xpm" #include "../../art/tipicon.xpm"
#include "../../art/home.xpm" #include "../../art/home.xpm"
#include "../../art/first.xpm"
#include "../../art/last.xpm"
#include "../../art/repview.xpm" #include "../../art/repview.xpm"
#include "../../art/listview.xpm" #include "../../art/listview.xpm"
#include "../../art/new_dir.xpm" #include "../../art/new_dir.xpm"
@ -117,6 +119,8 @@ protected:
#include "../../art/new.xpm" #include "../../art/new.xpm"
#include "../../art/undo.xpm" #include "../../art/undo.xpm"
#include "../../art/redo.xpm" #include "../../art/redo.xpm"
#include "../../art/plus.xpm"
#include "../../art/minus.xpm"
#include "../../art/close.xpm" #include "../../art/close.xpm"
#include "../../art/quit.xpm" #include "../../art/quit.xpm"
#include "../../art/find.xpm" #include "../../art/find.xpm"
@ -149,6 +153,8 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
ART(wxART_GO_DOWN, down) ART(wxART_GO_DOWN, down)
ART(wxART_GO_TO_PARENT, toparent) ART(wxART_GO_TO_PARENT, toparent)
ART(wxART_GO_HOME, home) ART(wxART_GO_HOME, home)
ART(wxART_GOTO_FIRST, first)
ART(wxART_GOTO_LAST, last)
ART(wxART_FILE_OPEN, fileopen) ART(wxART_FILE_OPEN, fileopen)
ART(wxART_PRINT, print) ART(wxART_PRINT, print)
ART(wxART_HELP, helpicon) ART(wxART_HELP, helpicon)
@ -176,6 +182,8 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
ART(wxART_DELETE, delete) ART(wxART_DELETE, delete)
ART(wxART_UNDO, undo) ART(wxART_UNDO, undo)
ART(wxART_REDO, redo) ART(wxART_REDO, redo)
ART(wxART_PLUS, plus)
ART(wxART_MINUS, minus)
ART(wxART_CLOSE, close) ART(wxART_CLOSE, close)
ART(wxART_QUIT, quit) ART(wxART_QUIT, quit)
ART(wxART_FIND, find) ART(wxART_FIND, find)

5
src/gtk/artgtk.cpp
View File

@ -81,6 +81,8 @@ wxString wxArtIDToStock(const wxArtID& id)
ART(wxART_GO_DOWN, GTK_STOCK_GO_DOWN) ART(wxART_GO_DOWN, GTK_STOCK_GO_DOWN)
ART(wxART_GO_TO_PARENT, GTK_STOCK_GO_UP) ART(wxART_GO_TO_PARENT, GTK_STOCK_GO_UP)
ART(wxART_GO_HOME, GTK_STOCK_HOME) 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_FILE_OPEN, GTK_STOCK_OPEN)
ART(wxART_PRINT, GTK_STOCK_PRINT) ART(wxART_PRINT, GTK_STOCK_PRINT)
ART(wxART_HELP, GTK_STOCK_HELP) ART(wxART_HELP, GTK_STOCK_HELP)
@ -113,6 +115,9 @@ wxString wxArtIDToStock(const wxArtID& id)
ART(wxART_UNDO, GTK_STOCK_UNDO) ART(wxART_UNDO, GTK_STOCK_UNDO)
ART(wxART_REDO, GTK_STOCK_REDO) 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_CLOSE, GTK_STOCK_CLOSE)
ART(wxART_QUIT, GTK_STOCK_QUIT) ART(wxART_QUIT, GTK_STOCK_QUIT)