Tool layout item.
*/
-class WXFL_DECLSPEC wxToolLayoutItem : public wxObject
+class WXDLLIMPEXP_FL wxToolLayoutItem : public wxObject
{
DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)
bool mIsSeparator;
};
-class WXFL_DECLSPEC wxDynToolInfo;
+class WXDLLIMPEXP_FL wxDynToolInfo;
typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
typedef wxDynToolInfo* wxDynToolInfoPtrT;
-WXFL_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT );
-WXFL_DEFINE_ARRAY( wxDynToolInfoPtrT, wxDynToolInfoArrayT );
+WXFL_DEFINE_ARRAY_NO_PTR( wxToolLayoutItemPtrT, wxLayoutItemArrayT );
+WXFL_DEFINE_ARRAY_NO_PTR( wxDynToolInfoPtrT, wxDynToolInfoArrayT );
/*
This is a base class for layout algorithm implementations.
*/
-class WXFL_DECLSPEC LayoutManagerBase
+class WXDLLIMPEXP_FL LayoutManagerBase
{
public:
// Constructor.
top to bottom.
*/
-class WXFL_DECLSPEC BagLayout : public LayoutManagerBase
+class WXDLLIMPEXP_FL BagLayout : public LayoutManagerBase
{
public:
// Constructor.
This class holds dynamic toolbar item information.
*/
-class WXFL_DECLSPEC wxDynToolInfo : public wxToolLayoutItem
+class WXDLLIMPEXP_FL wxDynToolInfo : public wxToolLayoutItem
{
DECLARE_DYNAMIC_CLASS(wxDynToolInfo)
wxDynamicToolBar manages containment and layout of tool windows.
*/
-class WXFL_DECLSPEC wxDynamicToolBar : public wxToolBarBase
+class WXDLLIMPEXP_FL wxDynamicToolBar : public wxToolBarBase
{
protected:
friend class wxDynamicToolBarSerializer;
virtual void AddTool( int toolIndex,
const wxString& imageFileName,
wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
- const wxString& labelText = "", bool alignTextRight = FALSE,
+ const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
bool isFlat = TRUE );
// Adds a tool. See the documentation for wxToolBar for details.
virtual void AddTool( int toolIndex, wxBitmap labelBmp,
- const wxString& labelText = "", bool alignTextRight = FALSE,
+ const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
bool isFlat = TRUE );
// Method from wxToolBarBase (for compatibility), only
virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
- const wxString& helpString1 = "", const wxString& helpString2 = "");
+ const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
// Adds a separator. See the documentation for wxToolBar for details.