Added a few files; fixed some warnings and wxMotif compile problems

[wxWidgets.git] / src / msw / tbarmsw.cpp

diff --git a/src/msw/tbarmsw.cpp b/src/msw/tbarmsw.cpp
index 91bed87c4b7360e1afe63989ac735f67f69e4cd9..625cfafd027a263917451ac4d6b745b060d83f17 100644 (file)
--- a/src/msw/tbarmsw.cpp
+++ b/src/msw/tbarmsw.cpp
@@ -21,20 +21,25 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx.h"
+#include "wx/wx.h"

 #endif
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
 
 #endif
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
 

-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)

 #include "malloc.h"
 #endif
 
 #include "malloc.h"
 #endif
 

+#if !defined(__MWERKS__) && !defined(__SALFORDC__)

 #include <memory.h>
 #include <memory.h>

+#endif
+

 #include <stdlib.h>
 
 #include "wx/tbarmsw.h"
 #include <stdlib.h>
 
 #include "wx/tbarmsw.h"

+#include "wx/event.h"

 #include "wx/app.h"
 #include "wx/app.h"

+#include "wx/bitmap.h"

 #include "wx/msw/private.h"
 #include "wx/msw/dib.h"
 
 #include "wx/msw/private.h"
 #include "wx/msw/dib.h"
 


@@ -339,16 +344,15 @@ wxToolBarTool *wxToolBarMSW::AddTool(int index, const wxBitmap& bitmap, const wx
 
   // TODO: use the mapping code from wxToolBar95 to get it right in this class
 #if !defined(__WIN32__) && !defined(__WIN386__)
 
   // TODO: use the mapping code from wxToolBar95 to get it right in this class
 #if !defined(__WIN32__) && !defined(__WIN386__)

-  wxBitmap *bitmap2 = NULL;
+  wxBitmap bitmap2;

   if (toggle)
   {
   if (toggle)
   {

-    bitmap2 = new wxBitmap;
-    bitmap2->SetHBITMAP( (WXHBITMAP) CreateMappedBitmap(wxGetInstance(), (HBITMAP) ((wxBitmap& )bitmap).GetHBITMAP()));
+    bitmap2.SetHBITMAP( (WXHBITMAP) CreateMappedBitmap(wxGetInstance(), (HBITMAP) ((wxBitmap& )bitmap).GetHBITMAP()));

   }
 
   }
 

-  wxToolBarTool *tool = new wxToolBarTool(index, bitmap, *bitmap2, toggle, xPos, yPos, helpString1, helpString2);
+  wxToolBarTool *tool = new wxToolBarTool(index, bitmap, bitmap2, toggle, xPos, yPos, helpString1, helpString2);

 #else
 #else

-  wxToolBarTool *tool = new wxToolBarTool(index, bitmap, (wxBitmap *)NULL, toggle, xPos, yPos, helpString1, helpString2);
+  wxToolBarTool *tool = new wxToolBarTool(index, bitmap, wxNullBitmap, toggle, xPos, yPos, helpString1, helpString2);

 #endif
 
   tool->m_clientData = clientData;
 #endif
 
   tool->m_clientData = clientData;