Added wxART_CLOSE art id.

This id corresponds to the close button bitmap. Currently only wxGTK returns a
natively-looking button from here, MSW and OS X versions will be added later.

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

diff --git a/art/close.xpm b/art/close.xpm
new file mode 100644 (file)
index 0000000..d790302
--- /dev/null
+++ b/art/close.xpm
@@ -0,0 +1,16 @@
+/* XPM */
+static const char * const close_xpm[] = {
+"12 10 2 1",
+"         c None",
+"X        c black",
+"            ",
+"  XX    XX  ",
+"   XX  XX   ",
+"    XXXX    ",
+"     XX     ",
+"    XXXX    ",
+"   XX  XX   ",
+"  XX    XX  ",
+"            ",
+"            "};
+

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 75d0ff705f22144e6c0d0e13a00739e377e82b85..ba545c1b93e91cfac6ae4443af44c6160dd3b22a 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -101,6 +101,7 @@ typedef wxString wxArtID;
 #define wxART_UNDO                 wxART_MAKE_ART_ID(wxART_UNDO)
 #define wxART_REDO                 wxART_MAKE_ART_ID(wxART_REDO)
 
+#define wxART_CLOSE                wxART_MAKE_ART_ID(wxART_CLOSE)
 #define wxART_QUIT                 wxART_MAKE_ART_ID(wxART_QUIT)
 
 #define wxART_FIND                 wxART_MAKE_ART_ID(wxART_FIND)

diff --git a/interface/wx/artprov.h b/interface/wx/artprov.h
index 3701f3bdd51afb10d383a81ddfb35261fecec054..cc25af31ecc0f6ef513c1dfd160bc874c22930ab 100644 (file)
--- a/interface/wx/artprov.h
+++ b/interface/wx/artprov.h
@@ -108,6 +108,7 @@ typedef wxString wxArtID;
      @li wxART_PASTE
      @li wxART_UNDO
      @li wxART_REDO
+     @li wxART_CLOSE
      @li wxART_QUIT
      @li wxART_FIND
      @li wxART_FIND_AND_REPLACE

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index 7cd6a7df431a9719ce8a5dd87706750bc4def856..716189ecfb4a7cab5db3d4733cd44485b7ba3144 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -117,6 +117,7 @@ protected:
 #include "../../art/new.xpm"
 #include "../../art/undo.xpm"
 #include "../../art/redo.xpm"
+#include "../../art/close.xpm"
 #include "../../art/quit.xpm"
 #include "../../art/find.xpm"
 #include "../../art/findrepl.xpm"
@@ -175,6 +176,7 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
     ART(wxART_DELETE,                              delete)
     ART(wxART_UNDO,                                undo)
     ART(wxART_REDO,                                redo)
+    ART(wxART_CLOSE,                               close)
     ART(wxART_QUIT,                                quit)
     ART(wxART_FIND,                                find)
     ART(wxART_FIND_AND_REPLACE,                    findrepl)

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index db029ddb178810e50a71a035722137ed590531fe..d31eb8cd5f2a9e7d380fd3ce3c2262256d396fee 100644 (file)
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -113,6 +113,7 @@ wxString wxArtIDToStock(const wxArtID& id)
     ART(wxART_UNDO,                                GTK_STOCK_UNDO)
     ART(wxART_REDO,                                GTK_STOCK_REDO)
 
+    ART(wxART_CLOSE,                               GTK_STOCK_CLOSE)
     ART(wxART_QUIT,                                GTK_STOCK_QUIT)
 
     ART(wxART_FIND,                                GTK_STOCK_FIND)