Applied patch [ 623736 ] Build and use FL as DLL
This patch allows FL to be build as a DLL with the VC project files, I was only able to at chief it with the VC projects because the make file for building libs doesn't have any rule to build DLLs (at least I didn't see how to do it). However the FL demo applications can be build using FL in DLL form with MSVC project files and VC make files (as mentioned before the FL DLL it self can only be build using VC projects). This patch includes 2 files; 1 to change current FL files to work in DLL form and 1 extra include file that needs to be added in the FL include directory. Small note: if you want to use FL as a DLL you need to use wxWin as a DLL. Thanks, Hans. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17618 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