compile fixes.

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

diff --git a/acconfig.h b/acconfig.h
index 83bad20185b192af0b639d9e65c1416fd0419973..ff06fcf9d375d763227d11824ea3167834cb5025 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -253,6 +253,13 @@
  * Use this control
  */
 #define wxUSE_TOOLBAR 0
  * Use this control
  */
 #define wxUSE_TOOLBAR 0

+
+#ifdef __WXWINE__
+  #if wxUSE_TOOLBAR
+    #define wxUSE_BUTTONBAR
+  #endif
+#endif
+

 /*
  * Use this control
  */
 /*
  * Use this control
  */

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index ec1b270bd320486bb00f519cf8e53061ff0e145e..b752cc3c748b2952ac9844e39892edc13d422250 100644 (file)
--- 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
    static void * GetSymbol(wxDllType dllHandle, const wxString &name);
  private:
    /// forbid construction of objects

-   wxDllLoader() 
+   wxDllLoader();

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------