Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation

[wxWidgets.git] / src / common / bmpbase.cpp

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 6405427cade3334c77f9c2224e55ef01b194088b..86a9341ee271ef8416be6a2d2aeee88d12048d9e 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -12,6 +12,15 @@
 #pragma implementation "bitmapbase.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if defined(__WXMGL__) || defined(__WXMAC__)
+
 #include "wx/wx.h"
 #include "wx/setup.h"
 #include "wx/utils.h"
@@ -102,8 +111,6 @@ void wxBitmapBase::CleanUpHandlers()
     }
 }
 
-
-
 class wxBitmapBaseModule: public wxModule
 {
 DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
@@ -114,3 +121,6 @@ public:
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
+
+#endif // defined(__WXMGL__) || defined(__WXMAC__)
+