From ddf6088b1e24b23854de2342c6f4ac942731216a Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 27 Nov 2004 23:23:47 +0000 Subject: [PATCH] Added new Art which GTK+ 2.4 defines and which we should use. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- art/cdrom.xpm | 30 ++++++++++++++++++++++++++++++ art/floppy.xpm | 27 +++++++++++++++++++++++++++ art/folder_open.xpm | 28 ++++++++++++++++++++++++++++ art/harddisk.xpm | 27 +++++++++++++++++++++++++++ art/removable.xpm | 27 +++++++++++++++++++++++++++ include/wx/artprov.h | 5 +++++ src/common/artstd.cpp | 10 ++++++++++ src/gtk/artgtk.cpp | 10 ++++++++++ src/gtk1/artgtk.cpp | 10 ++++++++++ 9 files changed, 174 insertions(+) create mode 100644 art/cdrom.xpm create mode 100644 art/floppy.xpm create mode 100644 art/folder_open.xpm create mode 100644 art/harddisk.xpm create mode 100644 art/removable.xpm diff --git a/art/cdrom.xpm b/art/cdrom.xpm new file mode 100644 index 0000000..0f292b0 --- /dev/null +++ b/art/cdrom.xpm @@ -0,0 +1,30 @@ +/* XPM */ +static char *cdrom_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 10 1", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Yellow", +"O c Blue", +"+ c Black", +"@ c Gray100", +"# c #008080", +"$ c Green", +"% c #008000", +" ... ", +" ..XoX.. ", +" .O.XoXXX+ ", +" ...O.oXXXX+ ", +" .O..X.XXXX+ ", +" ....X.+..XXX+", +" .XXX.+@+.XXX+", +" .X@XX.+.X@@X+", +" .....X...#XX@+ ", +".@@@...XXo.O@X+ ", +".@XXX..XXoXOO+ ", +".@++++..XoX+++ ", +".@$%@@XX+++X.+ ", +".............+ ", +" ++++++++++++ ", +" "}; diff --git a/art/floppy.xpm b/art/floppy.xpm new file mode 100644 index 0000000..1d10b01 --- /dev/null +++ b/art/floppy.xpm @@ -0,0 +1,27 @@ +/* XPM */ +static char *floppy_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 7 1", +" s None c None", +". c #808080", +"X c Gray100", +"o c #c0c0c0", +"O c Black", +"+ c Cyan", +"@ c Red", +" ......X", +" .ooooooO", +" .+++++OO", +" .++++++O", +" .++++++O", +" .ooooooO", +" .......o....oO", +" .oooooo.o.O.XoO", +".XXXXXXXXOOOOOO ", +".ooooooooo@o..O ", +".ooo....oooo..O ", +".o..OOOO...o..O ", +".oooXXXXoooo..O ", +".............O ", +" OOOOOOOOOOOO ", +" "}; diff --git a/art/folder_open.xpm b/art/folder_open.xpm new file mode 100644 index 0000000..6febf8e --- /dev/null +++ b/art/folder_open.xpm @@ -0,0 +1,28 @@ +/* XPM */ +static char * folder_open_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 6 1", +/* colors */ +" s None c None", +". c #000000", +"+ c #c0c0c0", +"@ c #808080", +"# c #ffff00", +"$ c #ffffff", +/* pixels */ +" ", +" @@@@@ ", +" @$$$$$@ ", +" @$#+#+#$@@@@@@ ", +" @$+#+#+$$$$$$@.", +" @$#+#+#+#+#+#@.", +"@@@@@@@@@@@@@#@.", +"@$$$$$$$$$$@@+@.", +"@$#+#+#+#+##.@@.", +" @$#+#+#+#+#+.@.", +" @$+#+#+#+#+#.@.", +" @$+#+#+#+##@..", +" @@@@@@@@@@@@@.", +" .............", +" ", +" "}; diff --git a/art/harddisk.xpm b/art/harddisk.xpm new file mode 100644 index 0000000..81f50cf --- /dev/null +++ b/art/harddisk.xpm @@ -0,0 +1,27 @@ +/* XPM */ +static char *harddisk_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 7 1", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Black", +"O c Gray100", +"+ c Green", +"@ c #008000", +" ", +" ", +" ", +" ", +" ............. ", +" .XXXXXXXXXXXX.o", +".OOOOOOOOOOOO..o", +".XXXXXXXXX+@X..o", +".XXXXXXXXXXXX..o", +".X..........X..o", +".XOOOOOOOOOOX..o", +"..............o ", +" ooooooooooooo ", +" ", +" ", +" "}; diff --git a/art/removable.xpm b/art/removable.xpm new file mode 100644 index 0000000..42333d0 --- /dev/null +++ b/art/removable.xpm @@ -0,0 +1,27 @@ +/* XPM */ +static char *removable_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 7 1", +" s None c None", +". c #808080", +"X c #c0c0c0", +"o c Black", +"O c Gray100", +"+ c Red", +"@ c #800000", +" ", +" ", +" ", +" ............. ", +" .XXXXXXXXXXXX.o", +".OOOOOOOOOOOO..o", +".OXXXXXXXXXXX..o", +".O+@.oooooo.X..o", +".OXXOooooooOX..o", +".OXXXOOOOOOXX..o", +".OXXXXXXXXXXX..o", +".O............o ", +" ooooooooooooo ", +" ", +" ", +" "}; diff --git a/include/wx/artprov.h b/include/wx/artprov.h index 1b1fb6d..03aa290 100644 --- a/include/wx/artprov.h +++ b/include/wx/artprov.h @@ -75,7 +75,12 @@ typedef wxString wxArtID; #define wxART_REPORT_VIEW wxART_MAKE_ART_ID(wxART_REPORT_VIEW) #define wxART_LIST_VIEW wxART_MAKE_ART_ID(wxART_LIST_VIEW) #define wxART_NEW_DIR wxART_MAKE_ART_ID(wxART_NEW_DIR) +#define wxART_HARDDISK wxART_MAKE_ART_ID(wxART_HARDDISK) +#define wxART_FLOPPY wxART_MAKE_ART_ID(wxART_FLOPPY) +#define wxART_CDROM wxART_MAKE_ART_ID(wxART_CDROM) +#define wxART_REMOVABLE wxART_MAKE_ART_ID(wxART_REMOVABLE) #define wxART_FOLDER wxART_MAKE_ART_ID(wxART_FOLDER) +#define wxART_FOLDER_OPEN wxART_MAKE_ART_ID(wxART_FOLDER_OPEN) #define wxART_GO_DIR_UP wxART_MAKE_ART_ID(wxART_GO_DIR_UP) #define wxART_EXECUTABLE_FILE wxART_MAKE_ART_ID(wxART_EXECUTABLE_FILE) #define wxART_NORMAL_FILE wxART_MAKE_ART_ID(wxART_NORMAL_FILE) diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index 613b901..23bbfb7 100644 --- a/src/common/artstd.cpp +++ b/src/common/artstd.cpp @@ -129,7 +129,12 @@ protected: #include "../../art/repview.xpm" #include "../../art/listview.xpm" #include "../../art/new_dir.xpm" +#include "../../art/harddisk.xpm" +#include "../../art/cdrom.xpm" +#include "../../art/floppy.xpm" +#include "../../art/removable.xpm" #include "../../art/folder.xpm" +#include "../../art/folder_open.xpm" #include "../../art/dir_up.xpm" #include "../../art/exefile.xpm" #include "../../art/deffile.xpm" @@ -176,7 +181,12 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id, ART(wxART_REPORT_VIEW, repview) ART(wxART_LIST_VIEW, listview) ART(wxART_NEW_DIR, new_dir) + ART(wxART_HARDDISK, harddisk) + ART(wxART_FLOPPY, floppy) + ART(wxART_CDROM, cdrom) + ART(wxART_REMOVABLE, removable) ART(wxART_FOLDER, folder) + ART(wxART_FOLDER_OPEN, folder_open) ART(wxART_GO_DIR_UP, dir_up) ART(wxART_EXECUTABLE_FILE, exefile) ART(wxART_NORMAL_FILE, deffile) diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp index 6302fbb..dafc3dc 100644 --- a/src/gtk/artgtk.cpp +++ b/src/gtk/artgtk.cpp @@ -87,12 +87,22 @@ static const char *wxArtIDToStock(const wxArtID& id) //ART(wxART_REPORT_VIEW, ) //ART(wxART_LIST_VIEW, ) //ART(wxART_NEW_DIR, ) +#ifdef __WXGTK24__ ART(wxART_FOLDER, GTK_STOCK_DIRECTORY) + ART(wxART_FOLDER_OPEN, GTK_STOCK_DIRECTORY) +#endif //ART(wxART_GO_DIR_UP, ) ART(wxART_EXECUTABLE_FILE, GTK_STOCK_EXECUTE) ART(wxART_NORMAL_FILE, GTK_STOCK_FILE) ART(wxART_TICK_MARK, GTK_STOCK_APPLY) ART(wxART_CROSS_MARK, GTK_STOCK_CANCEL) + +#ifdef __WXGTK24__ + ART(wxART_FLOPPY, GTK_STOCK_FLOPPY) + ART(wxART_CDROM, GTK_STOCK_CDROM) + ART(wxART_HARDDISK, GTK_STOCK_HARDDISK) + ART(wxART_REMOVABLE, GTK_STOCK_HARDDISK) +#endif return NULL; diff --git a/src/gtk1/artgtk.cpp b/src/gtk1/artgtk.cpp index 6302fbb..dafc3dc 100644 --- a/src/gtk1/artgtk.cpp +++ b/src/gtk1/artgtk.cpp @@ -87,12 +87,22 @@ static const char *wxArtIDToStock(const wxArtID& id) //ART(wxART_REPORT_VIEW, ) //ART(wxART_LIST_VIEW, ) //ART(wxART_NEW_DIR, ) +#ifdef __WXGTK24__ ART(wxART_FOLDER, GTK_STOCK_DIRECTORY) + ART(wxART_FOLDER_OPEN, GTK_STOCK_DIRECTORY) +#endif //ART(wxART_GO_DIR_UP, ) ART(wxART_EXECUTABLE_FILE, GTK_STOCK_EXECUTE) ART(wxART_NORMAL_FILE, GTK_STOCK_FILE) ART(wxART_TICK_MARK, GTK_STOCK_APPLY) ART(wxART_CROSS_MARK, GTK_STOCK_CANCEL) + +#ifdef __WXGTK24__ + ART(wxART_FLOPPY, GTK_STOCK_FLOPPY) + ART(wxART_CDROM, GTK_STOCK_CDROM) + ART(wxART_HARDDISK, GTK_STOCK_HARDDISK) + ART(wxART_REMOVABLE, GTK_STOCK_HARDDISK) +#endif return NULL; -- 2.7.4