Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added new Art which GTK+ 2.4 defines and

Browse Source 
which we should use.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-11-27 23:23:47 +00:00
parent f1dec25f31
commit ddf6088b1e
9 changed files with 174 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
art/cdrom.xpm Normal file
View File

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

27
art/floppy.xpm Normal file
View File

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

28
art/folder_open.xpm Normal file
View File

@@ -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 */
" ",
" @@@@@ ",
" @$$$$$@ ",
" @$#+#+#$@@@@@@ ",
" @$+#+#+$$$$$$@.",
" @$#+#+#+#+#+#@.",
"@@@@@@@@@@@@@#@.",
"@$$$$$$$$$$@@+@.",
"@$#+#+#+#+##.@@.",
" @$#+#+#+#+#+.@.",
" @$+#+#+#+#+#.@.",
" @$+#+#+#+##@..",
" @@@@@@@@@@@@@.",
" .............",
" ",
" "};

27
art/harddisk.xpm Normal file
View File

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

27
art/removable.xpm Normal file
View File

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

5
include/wx/artprov.h
View File

@@ -75,7 +75,12 @@ typedef wxString wxArtID;
#define wxART_REPORT_VIEW wxART_MAKE_ART_ID(wxART_REPORT_VIEW) #define wxART_REPORT_VIEW wxART_MAKE_ART_ID(wxART_REPORT_VIEW)
#define wxART_LIST_VIEW wxART_MAKE_ART_ID(wxART_LIST_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_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 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_GO_DIR_UP wxART_MAKE_ART_ID(wxART_GO_DIR_UP)
#define wxART_EXECUTABLE_FILE wxART_MAKE_ART_ID(wxART_EXECUTABLE_FILE) #define wxART_EXECUTABLE_FILE wxART_MAKE_ART_ID(wxART_EXECUTABLE_FILE)
#define wxART_NORMAL_FILE wxART_MAKE_ART_ID(wxART_NORMAL_FILE) #define wxART_NORMAL_FILE wxART_MAKE_ART_ID(wxART_NORMAL_FILE)

10
src/common/artstd.cpp
View File

@@ -129,7 +129,12 @@ protected:
#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"
#include "../../art/harddisk.xpm"
#include "../../art/cdrom.xpm"
#include "../../art/floppy.xpm"
#include "../../art/removable.xpm"
#include "../../art/folder.xpm" #include "../../art/folder.xpm"
#include "../../art/folder_open.xpm"
#include "../../art/dir_up.xpm" #include "../../art/dir_up.xpm"
#include "../../art/exefile.xpm" #include "../../art/exefile.xpm"
#include "../../art/deffile.xpm" #include "../../art/deffile.xpm"
@@ -176,7 +181,12 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
ART(wxART_REPORT_VIEW, repview) ART(wxART_REPORT_VIEW, repview)
ART(wxART_LIST_VIEW, listview) ART(wxART_LIST_VIEW, listview)
ART(wxART_NEW_DIR, new_dir) 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, folder)
ART(wxART_FOLDER_OPEN, folder_open)
ART(wxART_GO_DIR_UP, dir_up) ART(wxART_GO_DIR_UP, dir_up)
ART(wxART_EXECUTABLE_FILE, exefile) ART(wxART_EXECUTABLE_FILE, exefile)
ART(wxART_NORMAL_FILE, deffile) ART(wxART_NORMAL_FILE, deffile)

10
src/gtk/artgtk.cpp
View File

@@ -87,13 +87,23 @@ static const char *wxArtIDToStock(const wxArtID& id)
//ART(wxART_REPORT_VIEW, ) //ART(wxART_REPORT_VIEW, )
//ART(wxART_LIST_VIEW, ) //ART(wxART_LIST_VIEW, )
//ART(wxART_NEW_DIR, ) //ART(wxART_NEW_DIR, )
#ifdef __WXGTK24__
ART(wxART_FOLDER, GTK_STOCK_DIRECTORY) ART(wxART_FOLDER, GTK_STOCK_DIRECTORY)
ART(wxART_FOLDER_OPEN, GTK_STOCK_DIRECTORY)
#endif
//ART(wxART_GO_DIR_UP, ) //ART(wxART_GO_DIR_UP, )
ART(wxART_EXECUTABLE_FILE, GTK_STOCK_EXECUTE) ART(wxART_EXECUTABLE_FILE, GTK_STOCK_EXECUTE)
ART(wxART_NORMAL_FILE, GTK_STOCK_FILE) ART(wxART_NORMAL_FILE, GTK_STOCK_FILE)
ART(wxART_TICK_MARK, GTK_STOCK_APPLY) ART(wxART_TICK_MARK, GTK_STOCK_APPLY)
ART(wxART_CROSS_MARK, GTK_STOCK_CANCEL) 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; return NULL;
#undef ART #undef ART

10
src/gtk1/artgtk.cpp
View File

@@ -87,13 +87,23 @@ static const char *wxArtIDToStock(const wxArtID& id)
//ART(wxART_REPORT_VIEW, ) //ART(wxART_REPORT_VIEW, )
//ART(wxART_LIST_VIEW, ) //ART(wxART_LIST_VIEW, )
//ART(wxART_NEW_DIR, ) //ART(wxART_NEW_DIR, )
#ifdef __WXGTK24__
ART(wxART_FOLDER, GTK_STOCK_DIRECTORY) ART(wxART_FOLDER, GTK_STOCK_DIRECTORY)
ART(wxART_FOLDER_OPEN, GTK_STOCK_DIRECTORY)
#endif
//ART(wxART_GO_DIR_UP, ) //ART(wxART_GO_DIR_UP, )
ART(wxART_EXECUTABLE_FILE, GTK_STOCK_EXECUTE) ART(wxART_EXECUTABLE_FILE, GTK_STOCK_EXECUTE)
ART(wxART_NORMAL_FILE, GTK_STOCK_FILE) ART(wxART_NORMAL_FILE, GTK_STOCK_FILE)
ART(wxART_TICK_MARK, GTK_STOCK_APPLY) ART(wxART_TICK_MARK, GTK_STOCK_APPLY)
ART(wxART_CROSS_MARK, GTK_STOCK_CANCEL) 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; return NULL;
#undef ART #undef ART