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

created wxAdvanced library

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-02 01:04:55 +00:00
parent 1b7031bc01
commit 12f190b09c
17 changed files with 126 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/calctrl.h
View File

@@ -83,7 +83,7 @@ enum wxCalendarDateBorder
// wxCalendarDateAttr: custom attributes for a calendar date // wxCalendarDateAttr: custom attributes for a calendar date
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxCalendarDateAttr class WXDLLIMPEXP_ADV wxCalendarDateAttr
{ {
#if !defined(__VISAGECPP__) #if !defined(__VISAGECPP__)
protected: protected:
@@ -159,9 +159,9 @@ private:
// wxCalendarCtrl events // wxCalendarCtrl events
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxCalendarCtrl; class WXDLLIMPEXP_ADV wxCalendarCtrl;
class WXDLLEXPORT wxCalendarEvent : public wxCommandEvent class WXDLLIMPEXP_ADV wxCalendarEvent : public wxCommandEvent
{ {
friend class wxCalendarCtrl; friend class wxCalendarCtrl;
public: public:

8
include/wx/dbgrid.h
View File

@@ -33,7 +33,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(GenericKey,keyarray);
static const int wxUSE_QUERY = -1; static const int wxUSE_QUERY = -1;
class WXDLLEXPORT wxDbGridColInfoBase class WXDLLIMPEXP_ADV wxDbGridColInfoBase
{ {
public: public:
//Default ctor //Default ctor
@@ -60,7 +60,7 @@ public:
}; };
class WXDLLEXPORT wxDbGridColInfo class WXDLLIMPEXP_ADV wxDbGridColInfo
{ {
public: public:
wxDbGridColInfo(int colNo, wxDbGridColInfo(int colNo,
@@ -98,7 +98,7 @@ public:
}; };
class WXDLLEXPORT wxDbGridCellAttrProvider : public wxGridCellAttrProvider class WXDLLIMPEXP_ADV wxDbGridCellAttrProvider : public wxGridCellAttrProvider
{ {
public: public:
wxDbGridCellAttrProvider(); wxDbGridCellAttrProvider();
@@ -114,7 +114,7 @@ private:
}; };
class WXDLLEXPORT wxDbGridTableBase : public wxGridTableBase class WXDLLIMPEXP_ADV wxDbGridTableBase : public wxGridTableBase
{ {
public: public:
wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo, wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo,

4
include/wx/dcbuffer.h
View File

@@ -24,7 +24,7 @@
// Double buffering helper. // Double buffering helper.
// -------------------------------------------------------------- // --------------------------------------------------------------
class WXDLLEXPORT wxBufferedDC : public wxMemoryDC class WXDLLIMPEXP_ADV wxBufferedDC : public wxMemoryDC
{ {
private: private:
@@ -85,7 +85,7 @@ public:
// Creates a double buffered wxPaintDC, optionally allowing the // Creates a double buffered wxPaintDC, optionally allowing the
// user to specify their own buffer to use. // user to specify their own buffer to use.
class WXDLLEXPORT wxBufferedPaintDC : public wxBufferedDC class WXDLLIMPEXP_ADV wxBufferedPaintDC : public wxBufferedDC
{ {
private: private:

12
include/wx/defs.h
View File

@@ -399,6 +399,7 @@ typedef int wxWindowID;
#define WXMAKINGDLL_NET #define WXMAKINGDLL_NET
#define WXMAKINGDLL_CORE #define WXMAKINGDLL_CORE
#define WXMAKINGDLL_ADV
#define WXMAKINGDLL_HTML #define WXMAKINGDLL_HTML
#define WXMAKINGDLL_XML #define WXMAKINGDLL_XML
#endif // WXMAKINGDLL #endif // WXMAKINGDLL
@@ -438,6 +439,17 @@ typedef int wxWindowID;
#define WXDLLIMPEXP_DATA_CORE(type) type #define WXDLLIMPEXP_DATA_CORE(type) type
#endif #endif
#ifdef WXMAKINGDLL_ADV
#define WXDLLIMPEXP_ADV WXEXPORT
#define WXDLLIMPEXP_DATA_ADV(type) WXEXPORT type
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_ADV WXIMPORT
#define WXDLLIMPEXP_DATA_ADV(type) WXIMPORT type
#else // not making nor using DLL
#define WXDLLIMPEXP_ADV
#define WXDLLIMPEXP_DATA_ADV(type) type
#endif
#ifdef WXMAKINGDLL_HTML #ifdef WXMAKINGDLL_HTML
#define WXDLLIMPEXP_HTML WXEXPORT #define WXDLLIMPEXP_HTML WXEXPORT
#define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type #define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type

2
include/wx/generic/calctrl.h
View File

@@ -29,7 +29,7 @@ class WXDLLEXPORT wxSpinCtrl;
// wxCalendarCtrl: a control allowing the user to pick a date interactively // wxCalendarCtrl: a control allowing the user to pick a date interactively
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxCalendarCtrl : public wxControl class WXDLLIMPEXP_ADV wxCalendarCtrl : public wxControl
{ {
friend class wxMonthComboBox; friend class wxMonthComboBox;
friend class wxYearSpinCtrl; friend class wxYearSpinCtrl;

108
include/wx/generic/grid.h
View File

@@ -65,24 +65,24 @@
// forward declarations // forward declarations
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxGrid; class WXDLLIMPEXP_ADV wxGrid;
class WXDLLEXPORT wxGridCellAttr; class WXDLLIMPEXP_ADV wxGridCellAttr;
class WXDLLEXPORT wxGridCellAttrProviderData; class WXDLLIMPEXP_ADV wxGridCellAttrProviderData;
class WXDLLEXPORT wxGridColLabelWindow; class WXDLLIMPEXP_ADV wxGridColLabelWindow;
class WXDLLEXPORT wxGridCornerLabelWindow; class WXDLLIMPEXP_ADV wxGridCornerLabelWindow;
class WXDLLEXPORT wxGridRowLabelWindow; class WXDLLIMPEXP_ADV wxGridRowLabelWindow;
class WXDLLEXPORT wxGridTableBase; class WXDLLIMPEXP_ADV wxGridTableBase;
class WXDLLEXPORT wxGridWindow; class WXDLLIMPEXP_ADV wxGridWindow;
class WXDLLEXPORT wxGridTypeRegistry; class WXDLLIMPEXP_ADV wxGridTypeRegistry;
class WXDLLEXPORT wxGridSelection; class WXDLLIMPEXP_ADV wxGridSelection;
class WXDLLEXPORT wxCheckBox; class WXDLLEXPORT wxCheckBox;
class WXDLLEXPORT wxComboBox; class WXDLLEXPORT wxComboBox;
class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxTextCtrl;
class WXDLLEXPORT wxSpinCtrl; class WXDLLEXPORT wxSpinCtrl;
WX_DECLARE_EXPORTED_HASH_MAP( long, long, wxIntegerHash, wxIntegerEqual, WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
wxLongToLongHashMap ); wxLongToLongHashMap, class WXDLLIMPEXP_ADV );
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// macros // macros
@@ -99,7 +99,7 @@ WX_DECLARE_EXPORTED_HASH_MAP( long, long, wxIntegerHash, wxIntegerEqual,
// class is not documented and is not public at all // class is not documented and is not public at all
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxGridCellWorker : public wxClientDataContainer class WXDLLIMPEXP_ADV wxGridCellWorker : public wxClientDataContainer
{ {
public: public:
wxGridCellWorker() { m_nRef = 1; } wxGridCellWorker() { m_nRef = 1; }
@@ -135,7 +135,7 @@ private:
// predefined derived classes or derive your own class from it. // predefined derived classes or derive your own class from it.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxGridCellRenderer : public wxGridCellWorker class WXDLLIMPEXP_ADV wxGridCellRenderer : public wxGridCellWorker
{ {
public: public:
// draw the given cell on the provided DC inside the given rectangle // draw the given cell on the provided DC inside the given rectangle
@@ -163,7 +163,7 @@ public:
}; };
// the default renderer for the cells containing string data // the default renderer for the cells containing string data
class WXDLLEXPORT wxGridCellStringRenderer : public wxGridCellRenderer class WXDLLIMPEXP_ADV wxGridCellStringRenderer : public wxGridCellRenderer
{ {
public: public:
// draw the string // draw the string
@@ -197,7 +197,7 @@ protected:
}; };
// the default renderer for the cells containing numeric (long) data // the default renderer for the cells containing numeric (long) data
class WXDLLEXPORT wxGridCellNumberRenderer : public wxGridCellStringRenderer class WXDLLIMPEXP_ADV wxGridCellNumberRenderer : public wxGridCellStringRenderer
{ {
public: public:
// draw the string right aligned // draw the string right aligned
@@ -220,7 +220,7 @@ protected:
wxString GetString(wxGrid& grid, int row, int col); wxString GetString(wxGrid& grid, int row, int col);
}; };
class WXDLLEXPORT wxGridCellFloatRenderer : public wxGridCellStringRenderer class WXDLLIMPEXP_ADV wxGridCellFloatRenderer : public wxGridCellStringRenderer
{ {
public: public:
wxGridCellFloatRenderer(int width = -1, int precision = -1); wxGridCellFloatRenderer(int width = -1, int precision = -1);
@@ -261,7 +261,7 @@ private:
}; };
// renderer for boolean fields // renderer for boolean fields
class WXDLLEXPORT wxGridCellBoolRenderer : public wxGridCellRenderer class WXDLLIMPEXP_ADV wxGridCellBoolRenderer : public wxGridCellRenderer
{ {
public: public:
// draw a check mark or nothing // draw a check mark or nothing
@@ -293,7 +293,7 @@ private:
// even for the entire grid. // even for the entire grid.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxGridCellEditor : public wxGridCellWorker class WXDLLIMPEXP_ADV wxGridCellEditor : public wxGridCellWorker
{ {
public: public:
wxGridCellEditor(); wxGridCellEditor();
@@ -391,7 +391,7 @@ protected:
#if wxUSE_TEXTCTRL #if wxUSE_TEXTCTRL
// the editor for string/text data // the editor for string/text data
class WXDLLEXPORT wxGridCellTextEditor : public wxGridCellEditor class WXDLLIMPEXP_ADV wxGridCellTextEditor : public wxGridCellEditor
{ {
public: public:
wxGridCellTextEditor(); wxGridCellTextEditor();
@@ -435,7 +435,7 @@ private:
}; };
// the editor for numeric (long) data // the editor for numeric (long) data
class WXDLLEXPORT wxGridCellNumberEditor : public wxGridCellTextEditor class WXDLLIMPEXP_ADV wxGridCellNumberEditor : public wxGridCellTextEditor
{ {
public: public:
// allows to specify the range - if min == max == -1, no range checking is // allows to specify the range - if min == max == -1, no range checking is
@@ -482,7 +482,7 @@ private:
}; };
// the editor for floating point numbers (double) data // the editor for floating point numbers (double) data
class WXDLLEXPORT wxGridCellFloatEditor : public wxGridCellTextEditor class WXDLLIMPEXP_ADV wxGridCellFloatEditor : public wxGridCellTextEditor
{ {
public: public:
wxGridCellFloatEditor(int width = -1, int precision = -1); wxGridCellFloatEditor(int width = -1, int precision = -1);
@@ -521,7 +521,7 @@ private:
#if wxUSE_CHECKBOX #if wxUSE_CHECKBOX
// the editor for boolean data // the editor for boolean data
class WXDLLEXPORT wxGridCellBoolEditor : public wxGridCellEditor class WXDLLIMPEXP_ADV wxGridCellBoolEditor : public wxGridCellEditor
{ {
public: public:
wxGridCellBoolEditor() { } wxGridCellBoolEditor() { }
@@ -560,7 +560,7 @@ private:
#if wxUSE_COMBOBOX #if wxUSE_COMBOBOX
// the editor for string data allowing to choose from the list of strings // the editor for string data allowing to choose from the list of strings
class WXDLLEXPORT wxGridCellChoiceEditor : public wxGridCellEditor class WXDLLIMPEXP_ADV wxGridCellChoiceEditor : public wxGridCellEditor
{ {
public: public:
// if !allowOthers, user can't type a string not in choices array // if !allowOthers, user can't type a string not in choices array
@@ -608,7 +608,7 @@ protected:
// class may be returned by wxGridTable::GetAttr(). // class may be returned by wxGridTable::GetAttr().
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxGridCellAttr : public wxClientDataContainer class WXDLLIMPEXP_ADV wxGridCellAttr : public wxClientDataContainer
{ {
public: public:
enum wxAttrKind enum wxAttrKind
@@ -768,7 +768,7 @@ private:
// the default implementation is reasonably efficient for the generic case, // the default implementation is reasonably efficient for the generic case,
// but you might still wish to implement your own for some specific situations // but you might still wish to implement your own for some specific situations
// if you have performance problems with the stock one // if you have performance problems with the stock one
class WXDLLEXPORT wxGridCellAttrProvider : public wxClientDataContainer class WXDLLIMPEXP_ADV wxGridCellAttrProvider : public wxClientDataContainer
{ {
public: public:
wxGridCellAttrProvider(); wxGridCellAttrProvider();
@@ -804,7 +804,7 @@ private:
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
class WXDLLEXPORT wxGridTableBase : public wxObject, public wxClientDataContainer class WXDLLIMPEXP_ADV wxGridTableBase : public wxObject, public wxClientDataContainer
{ {
public: public:
wxGridTableBase(); wxGridTableBase();
@@ -905,7 +905,7 @@ enum wxGridTableRequest
wxGRIDTABLE_NOTIFY_COLS_DELETED wxGRIDTABLE_NOTIFY_COLS_DELETED
}; };
class WXDLLEXPORT wxGridTableMessage class WXDLLIMPEXP_ADV wxGridTableMessage
{ {
public: public:
wxGridTableMessage(); wxGridTableMessage();
@@ -947,7 +947,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxArrayString, wxGridStringArray);
// that are stored in memory // that are stored in memory
// //
class WXDLLEXPORT wxGridStringTable : public wxGridTableBase class WXDLLIMPEXP_ADV wxGridStringTable : public wxGridTableBase
{ {
public: public:
wxGridStringTable(); wxGridStringTable();
@@ -999,7 +999,7 @@ private:
// wxGridCellCoords: location of a cell in the grid // wxGridCellCoords: location of a cell in the grid
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxGridCellCoords class WXDLLIMPEXP_ADV wxGridCellCoords
{ {
public: public:
wxGridCellCoords() { m_row = m_col = -1; } wxGridCellCoords() { m_row = m_col = -1; }
@@ -1046,8 +1046,8 @@ private:
// For comparisons... // For comparisons...
// //
extern WXDLLEXPORT wxGridCellCoords wxGridNoCellCoords; extern WXDLLIMPEXP_ADV wxGridCellCoords wxGridNoCellCoords;
extern WXDLLEXPORT wxRect wxGridNoCellRect; extern WXDLLIMPEXP_ADV wxRect wxGridNoCellRect;
// An array of cell coords... // An array of cell coords...
// //
@@ -1057,7 +1057,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellCoords, wxGridCellCoordsArray);
// wxGrid // wxGrid
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxGrid : public wxScrolledWindow class WXDLLIMPEXP_ADV wxGrid : public wxScrolledWindow
{ {
public: public:
wxGrid() wxGrid()
@@ -1904,7 +1904,7 @@ protected:
bool GetModelValues(); bool GetModelValues();
bool SetModelValues(); bool SetModelValues();
friend class WXDLLEXPORT wxGridSelection; friend class WXDLLIMPEXP_ADV wxGridSelection;
DECLARE_DYNAMIC_CLASS( wxGrid ) DECLARE_DYNAMIC_CLASS( wxGrid )
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
@@ -1916,7 +1916,7 @@ protected:
// Grid event class and event types // Grid event class and event types
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxGridEvent : public wxNotifyEvent class WXDLLIMPEXP_ADV wxGridEvent : public wxNotifyEvent
{ {
public: public:
wxGridEvent() wxGridEvent()
@@ -1952,7 +1952,7 @@ protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxGridEvent) DECLARE_DYNAMIC_CLASS_NO_COPY(wxGridEvent)
}; };
class WXDLLEXPORT wxGridSizeEvent : public wxNotifyEvent class WXDLLIMPEXP_ADV wxGridSizeEvent : public wxNotifyEvent
{ {
public: public:
wxGridSizeEvent() wxGridSizeEvent()
@@ -1985,7 +1985,7 @@ protected:
}; };
class WXDLLEXPORT wxGridRangeSelectEvent : public wxNotifyEvent class WXDLLIMPEXP_ADV wxGridRangeSelectEvent : public wxNotifyEvent
{ {
public: public:
wxGridRangeSelectEvent() wxGridRangeSelectEvent()
@@ -2032,7 +2032,7 @@ protected:
}; };
class WXDLLEXPORT wxGridEditorCreatedEvent : public wxCommandEvent { class WXDLLIMPEXP_ADV wxGridEditorCreatedEvent : public wxCommandEvent {
public: public:
wxGridEditorCreatedEvent() wxGridEditorCreatedEvent()
: wxCommandEvent() : wxCommandEvent()
@@ -2063,22 +2063,22 @@ private:
BEGIN_DECLARE_EVENT_TYPES() BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK, 1580) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_LEFT_CLICK, 1580)
DECLARE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK, 1581) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_RIGHT_CLICK, 1581)
DECLARE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK, 1582) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_LEFT_DCLICK, 1582)
DECLARE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK, 1583) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_RIGHT_DCLICK, 1583)
DECLARE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK, 1584) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_CLICK, 1584)
DECLARE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK, 1585) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_CLICK, 1585)
DECLARE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK, 1586) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_DCLICK, 1586)
DECLARE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK, 1587) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_DCLICK, 1587)
DECLARE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE, 1588) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_ROW_SIZE, 1588)
DECLARE_EVENT_TYPE(wxEVT_GRID_COL_SIZE, 1589) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_COL_SIZE, 1589)
DECLARE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT, 1590) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_RANGE_SELECT, 1590)
DECLARE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE, 1591) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_CHANGE, 1591)
DECLARE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL, 1592) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_SELECT_CELL, 1592)
DECLARE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN, 1593) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_SHOWN, 1593)
DECLARE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN, 1594) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_HIDDEN, 1594)
DECLARE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED, 1595) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_CREATED, 1595)
END_DECLARE_EVENT_TYPES() END_DECLARE_EVENT_TYPES()

10
include/wx/generic/gridctrl.h
View File

@@ -29,7 +29,7 @@
#if wxUSE_DATETIME #if wxUSE_DATETIME
// the default renderer for the cells containing Time and dates.. // the default renderer for the cells containing Time and dates..
class WXDLLEXPORT wxGridCellDateTimeRenderer : public wxGridCellStringRenderer class WXDLLIMPEXP_ADV wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
{ {
public: public:
wxGridCellDateTimeRenderer(wxString outformat = _T("%c"), wxGridCellDateTimeRenderer(wxString outformat = _T("%c"),
@@ -65,7 +65,7 @@ protected:
#endif // wxUSE_DATETIME #endif // wxUSE_DATETIME
// the default renderer for the cells containing Time and dates.. // the default renderer for the cells containing Time and dates..
class WXDLLEXPORT wxGridCellEnumRenderer : public wxGridCellStringRenderer class WXDLLIMPEXP_ADV wxGridCellEnumRenderer : public wxGridCellStringRenderer
{ {
public: public:
wxGridCellEnumRenderer( const wxString& choices = wxEmptyString ); wxGridCellEnumRenderer( const wxString& choices = wxEmptyString );
@@ -97,7 +97,7 @@ protected:
#if wxUSE_COMBOBOX #if wxUSE_COMBOBOX
class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor class WXDLLIMPEXP_ADV wxGridCellEnumEditor : public wxGridCellChoiceEditor
{ {
public: public:
wxGridCellEnumEditor( const wxString& choices = wxEmptyString ); wxGridCellEnumEditor( const wxString& choices = wxEmptyString );
@@ -116,7 +116,7 @@ private:
#endif // wxUSE_COMBOBOX #endif // wxUSE_COMBOBOX
class WXDLLEXPORT wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
{ {
public: public:
wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { } wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { }
@@ -130,7 +130,7 @@ public:
DECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor) DECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor)
}; };
class WXDLLEXPORT wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
{ {
public: public:
wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { } wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { }

4
include/wx/generic/gridsel.h
View File

@@ -22,7 +22,7 @@
#include "wx/grid.h" #include "wx/grid.h"
class WXDLLEXPORT wxGridSelection{ class WXDLLIMPEXP_ADV wxGridSelection{
public: public:
wxGridSelection( wxGrid * grid, wxGrid::wxGridSelectionModes sel = wxGridSelection( wxGrid * grid, wxGrid::wxGridSelectionModes sel =
wxGrid::wxGridSelectCells ); wxGrid::wxGridSelectCells );
@@ -82,7 +82,7 @@ private:
wxGrid *m_grid; wxGrid *m_grid;
wxGrid::wxGridSelectionModes m_selectionMode; wxGrid::wxGridSelectionModes m_selectionMode;
friend class WXDLLEXPORT wxGrid; friend class WXDLLIMPEXP_ADV wxGrid;
DECLARE_NO_COPY_CLASS(wxGridSelection) DECLARE_NO_COPY_CLASS(wxGridSelection)
}; };

4
include/wx/generic/helpext.h
View File

@@ -26,7 +26,7 @@
#define WXEXTHELP_SEPARATOR _T('/') #define WXEXTHELP_SEPARATOR _T('/')
#endif #endif
class WXDLLEXPORT wxExtHelpMapList; class WXDLLIMPEXP_ADV wxExtHelpMapList;
#ifndef WXEXTHELP_DEFAULTBROWSER #ifndef WXEXTHELP_DEFAULTBROWSER
/// Default browser name. /// Default browser name.
@@ -54,7 +54,7 @@ class WXDLLEXPORT wxExtHelpMapList;
Lines starting with ';' will be ignored. Lines starting with ';' will be ignored.
*/ */
class WXDLLEXPORT wxExtHelpController : public wxHelpControllerBase class WXDLLIMPEXP_ADV wxExtHelpController : public wxHelpControllerBase
{ {
DECLARE_CLASS(wxExtHelpController) DECLARE_CLASS(wxExtHelpController)
public: public:

12
include/wx/generic/laywin.h
View File

@@ -24,8 +24,8 @@
#endif // wxUSE_SASH #endif // wxUSE_SASH
BEGIN_DECLARE_EVENT_TYPES() BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EVENT_TYPE(wxEVT_QUERY_LAYOUT_INFO, 1500) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_QUERY_LAYOUT_INFO, 1500)
DECLARE_EVENT_TYPE(wxEVT_CALCULATE_LAYOUT, 1501) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_CALCULATE_LAYOUT, 1501)
END_DECLARE_EVENT_TYPES() END_DECLARE_EVENT_TYPES()
enum wxLayoutOrientation enum wxLayoutOrientation
@@ -59,7 +59,7 @@ enum wxLayoutAlignment
* orientation and size. * orientation and size.
*/ */
class WXDLLEXPORT wxQueryLayoutInfoEvent: public wxEvent class WXDLLIMPEXP_ADV wxQueryLayoutInfoEvent: public wxEvent
{ {
public: public:
wxQueryLayoutInfoEvent(wxWindowID id = 0) wxQueryLayoutInfoEvent(wxWindowID id = 0)
@@ -111,7 +111,7 @@ typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEv
* This event is used to take a bite out of the available client area. * This event is used to take a bite out of the available client area.
*/ */
class WXDLLEXPORT wxCalculateLayoutEvent: public wxEvent class WXDLLIMPEXP_ADV wxCalculateLayoutEvent: public wxEvent
{ {
public: public:
wxCalculateLayoutEvent(wxWindowID id = 0) wxCalculateLayoutEvent(wxWindowID id = 0)
@@ -149,7 +149,7 @@ typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEv
// This is window that can remember alignment/orientation, does its own layout, // This is window that can remember alignment/orientation, does its own layout,
// and can provide sashes too. Useful for implementing docked windows with sashes in // and can provide sashes too. Useful for implementing docked windows with sashes in
// an IDE-style interface. // an IDE-style interface.
class WXDLLEXPORT wxSashLayoutWindow: public wxSashWindow class WXDLLIMPEXP_ADV wxSashLayoutWindow: public wxSashWindow
{ {
public: public:
wxSashLayoutWindow() wxSashLayoutWindow()
@@ -202,7 +202,7 @@ class WXDLLEXPORT wxMDIParentFrame;
class WXDLLEXPORT wxFrame; class WXDLLEXPORT wxFrame;
// This class implements the layout algorithm // This class implements the layout algorithm
class WXDLLEXPORT wxLayoutAlgorithm: public wxObject class WXDLLIMPEXP_ADV wxLayoutAlgorithm: public wxObject
{ {
public: public:
wxLayoutAlgorithm() {} wxLayoutAlgorithm() {}

9
include/wx/generic/sashwin.h
View File

@@ -40,7 +40,7 @@ enum wxSashEdgePosition {
* wxSashEdge represents one of the four edges of a window. * wxSashEdge represents one of the four edges of a window.
*/ */
class WXDLLEXPORT wxSashEdge class WXDLLIMPEXP_ADV wxSashEdge
{ {
public: public:
wxSashEdge() { m_show = FALSE; m_border = FALSE; m_margin = 0; } wxSashEdge() { m_show = FALSE; m_border = FALSE; m_margin = 0; }
@@ -67,7 +67,7 @@ public:
* of wxSashWindow. * of wxSashWindow.
*/ */
class WXDLLEXPORT wxSashWindow: public wxWindow class WXDLLIMPEXP_ADV wxSashWindow: public wxWindow
{ {
public: public:
// Default constructor // Default constructor
@@ -197,7 +197,8 @@ private:
}; };
BEGIN_DECLARE_EVENT_TYPES() BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EVENT_TYPE(wxEVT_SASH_DRAGGED, wxEVT_FIRST + 1200) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,
wxEVT_SASH_DRAGGED, wxEVT_FIRST + 1200)
END_DECLARE_EVENT_TYPES() END_DECLARE_EVENT_TYPES()
// #define wxEVT_SASH_DRAGGED (wxEVT_FIRST + 1200) // #define wxEVT_SASH_DRAGGED (wxEVT_FIRST + 1200)
@@ -208,7 +209,7 @@ enum wxSashDragStatus
wxSASH_STATUS_OUT_OF_RANGE wxSASH_STATUS_OUT_OF_RANGE
}; };
class WXDLLEXPORT wxSashEvent: public wxCommandEvent class WXDLLIMPEXP_ADV wxSashEvent: public wxCommandEvent
{ {
public: public:
inline wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE) { inline wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE) {

10
include/wx/generic/splash.h
View File

@@ -34,13 +34,13 @@
#define wxSPLASH_TIMEOUT 0x04 #define wxSPLASH_TIMEOUT 0x04
#define wxSPLASH_NO_TIMEOUT 0x00 #define wxSPLASH_NO_TIMEOUT 0x00
class WXDLLEXPORT wxSplashScreenWindow; class WXDLLIMPEXP_ADV wxSplashScreenWindow;
/* /*
* wxSplashScreen * wxSplashScreen
*/ */
class WXDLLEXPORT wxSplashScreen: public wxFrame class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame
{ {
public: public:
// for RTTI macros only // for RTTI macros only
@@ -65,8 +65,8 @@ protected:
int m_milliseconds; int m_milliseconds;
wxTimer m_timer; wxTimer m_timer;
DECLARE_DYNAMIC_CLASS(wxSplashScreen) DECLARE_DYNAMIC_CLASS(wxSplashScreen)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxSplashScreen) DECLARE_NO_COPY_CLASS(wxSplashScreen)
}; };
@@ -74,7 +74,7 @@ DECLARE_EVENT_TABLE()
* wxSplashScreenWindow * wxSplashScreenWindow
*/ */
class WXDLLEXPORT wxSplashScreenWindow: public wxWindow class WXDLLIMPEXP_ADV wxSplashScreenWindow: public wxWindow
{ {
public: public:
wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER); wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER);

6
include/wx/generic/wizard.h
View File

@@ -19,11 +19,11 @@
class WXDLLEXPORT wxButton; class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxStaticBitmap; class WXDLLEXPORT wxStaticBitmap;
class WXDLLEXPORT wxWizardEvent; class WXDLLIMPEXP_ADV wxWizardEvent;
class WXDLLEXPORT wxBoxSizer; class WXDLLEXPORT wxBoxSizer;
class WXDLLEXPORT wxWizardSizer; class WXDLLIMPEXP_ADV wxWizardSizer;
class WXDLLEXPORT wxWizard : public wxWizardBase class WXDLLIMPEXP_ADV wxWizard : public wxWizardBase
{ {
public: public:
// ctor // ctor

6
include/wx/tipdlg.h
View File

@@ -36,7 +36,7 @@
// wxTipProvider evidently needs some internal state which is the tip "index" // wxTipProvider evidently needs some internal state which is the tip "index"
// and which should be saved/restored by the program to not always show one and // and which should be saved/restored by the program to not always show one and
// the same tip (of course, you may use random starting position as well...) // the same tip (of course, you may use random starting position as well...)
class WXDLLEXPORT wxTipProvider class WXDLLIMPEXP_ADV wxTipProvider
{ {
public: public:
wxTipProvider(size_t currentTip) { m_currentTip = currentTip; } wxTipProvider(size_t currentTip) { m_currentTip = currentTip; }
@@ -65,7 +65,7 @@ protected:
// specified text file as the source of tips (each line is a tip). // specified text file as the source of tips (each line is a tip).
// //
// NB: the caller is responsible for deleting the pointer! // NB: the caller is responsible for deleting the pointer!
WXDLLEXPORT wxTipProvider *wxCreateFileTipProvider(const wxString& filename, WXDLLIMPEXP_ADV wxTipProvider *wxCreateFileTipProvider(const wxString& filename,
size_t currentTip); size_t currentTip);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -79,7 +79,7 @@ WXDLLEXPORT wxTipProvider *wxCreateFileTipProvider(const wxString& filename,
// not, the dialog on startup depending on its value, not this class). // not, the dialog on startup depending on its value, not this class).
// //
// The function returns TRUE if this checkbox is checked, FALSE otherwise. // The function returns TRUE if this checkbox is checked, FALSE otherwise.
WXDLLEXPORT bool wxShowTip(wxWindow *parent, WXDLLIMPEXP_ADV bool wxShowTip(wxWindow *parent,
wxTipProvider *tipProvider, wxTipProvider *tipProvider,
bool showAtStartup = TRUE); bool showAtStartup = TRUE);

10
include/wx/wizard.h
View File

@@ -36,7 +36,7 @@
#define wxWIZARD_EX_HELPBUTTON 0x00000010 #define wxWIZARD_EX_HELPBUTTON 0x00000010
// forward declarations // forward declarations
class WXDLLEXPORT wxWizard; class WXDLLIMPEXP_ADV wxWizard;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxWizardPage is one of the wizards screen: it must know what are the // wxWizardPage is one of the wizards screen: it must know what are the
@@ -46,7 +46,7 @@ class WXDLLEXPORT wxWizard;
// used as such (i.e. controls may be placed directly on it &c). // used as such (i.e. controls may be placed directly on it &c).
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxWizardPage : public wxPanel class WXDLLIMPEXP_ADV wxWizardPage : public wxPanel
{ {
public: public:
wxWizardPage() { Init(); } wxWizardPage() { Init(); }
@@ -93,7 +93,7 @@ private:
// this, you must derive from wxWizardPage directly. // this, you must derive from wxWizardPage directly.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxWizardPageSimple : public wxWizardPage class WXDLLIMPEXP_ADV wxWizardPageSimple : public wxWizardPage
{ {
public: public:
wxWizardPageSimple() { Init(); } wxWizardPageSimple() { Init(); }
@@ -156,7 +156,7 @@ private:
// wxWizard // wxWizard
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxWizardBase : public wxDialog class WXDLLIMPEXP_ADV wxWizardBase : public wxDialog
{ {
public: public:
/* /*
@@ -235,7 +235,7 @@ private:
// window hierarchy as usual // window hierarchy as usual
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxWizardEvent : public wxNotifyEvent class WXDLLIMPEXP_ADV wxWizardEvent : public wxNotifyEvent
{ {
public: public:
wxWizardEvent(wxEventType type = wxEVT_NULL, wxWizardEvent(wxEventType type = wxEVT_NULL,

16
src/generic/grid.cpp
View File

@@ -123,7 +123,7 @@ DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED)
// private classes // private classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxGridRowLabelWindow : public wxWindow class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxWindow
{ {
public: public:
wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; } wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
@@ -145,7 +145,7 @@ private:
}; };
class WXDLLEXPORT wxGridColLabelWindow : public wxWindow class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow
{ {
public: public:
wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; } wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
@@ -167,7 +167,7 @@ private:
}; };
class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow
{ {
public: public:
wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; } wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
@@ -188,7 +188,7 @@ private:
DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow) DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
}; };
class WXDLLEXPORT wxGridWindow : public wxWindow class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow
{ {
public: public:
wxGridWindow() wxGridWindow()
@@ -263,7 +263,7 @@ END_EVENT_TABLE()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// this class stores attributes set for cells // this class stores attributes set for cells
class WXDLLEXPORT wxGridCellAttrData class WXDLLIMPEXP_ADV wxGridCellAttrData
{ {
public: public:
void SetAttr(wxGridCellAttr *attr, int row, int col); void SetAttr(wxGridCellAttr *attr, int row, int col);
@@ -279,7 +279,7 @@ private:
}; };
// this class stores attributes set for rows or columns // this class stores attributes set for rows or columns
class WXDLLEXPORT wxGridRowOrColAttrData class WXDLLIMPEXP_ADV wxGridRowOrColAttrData
{ {
public: public:
// empty ctor to suppress warnings // empty ctor to suppress warnings
@@ -297,7 +297,7 @@ private:
// NB: this is just a wrapper around 3 objects: one which stores cell // NB: this is just a wrapper around 3 objects: one which stores cell
// attributes, and 2 others for row/col ones // attributes, and 2 others for row/col ones
class WXDLLEXPORT wxGridCellAttrProviderData class WXDLLIMPEXP_ADV wxGridCellAttrProviderData
{ {
public: public:
wxGridCellAttrData m_cellAttrs; wxGridCellAttrData m_cellAttrs;
@@ -335,7 +335,7 @@ struct wxGridDataTypeInfo
WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxGridDataTypeInfo*, wxGridDataTypeInfoArray); WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
class WXDLLEXPORT wxGridTypeRegistry class WXDLLIMPEXP_ADV wxGridTypeRegistry
{ {
public: public:
wxGridTypeRegistry() {} wxGridTypeRegistry() {}

6
src/generic/tipdlg.cpp
View File

@@ -61,7 +61,7 @@ static const int wxID_NEXT_TIP = 32000; // whatever
// an implementation which takes the tips from the text file - each line // an implementation which takes the tips from the text file - each line
// represents a tip // represents a tip
class WXDLLEXPORT wxFileTipProvider : public wxTipProvider class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider
{ {
public: public:
wxFileTipProvider(const wxString& filename, size_t currentTip); wxFileTipProvider(const wxString& filename, size_t currentTip);
@@ -76,7 +76,7 @@ private:
#ifdef __WIN32__ #ifdef __WIN32__
// TODO an implementation which takes the tips from the given registry key // TODO an implementation which takes the tips from the given registry key
class WXDLLEXPORT wxRegTipProvider : public wxTipProvider class WXDLLIMPEXP_ADV wxRegTipProvider : public wxTipProvider
{ {
public: public:
wxRegTipProvider(const wxString& keyname); wxRegTipProvider(const wxString& keyname);
@@ -93,7 +93,7 @@ wxString wxRegTipProvider::GetTip()
#endif // __WIN32__ #endif // __WIN32__
// the dialog we show in wxShowTip() // the dialog we show in wxShowTip()
class WXDLLEXPORT wxTipDialog : public wxDialog class WXDLLIMPEXP_ADV wxTipDialog : public wxDialog
{ {
public: public:
wxTipDialog(wxWindow *parent, wxTipDialog(wxWindow *parent,