From 12f190b09c5c1e25cfd8a6156d8d43f0b6647521 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 2 Aug 2003 01:04:55 +0000 Subject: [PATCH] created wxAdvanced library git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/calctrl.h | 6 +- include/wx/dbgrid.h | 8 +-- include/wx/dcbuffer.h | 4 +- include/wx/defs.h | 12 ++++ include/wx/generic/calctrl.h | 2 +- include/wx/generic/grid.h | 108 +++++++++++++++++----------------- include/wx/generic/gridctrl.h | 10 ++-- include/wx/generic/gridsel.h | 4 +- include/wx/generic/helpext.h | 4 +- include/wx/generic/laywin.h | 12 ++-- include/wx/generic/sashwin.h | 9 +-- include/wx/generic/splash.h | 10 ++-- include/wx/generic/wizard.h | 6 +- include/wx/tipdlg.h | 12 ++-- include/wx/wizard.h | 10 ++-- src/generic/grid.cpp | 16 ++--- src/generic/tipdlg.cpp | 6 +- 17 files changed, 126 insertions(+), 113 deletions(-) diff --git a/include/wx/calctrl.h b/include/wx/calctrl.h index 4aa3baee2f..4815ba6688 100644 --- a/include/wx/calctrl.h +++ b/include/wx/calctrl.h @@ -83,7 +83,7 @@ enum wxCalendarDateBorder // wxCalendarDateAttr: custom attributes for a calendar date // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCalendarDateAttr +class WXDLLIMPEXP_ADV wxCalendarDateAttr { #if !defined(__VISAGECPP__) protected: @@ -159,9 +159,9 @@ private: // wxCalendarCtrl events // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCalendarCtrl; +class WXDLLIMPEXP_ADV wxCalendarCtrl; -class WXDLLEXPORT wxCalendarEvent : public wxCommandEvent +class WXDLLIMPEXP_ADV wxCalendarEvent : public wxCommandEvent { friend class wxCalendarCtrl; public: diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h index dd10c6c39b..b6a672d4d6 100644 --- a/include/wx/dbgrid.h +++ b/include/wx/dbgrid.h @@ -33,7 +33,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(GenericKey,keyarray); static const int wxUSE_QUERY = -1; -class WXDLLEXPORT wxDbGridColInfoBase +class WXDLLIMPEXP_ADV wxDbGridColInfoBase { public: //Default ctor @@ -60,7 +60,7 @@ public: }; -class WXDLLEXPORT wxDbGridColInfo +class WXDLLIMPEXP_ADV wxDbGridColInfo { public: wxDbGridColInfo(int colNo, @@ -98,7 +98,7 @@ public: }; -class WXDLLEXPORT wxDbGridCellAttrProvider : public wxGridCellAttrProvider +class WXDLLIMPEXP_ADV wxDbGridCellAttrProvider : public wxGridCellAttrProvider { public: wxDbGridCellAttrProvider(); @@ -114,7 +114,7 @@ private: }; -class WXDLLEXPORT wxDbGridTableBase : public wxGridTableBase +class WXDLLIMPEXP_ADV wxDbGridTableBase : public wxGridTableBase { public: wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo, diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h index a46dd51d94..3ab1fe3e35 100644 --- a/include/wx/dcbuffer.h +++ b/include/wx/dcbuffer.h @@ -24,7 +24,7 @@ // Double buffering helper. // -------------------------------------------------------------- -class WXDLLEXPORT wxBufferedDC : public wxMemoryDC +class WXDLLIMPEXP_ADV wxBufferedDC : public wxMemoryDC { private: @@ -85,7 +85,7 @@ public: // Creates a double buffered wxPaintDC, optionally allowing the // user to specify their own buffer to use. -class WXDLLEXPORT wxBufferedPaintDC : public wxBufferedDC +class WXDLLIMPEXP_ADV wxBufferedPaintDC : public wxBufferedDC { private: diff --git a/include/wx/defs.h b/include/wx/defs.h index 741f43dc98..88611b9a83 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -399,6 +399,7 @@ typedef int wxWindowID; #define WXMAKINGDLL_NET #define WXMAKINGDLL_CORE + #define WXMAKINGDLL_ADV #define WXMAKINGDLL_HTML #define WXMAKINGDLL_XML #endif // WXMAKINGDLL @@ -438,6 +439,17 @@ typedef int wxWindowID; #define WXDLLIMPEXP_DATA_CORE(type) type #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 #define WXDLLIMPEXP_HTML WXEXPORT #define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h index 8c76660125..60d1dc3945 100644 --- a/include/wx/generic/calctrl.h +++ b/include/wx/generic/calctrl.h @@ -29,7 +29,7 @@ class WXDLLEXPORT wxSpinCtrl; // 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 wxYearSpinCtrl; diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index c66bfc6bd9..22c869cd7a 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -65,24 +65,24 @@ // forward declarations // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGrid; -class WXDLLEXPORT wxGridCellAttr; -class WXDLLEXPORT wxGridCellAttrProviderData; -class WXDLLEXPORT wxGridColLabelWindow; -class WXDLLEXPORT wxGridCornerLabelWindow; -class WXDLLEXPORT wxGridRowLabelWindow; -class WXDLLEXPORT wxGridTableBase; -class WXDLLEXPORT wxGridWindow; -class WXDLLEXPORT wxGridTypeRegistry; -class WXDLLEXPORT wxGridSelection; +class WXDLLIMPEXP_ADV wxGrid; +class WXDLLIMPEXP_ADV wxGridCellAttr; +class WXDLLIMPEXP_ADV wxGridCellAttrProviderData; +class WXDLLIMPEXP_ADV wxGridColLabelWindow; +class WXDLLIMPEXP_ADV wxGridCornerLabelWindow; +class WXDLLIMPEXP_ADV wxGridRowLabelWindow; +class WXDLLIMPEXP_ADV wxGridTableBase; +class WXDLLIMPEXP_ADV wxGridWindow; +class WXDLLIMPEXP_ADV wxGridTypeRegistry; +class WXDLLIMPEXP_ADV wxGridSelection; class WXDLLEXPORT wxCheckBox; class WXDLLEXPORT wxComboBox; class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxSpinCtrl; -WX_DECLARE_EXPORTED_HASH_MAP( long, long, wxIntegerHash, wxIntegerEqual, - wxLongToLongHashMap ); +WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual, + wxLongToLongHashMap, class WXDLLIMPEXP_ADV ); // ---------------------------------------------------------------------------- // 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 WXDLLEXPORT wxGridCellWorker : public wxClientDataContainer +class WXDLLIMPEXP_ADV wxGridCellWorker : public wxClientDataContainer { public: wxGridCellWorker() { m_nRef = 1; } @@ -135,7 +135,7 @@ private: // predefined derived classes or derive your own class from it. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGridCellRenderer : public wxGridCellWorker +class WXDLLIMPEXP_ADV wxGridCellRenderer : public wxGridCellWorker { public: // 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 -class WXDLLEXPORT wxGridCellStringRenderer : public wxGridCellRenderer +class WXDLLIMPEXP_ADV wxGridCellStringRenderer : public wxGridCellRenderer { public: // draw the string @@ -197,7 +197,7 @@ protected: }; // the default renderer for the cells containing numeric (long) data -class WXDLLEXPORT wxGridCellNumberRenderer : public wxGridCellStringRenderer +class WXDLLIMPEXP_ADV wxGridCellNumberRenderer : public wxGridCellStringRenderer { public: // draw the string right aligned @@ -220,7 +220,7 @@ protected: wxString GetString(wxGrid& grid, int row, int col); }; -class WXDLLEXPORT wxGridCellFloatRenderer : public wxGridCellStringRenderer +class WXDLLIMPEXP_ADV wxGridCellFloatRenderer : public wxGridCellStringRenderer { public: wxGridCellFloatRenderer(int width = -1, int precision = -1); @@ -261,7 +261,7 @@ private: }; // renderer for boolean fields -class WXDLLEXPORT wxGridCellBoolRenderer : public wxGridCellRenderer +class WXDLLIMPEXP_ADV wxGridCellBoolRenderer : public wxGridCellRenderer { public: // draw a check mark or nothing @@ -293,7 +293,7 @@ private: // even for the entire grid. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGridCellEditor : public wxGridCellWorker +class WXDLLIMPEXP_ADV wxGridCellEditor : public wxGridCellWorker { public: wxGridCellEditor(); @@ -391,7 +391,7 @@ protected: #if wxUSE_TEXTCTRL // the editor for string/text data -class WXDLLEXPORT wxGridCellTextEditor : public wxGridCellEditor +class WXDLLIMPEXP_ADV wxGridCellTextEditor : public wxGridCellEditor { public: wxGridCellTextEditor(); @@ -435,7 +435,7 @@ private: }; // the editor for numeric (long) data -class WXDLLEXPORT wxGridCellNumberEditor : public wxGridCellTextEditor +class WXDLLIMPEXP_ADV wxGridCellNumberEditor : public wxGridCellTextEditor { public: // 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 -class WXDLLEXPORT wxGridCellFloatEditor : public wxGridCellTextEditor +class WXDLLIMPEXP_ADV wxGridCellFloatEditor : public wxGridCellTextEditor { public: wxGridCellFloatEditor(int width = -1, int precision = -1); @@ -521,7 +521,7 @@ private: #if wxUSE_CHECKBOX // the editor for boolean data -class WXDLLEXPORT wxGridCellBoolEditor : public wxGridCellEditor +class WXDLLIMPEXP_ADV wxGridCellBoolEditor : public wxGridCellEditor { public: wxGridCellBoolEditor() { } @@ -560,7 +560,7 @@ private: #if wxUSE_COMBOBOX // 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: // 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 WXDLLEXPORT wxGridCellAttr : public wxClientDataContainer +class WXDLLIMPEXP_ADV wxGridCellAttr : public wxClientDataContainer { public: enum wxAttrKind @@ -768,7 +768,7 @@ private: // the default implementation is reasonably efficient for the generic case, // but you might still wish to implement your own for some specific situations // if you have performance problems with the stock one -class WXDLLEXPORT wxGridCellAttrProvider : public wxClientDataContainer +class WXDLLIMPEXP_ADV wxGridCellAttrProvider : public wxClientDataContainer { public: wxGridCellAttrProvider(); @@ -804,7 +804,7 @@ private: ////////////////////////////////////////////////////////////////////// -class WXDLLEXPORT wxGridTableBase : public wxObject, public wxClientDataContainer +class WXDLLIMPEXP_ADV wxGridTableBase : public wxObject, public wxClientDataContainer { public: wxGridTableBase(); @@ -905,7 +905,7 @@ enum wxGridTableRequest wxGRIDTABLE_NOTIFY_COLS_DELETED }; -class WXDLLEXPORT wxGridTableMessage +class WXDLLIMPEXP_ADV wxGridTableMessage { public: wxGridTableMessage(); @@ -947,7 +947,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxArrayString, wxGridStringArray); // that are stored in memory // -class WXDLLEXPORT wxGridStringTable : public wxGridTableBase +class WXDLLIMPEXP_ADV wxGridStringTable : public wxGridTableBase { public: wxGridStringTable(); @@ -999,7 +999,7 @@ private: // wxGridCellCoords: location of a cell in the grid // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGridCellCoords +class WXDLLIMPEXP_ADV wxGridCellCoords { public: wxGridCellCoords() { m_row = m_col = -1; } @@ -1046,8 +1046,8 @@ private: // For comparisons... // -extern WXDLLEXPORT wxGridCellCoords wxGridNoCellCoords; -extern WXDLLEXPORT wxRect wxGridNoCellRect; +extern WXDLLIMPEXP_ADV wxGridCellCoords wxGridNoCellCoords; +extern WXDLLIMPEXP_ADV wxRect wxGridNoCellRect; // An array of cell coords... // @@ -1057,7 +1057,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellCoords, wxGridCellCoordsArray); // wxGrid // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGrid : public wxScrolledWindow +class WXDLLIMPEXP_ADV wxGrid : public wxScrolledWindow { public: wxGrid() @@ -1904,7 +1904,7 @@ protected: bool GetModelValues(); bool SetModelValues(); - friend class WXDLLEXPORT wxGridSelection; + friend class WXDLLIMPEXP_ADV wxGridSelection; DECLARE_DYNAMIC_CLASS( wxGrid ) DECLARE_EVENT_TABLE() @@ -1916,7 +1916,7 @@ protected: // Grid event class and event types // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGridEvent : public wxNotifyEvent +class WXDLLIMPEXP_ADV wxGridEvent : public wxNotifyEvent { public: wxGridEvent() @@ -1952,7 +1952,7 @@ protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxGridEvent) }; -class WXDLLEXPORT wxGridSizeEvent : public wxNotifyEvent +class WXDLLIMPEXP_ADV wxGridSizeEvent : public wxNotifyEvent { public: wxGridSizeEvent() @@ -1985,7 +1985,7 @@ protected: }; -class WXDLLEXPORT wxGridRangeSelectEvent : public wxNotifyEvent +class WXDLLIMPEXP_ADV wxGridRangeSelectEvent : public wxNotifyEvent { public: wxGridRangeSelectEvent() @@ -2032,7 +2032,7 @@ protected: }; -class WXDLLEXPORT wxGridEditorCreatedEvent : public wxCommandEvent { +class WXDLLIMPEXP_ADV wxGridEditorCreatedEvent : public wxCommandEvent { public: wxGridEditorCreatedEvent() : wxCommandEvent() @@ -2063,22 +2063,22 @@ private: BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK, 1580) - DECLARE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK, 1581) - DECLARE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK, 1582) - DECLARE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK, 1583) - DECLARE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK, 1584) - DECLARE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK, 1585) - DECLARE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK, 1586) - DECLARE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK, 1587) - DECLARE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE, 1588) - DECLARE_EVENT_TYPE(wxEVT_GRID_COL_SIZE, 1589) - DECLARE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT, 1590) - DECLARE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE, 1591) - DECLARE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL, 1592) - DECLARE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN, 1593) - DECLARE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN, 1594) - DECLARE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED, 1595) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_LEFT_CLICK, 1580) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_RIGHT_CLICK, 1581) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_LEFT_DCLICK, 1582) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_RIGHT_DCLICK, 1583) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_CLICK, 1584) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_CLICK, 1585) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_LEFT_DCLICK, 1586) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_LABEL_RIGHT_DCLICK, 1587) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_ROW_SIZE, 1588) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_COL_SIZE, 1589) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_RANGE_SELECT, 1590) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_CELL_CHANGE, 1591) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_SELECT_CELL, 1592) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_SHOWN, 1593) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_HIDDEN, 1594) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_GRID_EDITOR_CREATED, 1595) END_DECLARE_EVENT_TYPES() diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h index 9699f0476b..5fa5720f03 100644 --- a/include/wx/generic/gridctrl.h +++ b/include/wx/generic/gridctrl.h @@ -29,7 +29,7 @@ #if wxUSE_DATETIME // the default renderer for the cells containing Time and dates.. -class WXDLLEXPORT wxGridCellDateTimeRenderer : public wxGridCellStringRenderer +class WXDLLIMPEXP_ADV wxGridCellDateTimeRenderer : public wxGridCellStringRenderer { public: wxGridCellDateTimeRenderer(wxString outformat = _T("%c"), @@ -65,7 +65,7 @@ protected: #endif // wxUSE_DATETIME // the default renderer for the cells containing Time and dates.. -class WXDLLEXPORT wxGridCellEnumRenderer : public wxGridCellStringRenderer +class WXDLLIMPEXP_ADV wxGridCellEnumRenderer : public wxGridCellStringRenderer { public: wxGridCellEnumRenderer( const wxString& choices = wxEmptyString ); @@ -97,7 +97,7 @@ protected: #if wxUSE_COMBOBOX -class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor +class WXDLLIMPEXP_ADV wxGridCellEnumEditor : public wxGridCellChoiceEditor { public: wxGridCellEnumEditor( const wxString& choices = wxEmptyString ); @@ -116,7 +116,7 @@ private: #endif // wxUSE_COMBOBOX -class WXDLLEXPORT wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor +class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor { public: wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { } @@ -130,7 +130,7 @@ public: DECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor) }; -class WXDLLEXPORT wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer +class WXDLLIMPEXP_ADV wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer { public: wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { } diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h index 906fb11996..58c110ee57 100644 --- a/include/wx/generic/gridsel.h +++ b/include/wx/generic/gridsel.h @@ -22,7 +22,7 @@ #include "wx/grid.h" -class WXDLLEXPORT wxGridSelection{ +class WXDLLIMPEXP_ADV wxGridSelection{ public: wxGridSelection( wxGrid * grid, wxGrid::wxGridSelectionModes sel = wxGrid::wxGridSelectCells ); @@ -82,7 +82,7 @@ private: wxGrid *m_grid; wxGrid::wxGridSelectionModes m_selectionMode; - friend class WXDLLEXPORT wxGrid; + friend class WXDLLIMPEXP_ADV wxGrid; DECLARE_NO_COPY_CLASS(wxGridSelection) }; diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h index 03c66e5fe3..9711fbc42c 100644 --- a/include/wx/generic/helpext.h +++ b/include/wx/generic/helpext.h @@ -26,7 +26,7 @@ #define WXEXTHELP_SEPARATOR _T('/') #endif -class WXDLLEXPORT wxExtHelpMapList; +class WXDLLIMPEXP_ADV wxExtHelpMapList; #ifndef WXEXTHELP_DEFAULTBROWSER /// Default browser name. @@ -54,7 +54,7 @@ class WXDLLEXPORT wxExtHelpMapList; Lines starting with ';' will be ignored. */ -class WXDLLEXPORT wxExtHelpController : public wxHelpControllerBase +class WXDLLIMPEXP_ADV wxExtHelpController : public wxHelpControllerBase { DECLARE_CLASS(wxExtHelpController) public: diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h index ccbb0e58ee..68f2f5d7ed 100644 --- a/include/wx/generic/laywin.h +++ b/include/wx/generic/laywin.h @@ -24,8 +24,8 @@ #endif // wxUSE_SASH BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EVENT_TYPE(wxEVT_QUERY_LAYOUT_INFO, 1500) - DECLARE_EVENT_TYPE(wxEVT_CALCULATE_LAYOUT, 1501) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_QUERY_LAYOUT_INFO, 1500) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_CALCULATE_LAYOUT, 1501) END_DECLARE_EVENT_TYPES() enum wxLayoutOrientation @@ -59,7 +59,7 @@ enum wxLayoutAlignment * orientation and size. */ -class WXDLLEXPORT wxQueryLayoutInfoEvent: public wxEvent +class WXDLLIMPEXP_ADV wxQueryLayoutInfoEvent: public wxEvent { public: 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. */ -class WXDLLEXPORT wxCalculateLayoutEvent: public wxEvent +class WXDLLIMPEXP_ADV wxCalculateLayoutEvent: public wxEvent { public: 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, // and can provide sashes too. Useful for implementing docked windows with sashes in // an IDE-style interface. -class WXDLLEXPORT wxSashLayoutWindow: public wxSashWindow +class WXDLLIMPEXP_ADV wxSashLayoutWindow: public wxSashWindow { public: wxSashLayoutWindow() @@ -202,7 +202,7 @@ class WXDLLEXPORT wxMDIParentFrame; class WXDLLEXPORT wxFrame; // This class implements the layout algorithm -class WXDLLEXPORT wxLayoutAlgorithm: public wxObject +class WXDLLIMPEXP_ADV wxLayoutAlgorithm: public wxObject { public: wxLayoutAlgorithm() {} diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h index bad1784c85..dc7c8a6a2e 100644 --- a/include/wx/generic/sashwin.h +++ b/include/wx/generic/sashwin.h @@ -40,7 +40,7 @@ enum wxSashEdgePosition { * wxSashEdge represents one of the four edges of a window. */ -class WXDLLEXPORT wxSashEdge +class WXDLLIMPEXP_ADV wxSashEdge { public: wxSashEdge() { m_show = FALSE; m_border = FALSE; m_margin = 0; } @@ -67,7 +67,7 @@ public: * of wxSashWindow. */ -class WXDLLEXPORT wxSashWindow: public wxWindow +class WXDLLIMPEXP_ADV wxSashWindow: public wxWindow { public: // Default constructor @@ -197,7 +197,8 @@ private: }; 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() // #define wxEVT_SASH_DRAGGED (wxEVT_FIRST + 1200) @@ -208,7 +209,7 @@ enum wxSashDragStatus wxSASH_STATUS_OUT_OF_RANGE }; -class WXDLLEXPORT wxSashEvent: public wxCommandEvent +class WXDLLIMPEXP_ADV wxSashEvent: public wxCommandEvent { public: inline wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE) { diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index a6a580c0e9..fc4112bc86 100644 --- a/include/wx/generic/splash.h +++ b/include/wx/generic/splash.h @@ -34,13 +34,13 @@ #define wxSPLASH_TIMEOUT 0x04 #define wxSPLASH_NO_TIMEOUT 0x00 -class WXDLLEXPORT wxSplashScreenWindow; +class WXDLLIMPEXP_ADV wxSplashScreenWindow; /* * wxSplashScreen */ -class WXDLLEXPORT wxSplashScreen: public wxFrame +class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame { public: // for RTTI macros only @@ -65,8 +65,8 @@ protected: int m_milliseconds; wxTimer m_timer; -DECLARE_DYNAMIC_CLASS(wxSplashScreen) -DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxSplashScreen) + DECLARE_EVENT_TABLE() DECLARE_NO_COPY_CLASS(wxSplashScreen) }; @@ -74,7 +74,7 @@ DECLARE_EVENT_TABLE() * wxSplashScreenWindow */ -class WXDLLEXPORT wxSplashScreenWindow: public wxWindow +class WXDLLIMPEXP_ADV wxSplashScreenWindow: public wxWindow { public: wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER); diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h index 712c6796ba..f6e3e6509e 100644 --- a/include/wx/generic/wizard.h +++ b/include/wx/generic/wizard.h @@ -19,11 +19,11 @@ class WXDLLEXPORT wxButton; class WXDLLEXPORT wxStaticBitmap; -class WXDLLEXPORT wxWizardEvent; +class WXDLLIMPEXP_ADV wxWizardEvent; class WXDLLEXPORT wxBoxSizer; -class WXDLLEXPORT wxWizardSizer; +class WXDLLIMPEXP_ADV wxWizardSizer; -class WXDLLEXPORT wxWizard : public wxWizardBase +class WXDLLIMPEXP_ADV wxWizard : public wxWizardBase { public: // ctor diff --git a/include/wx/tipdlg.h b/include/wx/tipdlg.h index fe7a6be5c4..ab9aef0a46 100644 --- a/include/wx/tipdlg.h +++ b/include/wx/tipdlg.h @@ -36,7 +36,7 @@ // 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 // the same tip (of course, you may use random starting position as well...) -class WXDLLEXPORT wxTipProvider +class WXDLLIMPEXP_ADV wxTipProvider { public: wxTipProvider(size_t currentTip) { m_currentTip = currentTip; } @@ -65,8 +65,8 @@ protected: // specified text file as the source of tips (each line is a tip). // // NB: the caller is responsible for deleting the pointer! -WXDLLEXPORT wxTipProvider *wxCreateFileTipProvider(const wxString& filename, - size_t currentTip); +WXDLLIMPEXP_ADV wxTipProvider *wxCreateFileTipProvider(const wxString& filename, + size_t currentTip); // ---------------------------------------------------------------------------- // wxTipDialog @@ -79,9 +79,9 @@ WXDLLEXPORT wxTipProvider *wxCreateFileTipProvider(const wxString& filename, // not, the dialog on startup depending on its value, not this class). // // The function returns TRUE if this checkbox is checked, FALSE otherwise. -WXDLLEXPORT bool wxShowTip(wxWindow *parent, - wxTipProvider *tipProvider, - bool showAtStartup = TRUE); +WXDLLIMPEXP_ADV bool wxShowTip(wxWindow *parent, + wxTipProvider *tipProvider, + bool showAtStartup = TRUE); #endif // wxUSE_STARTUP_TIPS diff --git a/include/wx/wizard.h b/include/wx/wizard.h index d1747e8fa2..1220ddbe2a 100644 --- a/include/wx/wizard.h +++ b/include/wx/wizard.h @@ -36,7 +36,7 @@ #define wxWIZARD_EX_HELPBUTTON 0x00000010 // forward declarations -class WXDLLEXPORT wxWizard; +class WXDLLIMPEXP_ADV wxWizard; // ---------------------------------------------------------------------------- // 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). // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWizardPage : public wxPanel +class WXDLLIMPEXP_ADV wxWizardPage : public wxPanel { public: wxWizardPage() { Init(); } @@ -93,7 +93,7 @@ private: // this, you must derive from wxWizardPage directly. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWizardPageSimple : public wxWizardPage +class WXDLLIMPEXP_ADV wxWizardPageSimple : public wxWizardPage { public: wxWizardPageSimple() { Init(); } @@ -156,7 +156,7 @@ private: // wxWizard // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWizardBase : public wxDialog +class WXDLLIMPEXP_ADV wxWizardBase : public wxDialog { public: /* @@ -235,7 +235,7 @@ private: // window hierarchy as usual // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWizardEvent : public wxNotifyEvent +class WXDLLIMPEXP_ADV wxWizardEvent : public wxNotifyEvent { public: wxWizardEvent(wxEventType type = wxEVT_NULL, diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index c7bb960e07..37281b5645 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -123,7 +123,7 @@ DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED) // private classes // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGridRowLabelWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxWindow { public: wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; } @@ -145,7 +145,7 @@ private: }; -class WXDLLEXPORT wxGridColLabelWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow { public: wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; } @@ -167,7 +167,7 @@ private: }; -class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow { public: wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; } @@ -188,7 +188,7 @@ private: DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow) }; -class WXDLLEXPORT wxGridWindow : public wxWindow +class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow { public: wxGridWindow() @@ -263,7 +263,7 @@ END_EVENT_TABLE() // ---------------------------------------------------------------------------- // this class stores attributes set for cells -class WXDLLEXPORT wxGridCellAttrData +class WXDLLIMPEXP_ADV wxGridCellAttrData { public: void SetAttr(wxGridCellAttr *attr, int row, int col); @@ -279,7 +279,7 @@ private: }; // this class stores attributes set for rows or columns -class WXDLLEXPORT wxGridRowOrColAttrData +class WXDLLIMPEXP_ADV wxGridRowOrColAttrData { public: // empty ctor to suppress warnings @@ -297,7 +297,7 @@ private: // NB: this is just a wrapper around 3 objects: one which stores cell // attributes, and 2 others for row/col ones -class WXDLLEXPORT wxGridCellAttrProviderData +class WXDLLIMPEXP_ADV wxGridCellAttrProviderData { public: wxGridCellAttrData m_cellAttrs; @@ -335,7 +335,7 @@ struct wxGridDataTypeInfo WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxGridDataTypeInfo*, wxGridDataTypeInfoArray); -class WXDLLEXPORT wxGridTypeRegistry +class WXDLLIMPEXP_ADV wxGridTypeRegistry { public: wxGridTypeRegistry() {} diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index 9e450d4bad..fd74ee77ab 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -61,7 +61,7 @@ static const int wxID_NEXT_TIP = 32000; // whatever // an implementation which takes the tips from the text file - each line // represents a tip -class WXDLLEXPORT wxFileTipProvider : public wxTipProvider +class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider { public: wxFileTipProvider(const wxString& filename, size_t currentTip); @@ -76,7 +76,7 @@ private: #ifdef __WIN32__ // TODO an implementation which takes the tips from the given registry key -class WXDLLEXPORT wxRegTipProvider : public wxTipProvider +class WXDLLIMPEXP_ADV wxRegTipProvider : public wxTipProvider { public: wxRegTipProvider(const wxString& keyname); @@ -93,7 +93,7 @@ wxString wxRegTipProvider::GetTip() #endif // __WIN32__ // the dialog we show in wxShowTip() -class WXDLLEXPORT wxTipDialog : public wxDialog +class WXDLLIMPEXP_ADV wxTipDialog : public wxDialog { public: wxTipDialog(wxWindow *parent, -- 2.45.2