From b685cd9bc8c23ead79c462965a8ca9f6f81f9734 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 14 Dec 1999 18:49:54 +0000
Subject: [PATCH] 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
---
 configure               | 2 +-
 configure.in            | 2 +-
 include/wx/msw/setup0.h | 3 +++
 setup.h.in              | 6 ++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 448318debc..681e4c5567 100755
--- 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 9a9b0e2c88..6f8012d999 100644
--- 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 6e207d34cf..6c0d6b4b07 100644
--- 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 1cb2cf005c..932c30459c 100644
--- 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
  */
-- 
2.50.0