Presumably someone didn't mean to commit that wxUSE_XPM_IN_MSW change...

Added wxID_SELECTALL

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f8b01d2c3337f407251e7736f43cb67689dcd187..bde33b9841290730b05325c8be9cdee2ba25929d 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -836,6 +836,7 @@ enum {
 #define wxID_CLEAR              5033
 #define wxID_FIND               5034
 #define wxID_DUPLICATE          5035
+#define wxID_SELECTALL          5036
 
 #define wxID_FILE1              5050
 #define wxID_FILE2              5051

diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
index 323da349252c14a6993c1db976414ad78a617851..b46d01b5efdc4c2935e25e861e5ef9c1a1c7996a 100644 (file)
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -79,7 +79,7 @@
 #define wxUSE_SCROLLBAR   1
                                     // Define 1 to compile contributed wxScrollBar class
 #define wxUSE_XPM_IN_X    1
-#define wxUSE_XPM_IN_MSW  1
+#define wxUSE_XPM_IN_MSW  0
                                     // Define 1 to support the XPM package in wxBitmap,
                                     // separated by platform. If 1, you must link in
                                     // the XPM library to your applications.