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

5
contrib/include/wx/mmedia/cdbase.h
View File

@@ -16,18 +16,19 @@
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/mmedia/defs.h"
typedef struct wxCDtime {
wxUint8 track;
wxUint8 hour, min, sec;
} wxCDtime;
class WXDLLEXPORT wxCDAudio : public wxObject {
class WXDLLIMPEXP_MMEDIA wxCDAudio : public wxObject {
DECLARE_ABSTRACT_CLASS(wxCDAudio)
public:
typedef enum { PLAYING, PAUSED, STOPPED } CDstatus;
// Table of contents manager
class WXDLLEXPORT CDtoc {
class WXDLLIMPEXP_MMEDIA CDtoc {
protected:
wxCDtime *tracks_time, *tracks_pos;
wxCDtime total_time;

3
contrib/include/wx/mmedia/cdunix.h
View File

@@ -17,10 +17,11 @@
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/string.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/cdbase.h"
///
class WXDLLEXPORT wxCDAudioLinux : public wxCDAudio {
class WXDLLIMPEXP_MMEDIA wxCDAudioLinux : public wxCDAudio {
DECLARE_DYNAMIC_CLASS(wxCDAudioLinux)
protected:
wxCDtime m_time;

3
contrib/include/wx/mmedia/cdwin.h
View File

@@ -15,6 +15,7 @@
#endif
#include "wx/wxprec.h"
#include "wx/mmedia/defs.h"
#include "cdbase.h"
#ifdef WXMMEDIA_INTERNAL
@@ -26,7 +27,7 @@ typedef struct CDAW_Internal {
#endif
///
class WXDLLEXPORT wxCDAudioWin : public wxCDAudio {
class WXDLLIMPEXP_MMEDIA wxCDAudioWin : public wxCDAudio {
DECLARE_DYNAMIC_CLASS(wxCDAudioWin)
protected:
struct CDAW_Internal *m_internal;

15
contrib/include/wx/mmedia/defs.h Normal file
View File

@@ -0,0 +1,15 @@
#ifndef _WX_MMEDIA_DEFS_H_
#define _WX_MMEDIA_DEFS_H_
#ifdef WXMAKINGDLL_MMEDIA
#define WXDLLIMPEXP_MMEDIA WXEXPORT
#define WXDLLIMPEXP_DATA_MMEDIA(type) WXEXPORT type
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_MMEDIA WXIMPORT
#define WXDLLIMPEXP_DATA_MMEDIA(type) WXIMPORT type
#else // not making nor using DLL
#define WXDLLIMPEXP_MMEDIA
#define WXDLLIMPEXP_DATA_MMEDIA(type) type
#endif
#endif // _WX_MMEDIA_DEFS_H_

3
contrib/include/wx/mmedia/sndaiff.h
View File

@@ -14,6 +14,7 @@
#include "wx/defs.h"
#include "wx/stream.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/sndbase.h"
#include "wx/mmedia/sndcodec.h"
#include "wx/mmedia/sndfile.h"
@@ -22,7 +23,7 @@
// AIFF codec
//
class WXDLLEXPORT wxSoundAiff: public wxSoundFileStream {
class WXDLLIMPEXP_MMEDIA wxSoundAiff: public wxSoundFileStream {
public:
wxSoundAiff(wxInputStream& stream, wxSoundStream& io_sound);
wxSoundAiff(wxOutputStream& stream, wxSoundStream& io_sound);

7
contrib/include/wx/mmedia/sndbase.h
View File

@@ -13,6 +13,7 @@
#endif
#include "wx/defs.h"
#include "wx/mmedia/defs.h"
// ------------------------------------------------------------------------
// DEFINITIONS
@@ -76,7 +77,7 @@ typedef enum {
wxSOUND_NOTSTARTED
} wxSoundError;
class WXDLLEXPORT wxSoundStream;
class WXDLLIMPEXP_MMEDIA wxSoundStream;
// ---------------------
// wxSoundCallback(stream, evt, cdata): C callback for sound event.
@@ -92,7 +93,7 @@ typedef void (*wxSoundCallback)(wxSoundStream *stream, int evt,
// Base class for sound format specification
//
class WXDLLEXPORT wxSoundFormatBase {
class WXDLLIMPEXP_MMEDIA wxSoundFormatBase {
public:
wxSoundFormatBase();
virtual ~wxSoundFormatBase();
@@ -112,7 +113,7 @@ class WXDLLEXPORT wxSoundFormatBase {
// Base class for sound streams
//
class WXDLLEXPORT wxSoundStream {
class WXDLLIMPEXP_MMEDIA wxSoundStream {
public:
wxSoundStream();
virtual ~wxSoundStream();

3
contrib/include/wx/mmedia/sndcodec.h
View File

@@ -13,9 +13,10 @@
#endif
#include "wx/defs.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/sndbase.h"
class WXDLLEXPORT wxSoundStreamCodec: public wxSoundStream {
class WXDLLIMPEXP_MMEDIA wxSoundStreamCodec: public wxSoundStream {
public:
wxSoundStreamCodec(wxSoundStream& snd_io);
~wxSoundStreamCodec();

3
contrib/include/wx/mmedia/sndcpcm.h
View File

@@ -13,6 +13,7 @@
#endif
#include "wx/defs.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/sndbase.h"
#include "wx/mmedia/sndcodec.h"
@@ -20,7 +21,7 @@
// PCM converter class
//
class WXDLLEXPORT wxSoundStreamPcm: public wxSoundStreamCodec {
class WXDLLIMPEXP_MMEDIA wxSoundStreamPcm: public wxSoundStreamCodec {
public:
typedef void (*ConverterType)(const void *buf_in, void *buf_out,
wxUint32 len);

1
contrib/include/wx/mmedia/sndesd.h
View File

@@ -14,6 +14,7 @@
#include "wx/defs.h"
#include "wx/string.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/sndbase.h"
#include "wx/mmedia/sndpcm.h"

3
contrib/include/wx/mmedia/sndfile.h
View File

@@ -10,6 +10,7 @@
#include "wx/defs.h"
#include "wx/stream.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/sndbase.h"
#include "wx/mmedia/sndcodec.h"
@@ -19,7 +20,7 @@
// Codec router class
//
class WXDLLEXPORT wxSoundRouterStream: public wxSoundStreamCodec {
class WXDLLIMPEXP_MMEDIA wxSoundRouterStream: public wxSoundStreamCodec {
public:
wxSoundRouterStream(wxSoundStream& sndio);
~wxSoundRouterStream();

7
contrib/include/wx/mmedia/sndg72x.h
View File

@@ -13,6 +13,7 @@
#endif
#include "wx/defs.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/sndbase.h"
#include "wx/mmedia/sndcodec.h"
#include "wx/mmedia/sndbase.h"
@@ -29,7 +30,7 @@ typedef struct g72x_state g72state;
//
// G72X format
//
class WXDLLEXPORT wxSoundFormatG72X: public wxSoundFormatBase {
class WXDLLIMPEXP_MMEDIA wxSoundFormatG72X: public wxSoundFormatBase {
public:
wxSoundFormatG72X();
~wxSoundFormatG72X();
@@ -57,8 +58,8 @@ class WXDLLEXPORT wxSoundFormatG72X: public wxSoundFormatBase {
// ULAW converter class
//
class WXDLLEXPORT wxSoundRouterStream;
class WXDLLEXPORT wxSoundStreamG72X: public wxSoundStreamCodec {
class WXDLLIMPEXP_MMEDIA wxSoundRouterStream;
class WXDLLIMPEXP_MMEDIA wxSoundStreamG72X: public wxSoundStreamCodec {
public:
wxSoundStreamG72X(wxSoundStream& sndio);
~wxSoundStreamG72X();

7
contrib/include/wx/mmedia/sndmsad.h
View File

@@ -14,6 +14,7 @@
#include "wx/defs.h"
#include "wx/dynarray.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/sndcodec.h"
#include "wx/mmedia/sndbase.h"
@@ -22,7 +23,7 @@ WX_DEFINE_EXPORTED_ARRAY_INT(wxInt16, wxMSAdpcmCoeffs);
//
// MSADPCM format
//
class WXDLLEXPORT wxSoundFormatMSAdpcm: public wxSoundFormatBase {
class WXDLLIMPEXP_MMEDIA wxSoundFormatMSAdpcm: public wxSoundFormatBase {
public:
wxSoundFormatMSAdpcm();
~wxSoundFormatMSAdpcm();
@@ -58,8 +59,8 @@ protected:
//
// MS ADPCM converter class
//
class WXDLLEXPORT wxSoundRouterStream;
class WXDLLEXPORT wxSoundStreamMSAdpcm: public wxSoundStreamCodec {
class WXDLLIMPEXP_MMEDIA wxSoundRouterStream;
class WXDLLIMPEXP_MMEDIA wxSoundStreamMSAdpcm: public wxSoundStreamCodec {
public:
wxSoundStreamMSAdpcm(wxSoundStream& sndio);
~wxSoundStreamMSAdpcm();

3
contrib/include/wx/mmedia/sndoss.h
View File

@@ -14,6 +14,7 @@
#include "wx/defs.h"
#include "wx/string.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/sndbase.h"
#include "wx/mmedia/sndpcm.h"
@@ -21,7 +22,7 @@
// OSS output class
//
class WXDLLEXPORT wxSoundStreamOSS : public wxSoundStream {
class WXDLLIMPEXP_MMEDIA wxSoundStreamOSS : public wxSoundStream {
public:
wxSoundStreamOSS(const wxString& dev_name = wxT("/dev/dsp"));
~wxSoundStreamOSS();

1
contrib/include/wx/mmedia/sndpcm.h
View File

@@ -13,6 +13,7 @@
#endif
#include "wx/defs.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/sndbase.h"
//

7
contrib/include/wx/mmedia/sndulaw.h
View File

@@ -13,13 +13,14 @@
#endif
#include "wx/defs.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/sndcodec.h"
#include "wx/mmedia/sndbase.h"
//
// ULAW format
//
class WXDLLEXPORT wxSoundFormatUlaw: public wxSoundFormatBase {
class WXDLLIMPEXP_MMEDIA wxSoundFormatUlaw: public wxSoundFormatBase {
public:
wxSoundFormatUlaw();
~wxSoundFormatUlaw();
@@ -47,8 +48,8 @@ protected:
// ULAW converter class
//
class WXDLLEXPORT wxSoundRouterStream;
class WXDLLEXPORT wxSoundStreamUlaw: public wxSoundStreamCodec {
class WXDLLIMPEXP_MMEDIA wxSoundRouterStream;
class WXDLLIMPEXP_MMEDIA wxSoundStreamUlaw: public wxSoundStreamCodec {
public:
wxSoundStreamUlaw(wxSoundStream& sndio);
~wxSoundStreamUlaw();

1
contrib/include/wx/mmedia/sndwav.h
View File

@@ -16,6 +16,7 @@
#include "wx/string.h"
#include "wx/stream.h"
#include "wx/datstrm.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/sndbase.h"
#include "wx/mmedia/sndcodec.h"
#include "wx/mmedia/sndfile.h"

5
contrib/include/wx/mmedia/sndwin.h
View File

@@ -9,13 +9,14 @@
#define _WX_SNDWIN_H
#include "wx/defs.h"
#include "wx/mmedia/defs.h"
#include "wx/mmedia/sndbase.h"
typedef struct _wxSoundInternal wxSoundInternal;
typedef struct _wxSoundInfoHeader wxSoundInfoHeader;
// class WXDLLEXPORT wxSoundInternal;
class WXDLLEXPORT wxSoundStreamWin : public wxSoundStream {
// class WXDLLIMPEXP_MMEDIA wxSoundInternal;
class WXDLLIMPEXP_MMEDIA wxSoundStreamWin : public wxSoundStream {
public:
wxSoundStreamWin();
~wxSoundStreamWin();

6
contrib/include/wx/mmedia/vidbase.h
View File

@@ -36,6 +36,8 @@
#include "wx/frame.h"
#endif
#include "wx/mmedia/defs.h"
// ----------------------------------------------------------------------------
// wxMMedia2 (video) types
@@ -54,7 +56,7 @@ typedef enum {
// ----------------------------------------------------------------------------
// Classes definition
class WXDLLEXPORT wxVideoBaseDriver : public wxObject {
class WXDLLIMPEXP_MMEDIA wxVideoBaseDriver : public wxObject {
DECLARE_ABSTRACT_CLASS(wxVideoBaseDriver)
protected:
wxWindow *m_video_output;
@@ -104,7 +106,7 @@ public:
virtual bool IsStopped() const = 0;
};
WXDLLEXPORT wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv);
WXDLLIMPEXP_MMEDIA wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv);
#endif

3
contrib/include/wx/mmedia/vidwin.h
View File

@@ -36,6 +36,7 @@
// ----------------------------------------------------------------------------
// wxMMedia2 headers
#include "wx/mmedia/defs.h"
#include "wx/mmedia/vidbase.h"
// ----------------------------------------------------------------------------
@@ -53,7 +54,7 @@ typedef struct VIDW_Internal {
// ----------------------------------------------------------------------------
// Class definition
class WXDLLEXPORT wxVideoWindows : public wxVideoBaseDriver {
class WXDLLIMPEXP_MMEDIA wxVideoWindows : public wxVideoBaseDriver {
DECLARE_DYNAMIC_CLASS(wxVideoWindows)
protected:
struct VIDW_Internal *m_internal;

3
contrib/include/wx/mmedia/vidxanm.h
View File

@@ -44,6 +44,7 @@
// ----------------------------------------------------------------------------
// wxMMedia2 headers
#include "wx/mmedia/defs.h"
#include "wx/mmedia/vidbase.h"
// ----------------------------------------------------------------------------
@@ -65,7 +66,7 @@ typedef struct wxXANIMinternal {
// ----------------------------------------------------------------------------
// Class definition
class WXDLLEXPORT wxVideoXANIM : public wxVideoBaseDriver {
class WXDLLIMPEXP_MMEDIA wxVideoXANIM : public wxVideoBaseDriver {
DECLARE_DYNAMIC_CLASS(wxVideoXANIM)
protected:
// Remember the state of the subprocess

2
contrib/include/wx/net/email.h
View File

@@ -23,7 +23,7 @@
* Miscellaneous email functions
*/
class wxEmail
class WXDLLIMPEXP_NETUTILS wxEmail
{
public:
//// Ctor/dtor

14
contrib/include/wx/net/msg.h
View File

@@ -16,12 +16,24 @@
#ifndef _WX_MSG_H_
#define _WX_MSG_H_
#ifdef WXMAKINGDLL_NETUTILS
#define WXDLLIMPEXP_NETUTILS WXEXPORT
#define WXDLLIMPEXP_DATA_NETUTILS(type) WXEXPORT type
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_NETUTILS WXIMPORT
#define WXDLLIMPEXP_DATA_NETUTILS(type) WXIMPORT type
#else // not making nor using DLL
#define WXDLLIMPEXP_NETUTILS
#define WXDLLIMPEXP_DATA_NETUTILS(type) type
#endif
/*
* wxMailMessage
* Encapsulates an email message
*/
class wxMailMessage
class WXDLLIMPEXP_NETUTILS wxMailMessage
{
public:

4
contrib/include/wx/net/smapi.h
View File

@@ -18,10 +18,10 @@
#include "wx/net/msg.h"
class wxMapiData;
class WXDLLIMPEXP_NETUTILS wxMapiData;
//The class which encapsulates the MAPI connection
class wxMapiSession
class WXDLLIMPEXP_NETUTILS wxMapiSession
{
public:
//Constructors / Destructors

44
contrib/include/wx/plot/plot.h
View File

@@ -22,17 +22,28 @@
#include "wx/event.h"
#include "wx/dynarray.h"
#ifdef WXMAKINGDLL_PLOT
#define WXDLLIMPEXP_PLOT WXEXPORT
#define WXDLLIMPEXP_DATA_PLOT(type) WXEXPORT type
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_PLOT WXIMPORT
#define WXDLLIMPEXP_DATA_PLOT(type) WXIMPORT type
#else // not making nor using DLL
#define WXDLLIMPEXP_PLOT
#define WXDLLIMPEXP_DATA_PLOT(type) type
#endif
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPlotEvent;
class WXDLLEXPORT wxPlotCurve;
class WXDLLEXPORT wxPlotValues;
class WXDLLEXPORT wxPlotArea;
class WXDLLEXPORT wxPlotXAxisArea;
class WXDLLEXPORT wxPlotYAxisArea;
class WXDLLEXPORT wxPlotWindow;
class WXDLLIMPEXP_PLOT wxPlotEvent;
class WXDLLIMPEXP_PLOT wxPlotCurve;
class WXDLLIMPEXP_PLOT wxPlotValues;
class WXDLLIMPEXP_PLOT wxPlotArea;
class WXDLLIMPEXP_PLOT wxPlotXAxisArea;
class WXDLLIMPEXP_PLOT wxPlotYAxisArea;
class WXDLLIMPEXP_PLOT wxPlotWindow;
//-----------------------------------------------------------------------------
// consts
@@ -74,7 +85,7 @@ extern const int wxEVT_PLOT_AREA_CREATE;
// wxPlotEvent
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPlotEvent: public wxNotifyEvent
class WXDLLIMPEXP_PLOT wxPlotEvent: public wxNotifyEvent
{
public:
wxPlotEvent( wxEventType commandType = wxEVT_NULL, int id = 0 );
@@ -104,7 +115,7 @@ private:
// wxPlotCurve
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPlotCurve: public wxObject
class WXDLLIMPEXP_PLOT wxPlotCurve: public wxObject
{
public:
wxPlotCurve( int offsetY, double startY, double endY );
@@ -146,7 +157,7 @@ private:
// wxPlotOnOffCurve
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPlotOnOff
class WXDLLIMPEXP_PLOT wxPlotOnOff
{
public:
wxPlotOnOff() { }
@@ -156,9 +167,10 @@ public:
void *m_clientData;
};
WX_DECLARE_EXPORTED_OBJARRAY(wxPlotOnOff, wxArrayPlotOnOff);
WX_DECLARE_OBJARRAY_WITH_DECL(wxPlotOnOff, wxArrayPlotOnOff,
class WXDLLIMPEXP_PLOT);
class WXDLLEXPORT wxPlotOnOffCurve: public wxObject
class WXDLLIMPEXP_PLOT wxPlotOnOffCurve: public wxObject
{
public:
wxPlotOnOffCurve( int offsetY );
@@ -198,7 +210,7 @@ private:
// wxPlotArea
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPlotArea: public wxWindow
class WXDLLIMPEXP_PLOT wxPlotArea: public wxWindow
{
public:
wxPlotArea() {}
@@ -225,7 +237,7 @@ private:
// wxPlotXAxisArea
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPlotXAxisArea: public wxWindow
class WXDLLIMPEXP_PLOT wxPlotXAxisArea: public wxWindow
{
public:
wxPlotXAxisArea() {}
@@ -245,7 +257,7 @@ private:
// wxPlotYAxisArea
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPlotYAxisArea: public wxWindow
class WXDLLIMPEXP_PLOT wxPlotYAxisArea: public wxWindow
{
public:
wxPlotYAxisArea() {}
@@ -265,7 +277,7 @@ private:
// wxPlotWindow
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPlotWindow: public wxScrolledWindow
class WXDLLIMPEXP_PLOT wxPlotWindow: public wxScrolledWindow
{
public:
wxPlotWindow() {}