X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81d66cf39f810503baed79213bc3122fda0ccc7b..9a29912f608e082001ee53b9873323c4bcd71f21:/include/wx/tbarbase.h?ds=sidebyside diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index 78d0ab10fd..d23a8c2158 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -9,17 +9,16 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __TBARBASEH__ -#define __TBARBASEH__ +#ifndef _WX_TBARBASE_H_ +#define _WX_TBARBASE_H_ #ifdef __GNUG__ #pragma interface "tbarbase.h" #endif +#include "wx/setup.h" #include "wx/defs.h" -#if USE_TOOLBAR - #include "wx/bitmap.h" #include "wx/list.h" #include "wx/control.h" @@ -37,7 +36,7 @@ class WXDLLEXPORT wxToolBarTool: public wxObject public: wxToolBarTool(int theIndex = 0, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap, bool toggle = FALSE, long xPos = -1, long yPos = -1, - const wxString& shortHelpString = "", const wxString& longHelpString = ""); + const wxString& shortHelpString = wxEmptyString, const wxString& longHelpString = wxEmptyString); ~wxToolBarTool (); inline void SetSize( long w, long h ) { m_width = w; m_height = h; } inline long GetWidth () const { return m_width; } @@ -87,7 +86,7 @@ class WXDLLEXPORT wxToolBarBase : public wxControl // If toggle is TRUE, the button toggles between the two states. virtual 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); virtual void AddSeparator(void); virtual void ClearTools(void); @@ -194,7 +193,7 @@ class WXDLLEXPORT wxToolBarBase : public wxControl // Required to force normal cursor-setting behaviour in Windows #ifdef __WXMSW__ - virtual void MSWOnMouseMove(int x, int y, const WXUINT flags); + virtual void MSWOnMouseMove(int x, int y, WXUINT flags); #endif protected: @@ -239,7 +238,6 @@ public: DECLARE_EVENT_TABLE() }; -#endif // USE_TOOLBAR #endif - // __TBARBASEH__ + // _WX_TBARBASE_H_