Merge in from trunk r68684 - r69046

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@69047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-09-10 15:09:22 +00:00
283 changed files with 12986 additions and 1945 deletions

View File

@@ -53,9 +53,6 @@
byte first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
/* Define this if your version of GTK+ is greater than 1.2 */
#undef __WXGTK12__
/* Define this if your version of GTK+ is greater than 1.2.7 */
#undef __WXGTK127__
@@ -371,6 +368,7 @@
#define wxUSE_TIPWINDOW 0
#define wxUSE_ANIMATIONCTRL 0
#define wxUSE_BANNERWINDOW 0
#define wxUSE_BUTTON 0
#define wxUSE_BMPBUTTON 0
#define wxUSE_CALENDARCTRL 0
@@ -408,6 +406,7 @@
#define wxUSE_TEXTCTRL 0
#define wxUSE_TOGGLEBTN 0
#define wxUSE_TREECTRL 0
#define wxUSE_TREELISTCTRL 0
#define wxUSE_STATUSBAR 0