minor fixes for mingw32 compilation

[wxWidgets.git] / include / wx / msw / tbarmsw.h

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index 5ce62ea20d38c53ba8a128830aa38bc7b5358fb0..accd6148a72652976ec7b6de14bf424831ea3790 100644 (file)
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -17,9 +17,10 @@
 #endif
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
 #endif
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR

+

 #include "wx/tbarbase.h"
 
 #include "wx/tbarbase.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxButtonBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr;

 
 class WXDLLEXPORT wxMemoryDC;
 
 
 class WXDLLEXPORT wxMemoryDC;
 


@@ -65,7 +66,7 @@ public:
   // The button size is bigger than the bitmap size
   wxSize GetToolSize(void) const;
 
   // The button size is bigger than the bitmap size
   wxSize GetToolSize(void) const;
 

-  void Layout(void);
+  void LayoutTools();

 
   // The post-tool-addition call
   bool Realize() { Layout(); return TRUE; };
 
   // The post-tool-addition call
   bool Realize() { Layout(); return TRUE; };