Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ported rest of contrib to bakefile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-03 17:11:53 +00:00
parent 1dbdb45df5
commit 15e8daecf5
78 changed files with 8434 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/include/wx/deprecated/prop.h
View File

@@ -43,7 +43,7 @@ class wxPropertyValidatorRegistry;
#define wxPROPERTY_VERSION 2.0
// A storable sheet of values
class WXDLLEXPORT wxPropertySheet: public wxObject
class WXDLLIMPEXP_DEPRECATED wxPropertySheet: public wxObject
{
public:
wxPropertySheet(const wxString& name = wxT(""));
@@ -91,7 +91,7 @@ private:
// Base class for property sheet views. There are currently two directly derived
// classes: wxPropertyListView, and wxPropertyFormView.
class WXDLLEXPORT wxPropertyView: public wxEvtHandler
class WXDLLIMPEXP_DEPRECATED wxPropertyView: public wxEvtHandler
{
public:
wxPropertyView(long flags = 0);
@@ -131,7 +131,7 @@ private:
};
class WXDLLEXPORT wxPropertyValidator: public wxEvtHandler
class WXDLLIMPEXP_DEPRECATED wxPropertyValidator: public wxEvtHandler
{
public:
wxPropertyValidator(long flags = 0);
@@ -161,7 +161,7 @@ private:
// extern wxPropertyValidator *wxDefaultPropertyValidator;
class WXDLLEXPORT wxPropertyValidatorRegistry: public wxHashTable
class WXDLLIMPEXP_DEPRECATED wxPropertyValidatorRegistry: public wxHashTable
{
public:
wxPropertyValidatorRegistry();
@@ -192,7 +192,7 @@ typedef enum {
wxPropertyValueStringPtr
} wxPropertyValueType;
class WXDLLEXPORT wxPropertyValue: public wxObject
class WXDLLIMPEXP_DEPRECATED wxPropertyValue: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxPropertyValue)
@@ -307,7 +307,7 @@ class WXDLLEXPORT wxPropertyValue: public wxObject
* Property class: contains a name and a value.
*/
class WXDLLEXPORT wxProperty: public wxObject
class WXDLLIMPEXP_DEPRECATED wxProperty: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxProperty)
protected:

20
contrib/include/wx/deprecated/propform.h
View File

@@ -23,7 +23,7 @@
#include "wx/deprecated/prop.h"
#include "wx/panel.h"
class WXDLLEXPORT wxPropertyFormView;
class WXDLLIMPEXP_DEPRECATED wxPropertyFormView;
////
//// Property form classes: for using an existing dialog or panel
@@ -33,7 +33,7 @@ class WXDLLEXPORT wxPropertyFormView;
#define wxID_PROP_UPDATE 3101
// Mediates between a physical panel and the property sheet
class WXDLLEXPORT wxPropertyFormView: public wxPropertyView
class WXDLLIMPEXP_DEPRECATED wxPropertyFormView: public wxPropertyView
{
DECLARE_DYNAMIC_CLASS(wxPropertyFormView)
public:
@@ -120,7 +120,7 @@ DECLARE_EVENT_TABLE()
* assocated with a window. It's that kinda thing.
*/
class WXDLLEXPORT wxPropertyFormValidator: public wxPropertyValidator
class WXDLLIMPEXP_DEPRECATED wxPropertyFormValidator: public wxPropertyValidator
{
DECLARE_DYNAMIC_CLASS(wxPropertyFormValidator)
protected:
@@ -161,7 +161,7 @@ private:
* Some default validators
*/
class WXDLLEXPORT wxRealFormValidator: public wxPropertyFormValidator
class WXDLLIMPEXP_DEPRECATED wxRealFormValidator: public wxPropertyFormValidator
{
DECLARE_DYNAMIC_CLASS(wxRealFormValidator)
public:
@@ -182,7 +182,7 @@ class WXDLLEXPORT wxRealFormValidator: public wxPropertyFormValidator
float m_realMax;
};
class WXDLLEXPORT wxIntegerFormValidator: public wxPropertyFormValidator
class WXDLLIMPEXP_DEPRECATED wxIntegerFormValidator: public wxPropertyFormValidator
{
DECLARE_DYNAMIC_CLASS(wxIntegerFormValidator)
public:
@@ -202,7 +202,7 @@ class WXDLLEXPORT wxIntegerFormValidator: public wxPropertyFormValidator
long m_integerMax;
};
class WXDLLEXPORT wxBoolFormValidator: public wxPropertyFormValidator
class WXDLLIMPEXP_DEPRECATED wxBoolFormValidator: public wxPropertyFormValidator
{
DECLARE_DYNAMIC_CLASS(wxBoolFormValidator)
protected:
@@ -217,7 +217,7 @@ class WXDLLEXPORT wxBoolFormValidator: public wxPropertyFormValidator
bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
};
class WXDLLEXPORT wxStringFormValidator: public wxPropertyFormValidator
class WXDLLIMPEXP_DEPRECATED wxStringFormValidator: public wxPropertyFormValidator
{
DECLARE_DYNAMIC_CLASS(wxStringFormValidator)
public:
@@ -241,7 +241,7 @@ class WXDLLEXPORT wxStringFormValidator: public wxPropertyFormValidator
* A default dialog box class to use.
*/
class WXDLLEXPORT wxPropertyFormDialog: public wxDialog
class WXDLLIMPEXP_DEPRECATED wxPropertyFormDialog: public wxDialog
{
public:
wxPropertyFormDialog(wxPropertyFormView *v = NULL,
@@ -270,7 +270,7 @@ private:
* A default panel class to use.
*/
class WXDLLEXPORT wxPropertyFormPanel: public wxPanel
class WXDLLIMPEXP_DEPRECATED wxPropertyFormPanel: public wxPanel
{
public:
wxPropertyFormPanel(wxPropertyFormView *v = NULL,
@@ -301,7 +301,7 @@ private:
* A default frame class to use.
*/
class WXDLLEXPORT wxPropertyFormFrame: public wxFrame
class WXDLLIMPEXP_DEPRECATED wxPropertyFormFrame: public wxFrame
{
public:
wxPropertyFormFrame(wxPropertyFormView *v = NULL,

26
contrib/include/wx/deprecated/proplist.h
View File

@@ -78,7 +78,7 @@
#define wxID_PROP_VALUE_SELECT 3005
// Mediates between a physical panel and the property sheet
class WXDLLEXPORT wxPropertyListView: public wxPropertyView
class WXDLLIMPEXP_DEPRECATED wxPropertyListView: public wxPropertyView
{
public:
wxPropertyListView(wxPanel *propPanel = NULL, long flags = wxPROP_BUTTON_DEFAULT);
@@ -195,7 +195,7 @@ private:
{ wxPropertyView::ShowView(propertySheet, window); };
};
class WXDLLEXPORT wxPropertyTextEdit: public wxTextCtrl
class WXDLLIMPEXP_DEPRECATED wxPropertyTextEdit: public wxTextCtrl
{
public:
wxPropertyTextEdit(wxPropertyListView *v = NULL,
@@ -222,7 +222,7 @@ private:
* The type of validator used for property lists (Visual Basic style)
*/
class WXDLLEXPORT wxPropertyListValidator: public wxPropertyValidator
class WXDLLIMPEXP_DEPRECATED wxPropertyListValidator: public wxPropertyValidator
{
public:
wxPropertyListValidator(long flags = wxPROP_ALLOW_TEXT_EDITING): wxPropertyValidator(flags) { }
@@ -285,7 +285,7 @@ private:
* A default dialog box class to use.
*/
class WXDLLEXPORT wxPropertyListDialog: public wxDialog
class WXDLLIMPEXP_DEPRECATED wxPropertyListDialog: public wxDialog
{
public:
wxPropertyListDialog(wxPropertyListView *v = NULL,
@@ -315,7 +315,7 @@ private:
* A default panel class to use.
*/
class WXDLLEXPORT wxPropertyListPanel: public wxPanel
class WXDLLIMPEXP_DEPRECATED wxPropertyListPanel: public wxPanel
{
public:
wxPropertyListPanel(wxPropertyListView *v = NULL,
@@ -352,7 +352,7 @@ private:
* A default frame class to use.
*/
class WXDLLEXPORT wxPropertyListFrame: public wxFrame
class WXDLLIMPEXP_DEPRECATED wxPropertyListFrame: public wxFrame
{
public:
wxPropertyListFrame(wxPropertyListView *v = NULL,
@@ -388,7 +388,7 @@ private:
* Some default validators
*/
class WXDLLEXPORT wxRealListValidator: public wxPropertyListValidator
class WXDLLIMPEXP_DEPRECATED wxRealListValidator: public wxPropertyListValidator
{
public:
// 0.0, 0.0 means no range
@@ -415,7 +415,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxRealListValidator)
};
class WXDLLEXPORT wxIntegerListValidator: public wxPropertyListValidator
class WXDLLIMPEXP_DEPRECATED wxIntegerListValidator: public wxPropertyListValidator
{
public:
// 0, 0 means no range
@@ -444,7 +444,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxIntegerListValidator)
};
class WXDLLEXPORT wxBoolListValidator: public wxPropertyListValidator
class WXDLLIMPEXP_DEPRECATED wxBoolListValidator: public wxPropertyListValidator
{
public:
wxBoolListValidator(long flags = 0):wxPropertyListValidator(flags) {}
@@ -472,7 +472,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxBoolListValidator)
};
class WXDLLEXPORT wxStringListValidator: public wxPropertyListValidator
class WXDLLIMPEXP_DEPRECATED wxStringListValidator: public wxPropertyListValidator
{
public:
wxStringListValidator(wxStringList *list = NULL, long flags = 0);
@@ -508,7 +508,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxStringListValidator)
};
class WXDLLEXPORT wxFilenameListValidator: public wxPropertyListValidator
class WXDLLIMPEXP_DEPRECATED wxFilenameListValidator: public wxPropertyListValidator
{
public:
wxFilenameListValidator(wxString message = wxT("Select a file"), wxString wildcard = wxALL_FILES_PATTERN, long flags = 0);
@@ -539,7 +539,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxFilenameListValidator)
};
class WXDLLEXPORT wxColourListValidator: public wxPropertyListValidator
class WXDLLIMPEXP_DEPRECATED wxColourListValidator: public wxPropertyListValidator
{
public:
wxColourListValidator(long flags = 0);
@@ -560,7 +560,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxColourListValidator)
};
class WXDLLEXPORT wxListOfStringsListValidator: public wxPropertyListValidator
class WXDLLIMPEXP_DEPRECATED wxListOfStringsListValidator: public wxPropertyListValidator
{
public:
wxListOfStringsListValidator(long flags = 0);

40
contrib/include/wx/deprecated/resource.h
View File

@@ -59,7 +59,7 @@ class WXDLLEXPORT wxInputStream;
* Internal format for control/panel item
*/
class WXDLLEXPORT wxItemResource: public wxObject
class WXDLLIMPEXP_DEPRECATED wxItemResource: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxItemResource)
@@ -139,7 +139,7 @@ class WXDLLEXPORT wxItemResource: public wxObject
* Resource table (normally only one of these)
*/
class WXDLLEXPORT wxResourceTable: public wxHashTable
class WXDLLIMPEXP_DEPRECATED wxResourceTable: public wxHashTable
{
DECLARE_DYNAMIC_CLASS(wxResourceTable)
@@ -169,37 +169,37 @@ class WXDLLEXPORT wxResourceTable: public wxHashTable
virtual void ClearTable();
};
WXDLLEXPORT extern void wxInitializeResourceSystem();
WXDLLEXPORT extern void wxCleanUpResourceSystem();
WXDLLIMPEXP_DEPRECATED extern void wxInitializeResourceSystem();
WXDLLIMPEXP_DEPRECATED extern void wxCleanUpResourceSystem();
WXDLLEXPORT_DATA(extern wxResourceTable*) wxDefaultResourceTable;
WXDLLEXPORT extern long wxParseWindowStyle(const wxString& style);
WXDLLIMPEXP_DATA_DEPRECATED(extern wxResourceTable*) wxDefaultResourceTable;
WXDLLIMPEXP_DEPRECATED extern long wxParseWindowStyle(const wxString& style);
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxBitmap;
class WXDLLEXPORT wxIcon;
WXDLLEXPORT extern wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLEXPORT extern wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLEXPORT extern wxMenuBar* wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL, wxMenuBar *menuBar = (wxMenuBar *) NULL);
WXDLLEXPORT extern wxMenu* wxResourceCreateMenu(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLEXPORT extern bool wxResourceParseData(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLEXPORT extern bool wxResourceParseData(const char* resource, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLEXPORT extern bool wxResourceParseFile(const wxString& filename, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLEXPORT extern bool wxResourceParseString(char* s, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLEXPORT extern bool wxResourceParseString(const wxString& s, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLEXPORT extern void wxResourceClear(wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern wxMenuBar* wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL, wxMenuBar *menuBar = (wxMenuBar *) NULL);
WXDLLIMPEXP_DEPRECATED extern wxMenu* wxResourceCreateMenu(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseData(const wxString& resource, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseData(const char* resource, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseFile(const wxString& filename, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseString(char* s, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern bool wxResourceParseString(const wxString& s, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern void wxResourceClear(wxResourceTable *table = (wxResourceTable *) NULL);
// Register XBM/XPM data
WXDLLEXPORT extern bool wxResourceRegisterBitmapData(const wxString& name, char bits[], int width, int height, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLEXPORT extern bool wxResourceRegisterBitmapData(const wxString& name, char **data, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern bool wxResourceRegisterBitmapData(const wxString& name, char bits[], int width, int height, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern bool wxResourceRegisterBitmapData(const wxString& name, char **data, wxResourceTable *table = (wxResourceTable *) NULL);
#define wxResourceRegisterIconData wxResourceRegisterBitmapData
/*
* Resource identifer code: #define storage
*/
WXDLLEXPORT extern bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLEXPORT extern int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *table = (wxResourceTable *) NULL);
WXDLLIMPEXP_DEPRECATED extern int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table = (wxResourceTable *) NULL);
// Used to be wxWindowBase::LoadFromResource
bool wxLoadFromResource(wxWindow* thisWindow, wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL);

24
contrib/include/wx/deprecated/setup.h
View File

@@ -26,12 +26,21 @@
#define wxUSE_TIMEDATE 0
// wxProperty[Value/Form/List] classes, used by Dialog Editor
#ifdef wxUSE_PROPSHEET
#undef wxUSE_PROPSHEET
#endif
#define wxUSE_PROPSHEET 1
// wxTreeLayout class
#ifdef wxUSE_TREELAYOUT
#undef wxUSE_TREELAYOUT
#endif
#define wxUSE_TREELAYOUT 1
// use wxExpr (a.k.a. PrologIO)
#ifdef wxUSE_PROLOGIO
#undef wxUSE_PROLOGIO
#endif
#define wxUSE_PROLOGIO 1
// Use .wxr resource mechanism (requires PrologIO library)
@@ -40,5 +49,20 @@
#endif
#define wxUSE_WX_RESOURCES 1
#ifdef WXMAKINGDLL_DEPRECATED
#define WXDLLIMPEXP_DEPRECATED WXEXPORT
#define WXDLLIMPEXP_DATA_DEPRECATED(type) WXEXPORT type
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_DEPRECATED WXIMPORT
#define WXDLLIMPEXP_DATA_DEPRECATED(type) WXIMPORT type
#else // not making nor using DLL
#define WXDLLIMPEXP_DEPRECATED
#define WXDLLIMPEXP_DATA_DEPRECATED(type) type
#endif
#endif
// _WX_DEPRECATED_SETUP_H_

6
contrib/include/wx/deprecated/treelay.h
View File

@@ -28,7 +28,7 @@ class wxMouseEvent;
#if wxUSE_TREELAYOUT
class WXDLLEXPORT wxTreeLayout: public wxObject
class WXDLLIMPEXP_DEPRECATED wxTreeLayout: public wxObject
{
public:
wxTreeLayout();
@@ -89,7 +89,7 @@ private:
DECLARE_ABSTRACT_CLASS(wxTreeLayout)
};
class WXDLLEXPORT wxStoredNode
class WXDLLIMPEXP_DEPRECATED wxStoredNode
{
public:
wxString m_name;
@@ -103,7 +103,7 @@ public:
* A version of wxTreeLayout with storage for nodes
*/
class WXDLLEXPORT wxTreeLayoutStored: public wxTreeLayout
class WXDLLIMPEXP_DEPRECATED wxTreeLayoutStored: public wxTreeLayout
{
public:
wxTreeLayoutStored(int noNodes = 200);

16
contrib/include/wx/deprecated/wxexpr.h
View File

@@ -52,7 +52,7 @@
// carry on processing.
typedef bool (*wxExprErrorHandler) (int errorType, char *msg);
WXDLLEXPORT_DATA(extern wxExprErrorHandler) currentwxExprErrorHandler;
WXDLLIMPEXP_DATA_DEPRECATED(extern wxExprErrorHandler) currentwxExprErrorHandler;
typedef enum {
@@ -64,9 +64,9 @@ typedef enum {
wxExprList
} wxExprType;
class WXDLLEXPORT wxExprDatabase;
class WXDLLIMPEXP_DEPRECATED wxExprDatabase;
class WXDLLEXPORT wxExpr
class WXDLLIMPEXP_DEPRECATED wxExpr
{
public:
wxObject *client_data;
@@ -196,7 +196,7 @@ class WXDLLEXPORT wxExpr
DECLARE_NO_COPY_CLASS(wxExpr)
};
class WXDLLEXPORT wxExprDatabase: public wxList
class WXDLLIMPEXP_DEPRECATED wxExprDatabase: public wxList
{
private:
wxNode *position; // Where we are in a search
@@ -262,7 +262,7 @@ private:
// Function call-style interface - some more convenience wrappers/unwrappers
// Make a call
WXDLLEXPORT wxExpr* wxExprMakeCall(const wxString& functor ...);
WXDLLIMPEXP_DEPRECATED wxExpr* wxExprMakeCall(const wxString& functor ...);
#define wxExprMakeInteger(x) (new wxExpr((long)x))
#define wxExprMakeReal(x) (new wxExpr((double)x))
@@ -271,13 +271,13 @@ WXDLLEXPORT wxExpr* wxExprMakeCall(const wxString& functor ...);
#define wxExprMake(x) (new wxExpr(x))
// Checks functor
WXDLLEXPORT bool wxExprIsFunctor(wxExpr *expr, const wxString& functor);
WXDLLIMPEXP_DEPRECATED bool wxExprIsFunctor(wxExpr *expr, const wxString& functor);
// Temporary variable for communicating between wxexpr.cpp and YACC/LEX
WXDLLEXPORT_DATA(extern wxExprDatabase*) thewxExprDatabase;
WXDLLIMPEXP_DATA_DEPRECATED(extern wxExprDatabase*) thewxExprDatabase;
// YACC/LEX can leave memory lying around...
extern "C" WXDLLEXPORT int wxExprCleanUp();
extern "C" WXDLLIMPEXP_DEPRECATED int wxExprCleanUp();
#endif // wxUSE_PROLOGIO