diff --git a/acconfig.h b/acconfig.h
index 83bad20185..ff06fcf9d3 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -253,6 +253,13 @@
  * Use this control
  */
 #define wxUSE_TOOLBAR 0
+
+#ifdef __WXWINE__
+  #if wxUSE_TOOLBAR
+    #define wxUSE_BUTTONBAR
+  #endif
+#endif
+
 /*
  * Use this control
  */
diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index ec1b270bd3..b752cc3c74 100644
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -82,7 +82,7 @@ class wxDllLoader
    static void * GetSymbol(wxDllType dllHandle, const wxString &name);
  private:
    /// forbid construction of objects
-   wxDllLoader() 
+   wxDllLoader();
 };
 
 // ----------------------------------------------------------------------------