A few more WINE fixes.

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

diff --git a/acconfig.h b/acconfig.h
index ff06fcf9d375d763227d11824ea3167834cb5025..0403199fb0f9bc6221f75ad03ace938fdea619f1 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -256,7 +256,7 @@
 
 #ifdef __WXWINE__
   #if wxUSE_TOOLBAR
-    #define wxUSE_BUTTONBAR
+    #define wxUSE_BUTTONBAR 1
   #endif
 #endif
 

diff --git a/configure.in b/configure.in
index fd9e0c5f96f56b2e189af38f1afd76de16da3226..ea21d2bdc30dd99b66043d63f9553131c029c41b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -932,6 +932,7 @@ if test "$wxUSE_WINE" = 1; then
     WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
     if test "$ac_find_includes" != "" ; then
         AC_MSG_RESULT(found $ac_find_includes)
+        TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
     else
         AC_MSG_RESULT(no)
         AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index 2d0de0c954bbd33100f610e71abdb11a74084b37..29b4dfece1dc8a00dd3fd527bd64a02817a534b1 100644 (file)
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -17,6 +17,7 @@
 #endif
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
+
 #include "wx/tbarbase.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxButtonBarNameStr;