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

Moved "edit" icon from wxEditableListBox to wxArtProvider.

Browse Source 
"Edit" icon definition used internally in wxEditableListBox is moved to
wxDefaultArtProvider and exposed as wxART_EDIT.

While there is no native version of this icon yet, it could be added in the
future and in the meanwhile this commit will be useful to use only standard
bitmaps in wxEditableListBox.
This commit is contained in:
Artur Wieczorek 2015-08-08 11:48:21 +02:00 committed by Vadim Zeitlin
parent 8e9c327221
commit 75467841ee
4 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
art/edit.xpm Normal file
View File

@ -0,0 +1,22 @@
/* XPM */
static const char* const edit_xpm[] = {
"16 16 3 1",
" c None",
". c #000000",
"+ c #00007F",
" ",
" ",
" .. .. ",
" . ",
" . ",
" ++++ . ++++ ",
" ++ . ++ ++",
" +++++ . ++++++",
" ++ ++ . ++ ",
" ++ ++ . ++ ++",
" +++++ . ++++ ",
" . ",
" . ",
" .. .. ",
" ",
" "};

1
include/wx/artprov.h
View File

@ -113,6 +113,7 @@ typedef wxString wxArtID;
#define wxART_FULL_SCREEN wxART_MAKE_ART_ID(wxART_FULL_SCREEN)
#define wxART_EDIT wxART_MAKE_ART_ID(wxART_EDIT)
// ----------------------------------------------------------------------------
// wxArtProvider class

2
interface/wx/artprov.h
View File

@ -89,6 +89,7 @@ wxArtID wxART_FIND;
wxArtID wxART_FIND_AND_REPLACE;
wxArtID wxART_FULL_SCREEN;
wxArtID wxART_EDIT;
/**
@ -191,6 +192,7 @@ wxArtID wxART_FULL_SCREEN;
@li @c wxART_FIND
@li @c wxART_FIND_AND_REPLACE
@li @c wxART_FULL_SCREEN (since 3.1.0)
@li @c wxART_EDIT (since 3.1.0)
@li @c wxART_HARDDISK
@li @c wxART_FLOPPY
@li @c wxART_CDROM

2
src/common/artstd.cpp
View File

@ -127,6 +127,7 @@ protected:
#include "../../art/find.xpm"
#include "../../art/findrepl.xpm"
#include "../../art/fullscreen.xpm"
#include "../../art/edit.xpm"
wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
{
@ -192,6 +193,7 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
ART(wxART_FIND_AND_REPLACE, findrepl)
ART(wxART_FULL_SCREEN, fullscreen)
ART(wxART_NEW, new)
ART(wxART_EDIT, edit)
return wxNullBitmap;