added wxUSE_TOOLBAR_SIMPLE setting, enabled wxLongLong in configure by default

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

diff --git a/configure b/configure
index 448318debc10e665bdc094d7ee39541d07134eec..681e4c55676d26c18d6df88a1d03f5cc62caaca5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1349,7 +1349,7 @@ else
   DEFAULT_wxUSE_SERIAL=yes
   DEFAULT_wxUSE_JOYSTICK=yes
   DEFAULT_wxUSE_DYNLIB_CLASS=yes
-  DEFAULT_wxUSE_LONGLONG=no
+  DEFAULT_wxUSE_LONGLONG=yes
 
   DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=yes
   DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes

diff --git a/configure.in b/configure.in
index 9a9b0e2c882eb9376b00fe92dd1e22b7fcfb24c8..6f8012d999637da637fcb58ac9c8c40f135913ff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -754,7 +754,7 @@ else
   DEFAULT_wxUSE_SERIAL=yes
   DEFAULT_wxUSE_JOYSTICK=yes
   DEFAULT_wxUSE_DYNLIB_CLASS=yes
-  DEFAULT_wxUSE_LONGLONG=no
+  DEFAULT_wxUSE_LONGLONG=yes
 
   DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=yes
   DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 6e207d34cf970668b6088798e5652684750f8b13..6c0d6b4b0793beb68d575000f4128bb0187b72bd 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -310,6 +310,9 @@
 // text entry dialog and wxGetTextFromUser function
 #define wxUSE_TEXTDLG 1
 
+// use generic wxToolBar class instead of the native one?
+#define wxUSE_TOOLBAR 0
+
 // wxToolBar class
 #define wxUSE_TOOLBAR 1
 

diff --git a/setup.h.in b/setup.h.in
index 1cb2cf005cb2341b74bf0ffec4af4bdc7e1ae0be..932c30459c2ba9bdade4b9cd20c222bf06a1c276 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -307,6 +307,12 @@
 #define wxUSE_TAB_DIALOG 0
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
+
+/*
+ * Use generic wxToolBar instead of the native one?
+ */
+#define wxUSE_TOOLBAR_SIMPLE 0
+
 /*
  * Use this control
  */