wxUSE_SOCKETS added to setup(0).h; Cygwin corrections; doc tweaks

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

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index f39ee7bd71118f9e1537668864590084445e5a56..5ce62ea20d38c53ba8a128830aa38bc7b5358fb0 100644 (file)
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -16,7 +16,7 @@
 #pragma interface "tbarmsw.h"
 #endif
 
 #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;
 #include "wx/tbarbase.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxButtonBarNameStr;


@@ -54,7 +54,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,
   // 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);
 
 
   void DrawTool(wxDC& dc, wxMemoryDC& memDc, wxToolBarTool *tool);
 


@@ -118,6 +118,6 @@ DECLARE_EVENT_TABLE()
 #define wxTBSTATE_HIDDEN          0x08    // button is hidden
 #define wxTBSTATE_INDETERMINATE   0x10    // button is indeterminate
 
 #define wxTBSTATE_HIDDEN          0x08    // button is hidden
 #define wxTBSTATE_INDETERMINATE   0x10    // button is indeterminate
 

-#endif // USE_TOOL/BUTTONBAR
+#endif // wxUSE_TOOL/BUTTONBAR

 #endif
     // _WX_TBARMSW_H_
 #endif
     // _WX_TBARMSW_H_