ignore these

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

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index 82201b78d8f1bc037e206d331133866bbafd15cf..accd6148a72652976ec7b6de14bf424831ea3790 100644 (file)
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -5,21 +5,22 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TBARMSWH__
-#define __TBARMSWH__
+#ifndef _WX_TBARMSW_H_
+#define _WX_TBARMSW_H_
 
 #ifdef __GNUG__
 #pragma interface "tbarmsw.h"
 #endif
 
-#if USE_BUTTONBAR && USE_TOOLBAR
+#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
+
 #include "wx/tbarbase.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr;
 
 class WXDLLEXPORT wxMemoryDC;
 
@@ -54,7 +55,7 @@ public:
   // If toggle is TRUE, the button toggles between the two states.
   wxToolBarTool *AddTool(int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
                bool toggle = FALSE, long xPos = -1, long yPos = -1, wxObject *clientData = NULL,
-               const wxString& helpString1 = "", const wxString& helpString2 = "");
+               const wxString& helpString1 = wxEmptyString, const wxString& helpString2 = wxEmptyString);
 
   void DrawTool(wxDC& dc, wxMemoryDC& memDc, wxToolBarTool *tool);
 
@@ -65,7 +66,7 @@ public:
   // 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; };
@@ -118,6 +119,6 @@ DECLARE_EVENT_TABLE()
 #define wxTBSTATE_HIDDEN          0x08    // button is hidden
 #define wxTBSTATE_INDETERMINATE   0x10    // button is indeterminate
 
-#endif // USE_TOOL/BUTTONBAR
+#endif // wxUSE_TOOL/BUTTONBAR
 #endif
-    // __TBARMSWH__
+    // _WX_TBARMSW_H_