added more icons (for GTK only) (patch 1097684)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 03aa2908bca96a913a02d03eb9461356317d1162..4afdfad882bf7be2b237f68bec7fbd5d45e46400 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -69,6 +69,8 @@ typedef wxString wxArtID;
 #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_FILE_OPEN            wxART_MAKE_ART_ID(wxART_FILE_OPEN)
 #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_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)

 #define wxART_PRINT                wxART_MAKE_ART_ID(wxART_PRINT)
 #define wxART_HELP                 wxART_MAKE_ART_ID(wxART_HELP)
 #define wxART_TIP                  wxART_MAKE_ART_ID(wxART_TIP)
 #define wxART_PRINT                wxART_MAKE_ART_ID(wxART_PRINT)
 #define wxART_HELP                 wxART_MAKE_ART_ID(wxART_HELP)
 #define wxART_TIP                  wxART_MAKE_ART_ID(wxART_TIP)


@@ -92,6 +94,20 @@ typedef wxString wxArtID;
 #define wxART_INFORMATION          wxART_MAKE_ART_ID(wxART_INFORMATION)
 #define wxART_MISSING_IMAGE        wxART_MAKE_ART_ID(wxART_MISSING_IMAGE)
 
 #define wxART_INFORMATION          wxART_MAKE_ART_ID(wxART_INFORMATION)
 #define wxART_MISSING_IMAGE        wxART_MAKE_ART_ID(wxART_MISSING_IMAGE)
 

+#define wxART_COPY                 wxART_MAKE_ART_ID(wxART_COPY)
+#define wxART_CUT                  wxART_MAKE_ART_ID(wxART_CUT)
+#define wxART_PASTE                wxART_MAKE_ART_ID(wxART_PASTE)
+#define wxART_DELETE               wxART_MAKE_ART_ID(wxART_DELETE)
+
+#define wxART_UNDO                 wxART_MAKE_ART_ID(wxART_UNDO)
+#define wxART_REDO                 wxART_MAKE_ART_ID(wxART_REDO)
+
+#define wxART_QUIT                 wxART_MAKE_ART_ID(wxART_QUIT)
+
+#define wxART_FIND                 wxART_MAKE_ART_ID(wxART_FIND)
+#define wxART_FIND_AND_REPLACE     wxART_MAKE_ART_ID(wxART_FIND_AND_REPLACE)
+
+

 // ----------------------------------------------------------------------------
 // wxArtProvider class
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxArtProvider class
 // ----------------------------------------------------------------------------

diff --git a/samples/artprov/artbrows.cpp b/samples/artprov/artbrows.cpp
index 6ecf00a2979edf252b739f63c3a0663172682bea..2543ca97af584ba4a184702a2f4829dac50058c4 100644 (file)
--- a/samples/artprov/artbrows.cpp
+++ b/samples/artprov/artbrows.cpp
@@ -97,6 +97,17 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list,
     ART_ICON(wxART_TICK_MARK)
     ART_ICON(wxART_CROSS_MARK)
     ART_ICON(wxART_MISSING_IMAGE)
     ART_ICON(wxART_TICK_MARK)
     ART_ICON(wxART_CROSS_MARK)
     ART_ICON(wxART_MISSING_IMAGE)

+    ART_ICON(wxART_FILE_SAVE)
+    ART_ICON(wxART_FILE_SAVE_AS)
+    ART_ICON(wxART_COPY)
+    ART_ICON(wxART_CUT)
+    ART_ICON(wxART_PASTE)
+    ART_ICON(wxART_UNDO)
+    ART_ICON(wxART_REDO)
+    ART_ICON(wxART_QUIT)
+    ART_ICON(wxART_FIND)
+    ART_ICON(wxART_FIND_AND_REPLACE)
+

 }
 
 
 }
 
 

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index a33fd455adcf12f66ff4dda5d81ffc556282fe64..209c58e6748d19ce4ae4acac89c1b960b3a335af 100644 (file)
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -102,6 +102,22 @@ static const char *wxArtIDToStock(const wxArtID& id)
     ART(wxART_CDROM,                               GTK_STOCK_CDROM)
     ART(wxART_HARDDISK,                            GTK_STOCK_HARDDISK)
     ART(wxART_REMOVABLE,                           GTK_STOCK_HARDDISK)
     ART(wxART_CDROM,                               GTK_STOCK_CDROM)
     ART(wxART_HARDDISK,                            GTK_STOCK_HARDDISK)
     ART(wxART_REMOVABLE,                           GTK_STOCK_HARDDISK)

+
+    ART(wxART_FILE_SAVE,                           GTK_STOCK_SAVE)
+    ART(wxART_FILE_SAVE_AS,                        GTK_STOCK_SAVE_AS)
+
+    ART(wxART_COPY,                                GTK_STOCK_COPY)
+    ART(wxART_CUT,                                 GTK_STOCK_CUT)
+    ART(wxART_PASTE,                               GTK_STOCK_PASTE)
+    ART(wxART_DELETE,                              GTK_STOCK_DELETE)
+
+    ART(wxART_UNDO,                                GTK_STOCK_UNDO)
+    ART(wxART_REDO,                                GTK_STOCK_REDO)
+
+    ART(wxART_QUIT,                                GTK_STOCK_QUIT)
+
+    ART(wxART_FIND,                                GTK_STOCK_FIND)
+    ART(wxART_FIND_AND_REPLACE,                    GTK_STOCK_FIND_AND_REPLACE)

 #endif
     
     return NULL;
 #endif
     
     return NULL;

diff --git a/src/gtk1/artgtk.cpp b/src/gtk1/artgtk.cpp
index a33fd455adcf12f66ff4dda5d81ffc556282fe64..209c58e6748d19ce4ae4acac89c1b960b3a335af 100644 (file)
--- a/src/gtk1/artgtk.cpp
+++ b/src/gtk1/artgtk.cpp
@@ -102,6 +102,22 @@ static const char *wxArtIDToStock(const wxArtID& id)
     ART(wxART_CDROM,                               GTK_STOCK_CDROM)
     ART(wxART_HARDDISK,                            GTK_STOCK_HARDDISK)
     ART(wxART_REMOVABLE,                           GTK_STOCK_HARDDISK)
     ART(wxART_CDROM,                               GTK_STOCK_CDROM)
     ART(wxART_HARDDISK,                            GTK_STOCK_HARDDISK)
     ART(wxART_REMOVABLE,                           GTK_STOCK_HARDDISK)

+
+    ART(wxART_FILE_SAVE,                           GTK_STOCK_SAVE)
+    ART(wxART_FILE_SAVE_AS,                        GTK_STOCK_SAVE_AS)
+
+    ART(wxART_COPY,                                GTK_STOCK_COPY)
+    ART(wxART_CUT,                                 GTK_STOCK_CUT)
+    ART(wxART_PASTE,                               GTK_STOCK_PASTE)
+    ART(wxART_DELETE,                              GTK_STOCK_DELETE)
+
+    ART(wxART_UNDO,                                GTK_STOCK_UNDO)
+    ART(wxART_REDO,                                GTK_STOCK_REDO)
+
+    ART(wxART_QUIT,                                GTK_STOCK_QUIT)
+
+    ART(wxART_FIND,                                GTK_STOCK_FIND)
+    ART(wxART_FIND_AND_REPLACE,                    GTK_STOCK_FIND_AND_REPLACE)

 #endif
     
     return NULL;
 #endif
     
     return NULL;