merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,12 +18,13 @@
|
||||
|
||||
#include "wx/tbarbase.h"
|
||||
#include "wx/dynarray.h"
|
||||
#include "wx/fl/fldefs.h"
|
||||
|
||||
/*
|
||||
Tool layout item.
|
||||
*/
|
||||
|
||||
class wxToolLayoutItem : public wxObject
|
||||
class WXFL_DECLSPEC wxToolLayoutItem : public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)
|
||||
|
||||
@@ -32,19 +33,19 @@ public:
|
||||
bool mIsSeparator;
|
||||
};
|
||||
|
||||
class wxDynToolInfo;
|
||||
class WXFL_DECLSPEC wxDynToolInfo;
|
||||
|
||||
typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
|
||||
typedef wxDynToolInfo* wxDynToolInfoPtrT;
|
||||
|
||||
WX_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT );
|
||||
WX_DEFINE_ARRAY( wxDynToolInfoPtrT, wxDynToolInfoArrayT );
|
||||
WXFL_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT );
|
||||
WXFL_DEFINE_ARRAY( wxDynToolInfoPtrT, wxDynToolInfoArrayT );
|
||||
|
||||
/*
|
||||
This is a base class for layout algorithm implementations.
|
||||
*/
|
||||
|
||||
class LayoutManagerBase
|
||||
class WXFL_DECLSPEC LayoutManagerBase
|
||||
{
|
||||
public:
|
||||
// Constructor.
|
||||
@@ -63,7 +64,7 @@ BagLayout lays out items in left-to-right order from
|
||||
top to bottom.
|
||||
*/
|
||||
|
||||
class BagLayout : public LayoutManagerBase
|
||||
class WXFL_DECLSPEC BagLayout : public LayoutManagerBase
|
||||
{
|
||||
public:
|
||||
// Constructor.
|
||||
@@ -78,7 +79,7 @@ public:
|
||||
This class holds dynamic toolbar item information.
|
||||
*/
|
||||
|
||||
class wxDynToolInfo : public wxToolLayoutItem
|
||||
class WXFL_DECLSPEC wxDynToolInfo : public wxToolLayoutItem
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxDynToolInfo)
|
||||
|
||||
@@ -98,7 +99,7 @@ public:
|
||||
wxDynamicToolBar manages containment and layout of tool windows.
|
||||
*/
|
||||
|
||||
class wxDynamicToolBar : public wxToolBarBase
|
||||
class WXFL_DECLSPEC wxDynamicToolBar : public wxToolBarBase
|
||||
{
|
||||
protected:
|
||||
friend class wxDynamicToolBarSerializer;
|
||||
|
Reference in New Issue
Block a user