From: Václav Slavík Date: Tue, 14 Dec 1999 23:57:30 +0000 (+0000) Subject: removed USE_SHARED_LIBRARY(IES) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521?hp=fed628b632d8ae95efded1f6a6894573c7a76bef removed USE_SHARED_LIBRARY(IES) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index 045ff85556..04cd0ccdb2 100644 --- a/src/common/cmndata.cpp +++ b/src/common/cmndata.cpp @@ -72,7 +72,6 @@ #endif #endif // MSW -#if !USE_SHARED_LIBRARY #if wxUSE_PRINTING_ARCHITECTURE IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject) @@ -80,7 +79,6 @@ #endif // wxUSE_PRINTING_ARCHITECTURE IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject) -#endif #ifdef __WXMAC__ #define mm2pt 2.83464566929 diff --git a/src/common/date.cpp b/src/common/date.cpp index 47a054d20a..4d506347eb 100644 --- a/src/common/date.cpp +++ b/src/common/date.cpp @@ -54,9 +54,7 @@ static const wxChar *mname[] = { static int GauDays[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject) -#endif //////////////////////////////////////////////////////////// // Constructors diff --git a/src/common/docview.cpp b/src/common/docview.cpp index cdf0153e1b..5f8f896791 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -76,7 +76,6 @@ // wxWindows macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler) IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler) IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject) @@ -91,7 +90,6 @@ IMPLEMENT_CLASS(wxCommand, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject) -#endif // ---------------------------------------------------------------------------- // function prototypes diff --git a/src/common/event.cpp b/src/common/event.cpp index 795bbef448..4b157d7e99 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -50,7 +50,6 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) @@ -94,7 +93,6 @@ const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } }; -#endif // !USE_SHARED_LIBRARY // ---------------------------------------------------------------------------- // global variables diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 88d201fa03..e5b536b0a6 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -122,9 +122,7 @@ extern wxChar *wxBuffer; #include "fspcompa.h" #endif -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) -#endif // ---------------------------------------------------------------------------- // private globals diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp index 0ff2dfda36..70e4e9a688 100644 --- a/src/common/ftp.cpp +++ b/src/common/ftp.cpp @@ -48,10 +48,8 @@ #define FTP_BSIZE 1024 -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol) IMPLEMENT_PROTOCOL(wxFTP, wxT("ftp"), wxT("ftp"), TRUE) -#endif //////////////////////////////////////////////////////////////// ////// wxFTP constructor and destructor //////////////////////// diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 6556626804..eb97decf64 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -50,7 +50,6 @@ #endif #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxColourDatabase, wxList) IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList) IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList) @@ -59,7 +58,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList) IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject) -#endif wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight) { diff --git a/src/common/hash.cpp b/src/common/hash.cpp index 330f4b990a..fbee85aceb 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp @@ -29,9 +29,7 @@ #include #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject) -#endif wxHashTable::wxHashTable (int the_key_type, int size) { diff --git a/src/common/helpbase.cpp b/src/common/helpbase.cpp index da1d222c58..94d808ac5b 100644 --- a/src/common/helpbase.cpp +++ b/src/common/helpbase.cpp @@ -28,8 +28,6 @@ #if wxUSE_HELP -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxHelpControllerBase, wxObject) -#endif #endif // wxUSE_HELP diff --git a/src/common/http.cpp b/src/common/http.cpp index bd5f2cad8f..26820e2f02 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -32,10 +32,8 @@ #include "wx/protocol/http.h" #include "wx/sckstrm.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol) IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE) -#endif #define HTTP_BSIZE 2048 diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index 36483f8172..556802bfad 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -46,9 +46,7 @@ // wxBMPHandler //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler) -#endif #if wxUSE_STREAMS diff --git a/src/common/image.cpp b/src/common/image.cpp index 5931d63cb1..1eaadf02e2 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -81,9 +81,7 @@ wxList wxImage::sm_handlers; #define M_IMGDATA ((wxImageRefData *)m_refData) -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject) -#endif wxImage::wxImage() { @@ -659,9 +657,7 @@ void wxImage::CleanUpHandlers() // wxImageHandler //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject) -#endif #if wxUSE_STREAMS bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) ) diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp index 76d8c72594..5bbe4ec0f8 100644 --- a/src/common/imaggif.cpp +++ b/src/common/imaggif.cpp @@ -31,9 +31,7 @@ #include "wx/log.h" #include "wx/intl.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler) -#endif //----------------------------------------------------------------------------- // wxGIFHandler diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index 779d6cd498..245f8d911c 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -56,9 +56,7 @@ extern "C" // wxJPEGHandler //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler) -#endif #if wxUSE_STREAMS diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp index 97e07ac067..93d3502870 100644 --- a/src/common/imagpcx.cpp +++ b/src/common/imagpcx.cpp @@ -380,9 +380,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream) // wxPCXHandler //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler) -#endif bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) ) { diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 3673027389..6a71a8c263 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -53,9 +53,7 @@ // wxPNGHandler //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) -#endif #if wxUSE_LIBPNG diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp index 700ea8d0b6..3c34cbc822 100644 --- a/src/common/imagpnm.cpp +++ b/src/common/imagpnm.cpp @@ -34,9 +34,7 @@ // wxBMPHandler //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler) -#endif #if wxUSE_STREAMS diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index ab692dec26..ed5b06bc76 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -43,9 +43,7 @@ extern "C" // wxTIFFHandler //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler) -#endif static tsize_t _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size) diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp index 717eb20c60..5ec21ae574 100644 --- a/src/common/ipcbase.cpp +++ b/src/common/ipcbase.cpp @@ -26,10 +26,8 @@ #include "wx/ipcbase.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxServerBase, wxObject) IMPLEMENT_CLASS(wxClientBase, wxObject) IMPLEMENT_CLASS(wxConnectionBase, wxObject) -#endif diff --git a/src/common/layout.cpp b/src/common/layout.cpp index 188d4c6d8f..678e8bd1c1 100644 --- a/src/common/layout.cpp +++ b/src/common/layout.cpp @@ -44,10 +44,8 @@ #include "wx/layout.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject) -#endif wxIndividualLayoutConstraint::wxIndividualLayoutConstraint() diff --git a/src/common/object.cpp b/src/common/object.cpp index 41fce11f16..0dadb59974 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -44,11 +44,9 @@ #include "wx/ioswrap.h" #endif -#if !USE_SHARED_LIBRARY wxClassInfo wxObject::sm_classwxObject((wxChar *) wxT("wxObject"), (wxChar *) NULL, (wxChar *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL); wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL; wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL; -#endif /* * wxWindows root object. diff --git a/src/common/odbc.cpp b/src/common/odbc.cpp index 103fdda8af..bdf71719d7 100644 --- a/src/common/odbc.cpp +++ b/src/common/odbc.cpp @@ -51,12 +51,10 @@ HENV wxDatabase::hEnv = 0; int wxDatabase::refCount = 0; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDatabase, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxQueryCol, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxQueryField, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxRecordSet, wxObject) -#endif wxDatabase::wxDatabase(void) { diff --git a/src/common/paper.cpp b/src/common/paper.cpp index b2c77b66af..37dff8558d 100644 --- a/src/common/paper.cpp +++ b/src/common/paper.cpp @@ -45,10 +45,8 @@ #endif // End __WXMSW__ -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList) -#endif /* * Paper size database for all platforms diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index 7966f5479b..8ca74fb4d8 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -55,7 +55,6 @@ #endif #endif // __WXMSW__ -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxPrinterBase, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject) IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow) @@ -71,7 +70,6 @@ BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow) EVT_PAINT(wxPreviewCanvas::OnPaint) EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged) END_EVENT_TABLE() -#endif /* * Printer diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp index 64939970e6..eab8724ef4 100644 --- a/src/common/protocol.cpp +++ b/src/common/protocol.cpp @@ -128,9 +128,7 @@ public: void OnExit(); }; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule) -#endif bool wxProtocolModule::OnInit() { diff --git a/src/common/resource.cpp b/src/common/resource.cpp index e070a680b4..22337514a1 100644 --- a/src/common/resource.cpp +++ b/src/common/resource.cpp @@ -119,10 +119,8 @@ void wxLogWarning(char *msg) wxMessageBox(msg, _("Warning"), wxOK); } -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable) -#endif wxItemResource::wxItemResource() { diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index fbfea8ce3b..75a6079af4 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -37,7 +37,6 @@ #include "wx/gsocket.h" #include "wx/sckaddr.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress) #ifdef ENABLE_IPV6 @@ -46,7 +45,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress) #ifdef __UNIX__ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) #endif -#endif // --------------------------------------------------------------------------- // wxIPV4address diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp index f5ddc187ea..220f95294c 100644 --- a/src/common/sckfile.cpp +++ b/src/common/sckfile.cpp @@ -27,10 +27,8 @@ #include "wx/wfstream.h" #include "wx/protocol/file.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol) IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, FALSE) -#endif wxFileProto::wxFileProto() : wxProtocol() diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp index fa5863aa2c..b9e286ffbf 100644 --- a/src/common/sckipc.cpp +++ b/src/common/sckipc.cpp @@ -35,11 +35,9 @@ #pragma hdrstop #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase) IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase) IMPLEMENT_DYNAMIC_CLASS(wxTCPConnection, wxConnectionBase) -#endif // It seems to be already defined somewhere in the Xt includes. #ifndef __XT__ diff --git a/src/common/serbase.cpp b/src/common/serbase.cpp index 85388cf0d7..5bc0943b9e 100644 --- a/src/common/serbase.cpp +++ b/src/common/serbase.cpp @@ -32,10 +32,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxObject_Serialize,wxObject) -#if !USE_SHARED_LIBRARY IMPLEMENT_SERIAL_CLASS(wxList, wxObject) IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject) -#endif void WXSERIAL(wxList)::StoreObject(wxObjectOutputStream& s) { diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 608ccd38d4..795fc131dd 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -57,12 +57,10 @@ // -------------------------------------------------------------- // ClassInfos // -------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxSocketBase, wxObject) IMPLEMENT_CLASS(wxSocketServer, wxSocketBase) IMPLEMENT_CLASS(wxSocketClient, wxSocketBase) IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent) -#endif class wxSocketState : public wxObject { diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp index 615d76c560..2f855b19a8 100644 --- a/src/common/tbarbase.cpp +++ b/src/common/tbarbase.cpp @@ -35,7 +35,6 @@ #include "wx/tbarbase.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxToolBarBase, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool, wxObject) @@ -44,7 +43,6 @@ BEGIN_EVENT_TABLE(wxToolBarBase, wxControl) EVT_SIZE(wxToolBarBase::OnSize) EVT_IDLE(wxToolBarBase::OnIdle) END_EVENT_TABLE() -#endif // Keep a list of all toolbars created, so you can tell whether a toolbar // is still valid: a tool may have quit the toolbar. diff --git a/src/common/tbarsmpl.cpp b/src/common/tbarsmpl.cpp index 662c6aa4f8..db6caf0cf2 100644 --- a/src/common/tbarsmpl.cpp +++ b/src/common/tbarsmpl.cpp @@ -31,7 +31,6 @@ #include "wx/tbarsmpl.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase) @@ -40,7 +39,6 @@ BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase) EVT_KILL_FOCUS(wxToolBarSimple::OnKillFocus) EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent) END_EVENT_TABLE() -#endif wxToolBarSimple::wxToolBarSimple(void) { diff --git a/src/common/time.cpp b/src/common/time.cpp index 1e358e4a09..ee697899ea 100644 --- a/src/common/time.cpp +++ b/src/common/time.cpp @@ -45,9 +45,7 @@ seconds since January 1, 1901, GMT. #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject) -#endif extern bool wxGetLocalTime(long *timeZone, int *dstObserved); diff --git a/src/common/url.cpp b/src/common/url.cpp index 71cae1f2f7..8c680f6905 100644 --- a/src/common/url.cpp +++ b/src/common/url.cpp @@ -28,10 +28,8 @@ #include "wx/utils.h" #include "wx/url.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxProtoInfo, wxObject) IMPLEMENT_CLASS(wxURL, wxObject) -#endif // Protocols list wxProtoInfo *wxURL::g_protocols = NULL; diff --git a/src/common/validate.cpp b/src/common/validate.cpp index 44e0caeece..92848841c4 100644 --- a/src/common/validate.cpp +++ b/src/common/validate.cpp @@ -34,9 +34,7 @@ const wxValidator wxDefaultValidator; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler) -#endif // VZ: personally, I think TRUE would be more appropriate - these bells are // _annoying_ diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 9fdf5b77e7..2d6bbca2f4 100644 --- a/src/common/valtext.cpp +++ b/src/common/valtext.cpp @@ -40,13 +40,11 @@ #include #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator) BEGIN_EVENT_TABLE(wxTextValidator, wxValidator) EVT_CHAR(wxTextValidator::OnChar) END_EVENT_TABLE() -#endif static bool wxIsNumeric(const wxString& val); diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp index 9db80bb028..bbfce13288 100644 --- a/src/common/wxexpr.cpp +++ b/src/common/wxexpr.cpp @@ -800,9 +800,7 @@ void wxExpr::WriteExpr(FILE* stream) // Write as any other subexpression * wxExpr 'database' (list of expressions) */ -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList) -#endif wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler) { diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp index a0636f159b..4e6b969ccc 100644 --- a/src/generic/choicdgg.cpp +++ b/src/generic/choicdgg.cpp @@ -156,14 +156,12 @@ int wxGetMultipleChoice(const wxString& message, const wxString& caption, // wxSingleChoiceDialog -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog) EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK) EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick) END_EVENT_TABLE() IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog) -#endif #if defined(__WXMSW__) || defined(__WXMAC__) #define wxCHOICEDLG_DIALOG_STYLE (wxDEFAULT_DIALOG_STYLE | \ diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index 4d86072e80..4049e421fe 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -41,7 +41,6 @@ #include "wx/generic/colrdlgg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog) BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog) @@ -54,7 +53,6 @@ BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog) EVT_CLOSE(wxGenericColourDialog::OnCloseWindow) END_EVENT_TABLE() -#endif /* * Generic wxColourDialog diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 4810b32078..cdba095cf4 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -2156,10 +2156,8 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, wxPrintSetupData *wxThePrintSetupData = (wxPrintSetupData *) NULL; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject) -#endif // Redundant now I think #if 1 diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp index d86581761f..d5b8014cbf 100644 --- a/src/generic/dirdlgg.cpp +++ b/src/generic/dirdlgg.cpp @@ -359,11 +359,7 @@ void wxDirCtrl::OnCollapseItem(wxTreeEvent &event ) //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY -IMPLEMENT_CLASS(wxDirDialog, wxDialog) -#else IMPLEMENT_DYNAMIC_CLASS( wxDirDialog, wxDialog ) -#endif BEGIN_EVENT_TABLE( wxDirDialog, wxDialog ) EVT_TREE_KEY_DOWN (ID_DIRCTRL, wxDirDialog::OnTreeKeyDown) diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp index 494e6e104f..a7c96f9667 100644 --- a/src/generic/fontdlgg.cpp +++ b/src/generic/fontdlgg.cpp @@ -40,7 +40,6 @@ #include "wx/cmndata.h" #include "wx/generic/fontdlgg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog) BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog) @@ -54,7 +53,6 @@ BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog) EVT_CLOSE(wxGenericFontDialog::OnCloseWindow) END_EVENT_TABLE() -#endif #define NUM_COLS 48 static wxString wxColourDialogNames[NUM_COLS]={wxT("ORANGE"), diff --git a/src/generic/helpxlp.cpp b/src/generic/helpxlp.cpp index 26bec27921..532fc03bcf 100644 --- a/src/generic/helpxlp.cpp +++ b/src/generic/helpxlp.cpp @@ -53,7 +53,6 @@ #include "wx/generic/helpxlp.h" -#if !USE_SHARED_LIBRARY #ifdef __WXMSW__ IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient) @@ -64,7 +63,6 @@ IMPLEMENT_CLASS(wxXLPHelpConnection, wxTCPConnection) #endif IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase) -#endif // suppress annoying warning "'this' used in base member init list" (so what?) #ifdef __VISUALC__ diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp index 19aefb7c06..1fea61eafe 100644 --- a/src/generic/msgdlgg.cpp +++ b/src/generic/msgdlgg.cpp @@ -46,7 +46,6 @@ // icons // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog) EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes) EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo) @@ -54,7 +53,6 @@ BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog) END_EVENT_TABLE() IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog) -#endif wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString& message, diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp index 89dca44793..926f404c0e 100644 --- a/src/generic/notebook.cpp +++ b/src/generic/notebook.cpp @@ -45,7 +45,6 @@ // event table // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES BEGIN_EVENT_TABLE(wxNotebook, wxControl) EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) EVT_SIZE(wxNotebook::OnSize) @@ -58,7 +57,6 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) -#endif // ============================================================================ // implementation diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index 38d4b13ee3..9ac21f6245 100644 --- a/src/generic/panelg.cpp +++ b/src/generic/panelg.cpp @@ -29,7 +29,6 @@ #include "wx/generic/panelg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow) BEGIN_EVENT_TABLE(wxPanel, wxWindow) @@ -39,7 +38,6 @@ BEGIN_EVENT_TABLE(wxPanel, wxWindow) EVT_SIZE(wxPanel::OnSize) END_EVENT_TABLE() -#endif void wxPanel::Init() { diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp index bab3bf9a56..0e994766b9 100644 --- a/src/generic/printps.cpp +++ b/src/generic/printps.cpp @@ -54,10 +54,8 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase) IMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase) -#endif // ============================================================================ // implementation diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp index e3fec631d5..2458e8729a 100644 --- a/src/generic/prntdlgg.cpp +++ b/src/generic/prntdlgg.cpp @@ -73,7 +73,6 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY #if wxUSE_POSTSCRIPT @@ -92,7 +91,6 @@ BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog) EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter) END_EVENT_TABLE() -#endif // USE_SHARED_LIBRARY // ---------------------------------------------------------------------------- // global vars diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index 46f42696d9..812b9a7e8c 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -64,14 +64,12 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label); // event tables // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog) EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel) EVT_CLOSE(wxProgressDialog::OnClose) END_EVENT_TABLE() IMPLEMENT_CLASS(wxProgressDialog, wxDialog) -#endif // ============================================================================ // implementation diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp index ce5219a713..5f4aac2abe 100644 --- a/src/generic/sashwin.cpp +++ b/src/generic/sashwin.cpp @@ -36,7 +36,6 @@ #include "wx/sashwin.h" #include "wx/laywin.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxSashEvent, wxCommandEvent) @@ -45,7 +44,6 @@ BEGIN_EVENT_TABLE(wxSashWindow, wxWindow) EVT_SIZE(wxSashWindow::OnSize) EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent) END_EVENT_TABLE() -#endif wxSashWindow::wxSashWindow() { diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp index 50d44cedd8..a582eb959f 100644 --- a/src/generic/scrolwin.cpp +++ b/src/generic/scrolwin.cpp @@ -27,7 +27,6 @@ #include "wx/generic/scrolwin.h" #include "wx/panel.h" -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel) EVT_SCROLLWIN(wxScrolledWindow::OnScroll) EVT_SIZE(wxScrolledWindow::OnSize) @@ -35,7 +34,6 @@ BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel) -#endif #ifdef __WXMSW__ #include "windows.h" diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index 874a63621d..7070960e1e 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -33,7 +33,6 @@ #include "wx/dcscreen.h" #include "wx/settings.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent) @@ -50,7 +49,6 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow) EVT_SPLITTER_DCLICK(-1, wxSplitterWindow::OnDoubleClick) EVT_SPLITTER_UNSPLIT(-1, wxSplitterWindow::OnUnsplitEvent) END_EVENT_TABLE() -#endif wxSplitterWindow::wxSplitterWindow() { diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 98dc359b26..73919d52ac 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -34,14 +34,12 @@ #include "wx/msw/winundef.h" #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow) BEGIN_EVENT_TABLE(wxStatusBar, wxWindow) EVT_PAINT(wxStatusBar::OnPaint) EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged) END_EVENT_TABLE() -#endif // Default status border dimensions #define wxTHICK_LINE_BORDER 2 diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp index 40ca7ba6a3..cee822d7af 100644 --- a/src/generic/textdlgg.cpp +++ b/src/generic/textdlgg.cpp @@ -60,13 +60,11 @@ static const int wxID_TEXT = 3000; // wxTextEntryDialog // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog) EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK) END_EVENT_TABLE() IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog) -#endif wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, const wxString& message, diff --git a/src/gtk/gdiobj.cpp b/src/gtk/gdiobj.cpp index fe9fc047c7..64f5b61dfa 100644 --- a/src/gtk/gdiobj.cpp +++ b/src/gtk/gdiobj.cpp @@ -13,7 +13,5 @@ #include "wx/gdiobj.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) -#endif diff --git a/src/gtk/treegtk.cpp b/src/gtk/treegtk.cpp index 771e96b078..0b0799b56b 100644 --- a/src/gtk/treegtk.cpp +++ b/src/gtk/treegtk.cpp @@ -75,10 +75,8 @@ static void gtk_treeitem_select_callback(GtkWidget *widget, wxTreeItemId *treeit owner->SendSelChanged(GTK_TREE_ITEM(widget)); } -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) -#endif void wxTreeCtrl::Init() { m_imageListNormal = NULL; diff --git a/src/gtk1/gdiobj.cpp b/src/gtk1/gdiobj.cpp index fe9fc047c7..64f5b61dfa 100644 --- a/src/gtk1/gdiobj.cpp +++ b/src/gtk1/gdiobj.cpp @@ -13,7 +13,5 @@ #include "wx/gdiobj.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) -#endif diff --git a/src/gtk1/treegtk.cpp b/src/gtk1/treegtk.cpp index 771e96b078..0b0799b56b 100644 --- a/src/gtk1/treegtk.cpp +++ b/src/gtk1/treegtk.cpp @@ -75,10 +75,8 @@ static void gtk_treeitem_select_callback(GtkWidget *widget, wxTreeItemId *treeit owner->SendSelChanged(GTK_TREE_ITEM(widget)); } -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) -#endif void wxTreeCtrl::Init() { m_imageListNormal = NULL; diff --git a/src/mac/accel.cpp b/src/mac/accel.cpp index b0b8734d55..f8796e111a 100644 --- a/src/mac/accel.cpp +++ b/src/mac/accel.cpp @@ -17,9 +17,7 @@ #include "wx/accel.h" #include "wx/string.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) -#endif class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData { diff --git a/src/mac/app.cpp b/src/mac/app.cpp index e85f293e1c..d5bb4c82d1 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -52,12 +52,10 @@ extern wxList *wxWinMacControlList; wxApp *wxTheApp = NULL; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) END_EVENT_TABLE() -#endif const short kMacMinHeap = (29 * 1024) ; diff --git a/src/mac/bitmap.cpp b/src/mac/bitmap.cpp index 3a66121d49..d14b15ba7f 100644 --- a/src/mac/bitmap.cpp +++ b/src/mac/bitmap.cpp @@ -25,10 +25,8 @@ extern "C" #include "xpm.h" } ; -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) -#endif #include diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp index fecc971add..7c8d8d5b31 100644 --- a/src/mac/bmpbuttn.cpp +++ b/src/mac/bmpbuttn.cpp @@ -15,9 +15,7 @@ #include "wx/bmpbuttn.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) -#endif #include diff --git a/src/mac/brush.cpp b/src/mac/brush.cpp index cb9d76d1ab..7ba6dfc990 100644 --- a/src/mac/brush.cpp +++ b/src/mac/brush.cpp @@ -17,9 +17,7 @@ #include "wx/utils.h" #include "wx/brush.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) -#endif wxBrushRefData::wxBrushRefData() { diff --git a/src/mac/button.cpp b/src/mac/button.cpp index c2fad06673..849aeee0e3 100644 --- a/src/mac/button.cpp +++ b/src/mac/button.cpp @@ -15,9 +15,7 @@ #include "wx/button.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) -#endif #include // Button diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp index b0b8734d55..f8796e111a 100644 --- a/src/mac/carbon/accel.cpp +++ b/src/mac/carbon/accel.cpp @@ -17,9 +17,7 @@ #include "wx/accel.h" #include "wx/string.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) -#endif class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData { diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index e85f293e1c..d5bb4c82d1 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -52,12 +52,10 @@ extern wxList *wxWinMacControlList; wxApp *wxTheApp = NULL; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) END_EVENT_TABLE() -#endif const short kMacMinHeap = (29 * 1024) ; diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp index 3a66121d49..d14b15ba7f 100644 --- a/src/mac/carbon/bitmap.cpp +++ b/src/mac/carbon/bitmap.cpp @@ -25,10 +25,8 @@ extern "C" #include "xpm.h" } ; -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) -#endif #include diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp index fecc971add..7c8d8d5b31 100644 --- a/src/mac/carbon/bmpbuttn.cpp +++ b/src/mac/carbon/bmpbuttn.cpp @@ -15,9 +15,7 @@ #include "wx/bmpbuttn.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) -#endif #include diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp index cb9d76d1ab..7ba6dfc990 100644 --- a/src/mac/carbon/brush.cpp +++ b/src/mac/carbon/brush.cpp @@ -17,9 +17,7 @@ #include "wx/utils.h" #include "wx/brush.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) -#endif wxBrushRefData::wxBrushRefData() { diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index c2fad06673..849aeee0e3 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -15,9 +15,7 @@ #include "wx/button.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) -#endif #include // Button diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp index ca99c4b778..aa589bd32d 100644 --- a/src/mac/carbon/checkbox.cpp +++ b/src/mac/carbon/checkbox.cpp @@ -15,10 +15,8 @@ #include "wx/checkbox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) -#endif #include diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp index 2f43152c2a..7387e3e471 100644 --- a/src/mac/carbon/checklst.cpp +++ b/src/mac/carbon/checklst.cpp @@ -23,9 +23,7 @@ // implementation // ============================================================================ -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) -#endif // ---------------------------------------------------------------------------- // implementation of wxCheckListBox class diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp index 42c52012b2..301b0731a8 100644 --- a/src/mac/carbon/choice.cpp +++ b/src/mac/carbon/choice.cpp @@ -17,9 +17,7 @@ #include "wx/choice.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) -#endif bool wxChoice::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp index c6037a9f96..e91938f8ad 100644 --- a/src/mac/carbon/colordlg.cpp +++ b/src/mac/carbon/colordlg.cpp @@ -16,9 +16,7 @@ #include "wx/mac/colordlg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) -#endif /* * wxColourDialog diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp index cc549b5f11..68abfa77bd 100644 --- a/src/mac/carbon/colour.cpp +++ b/src/mac/carbon/colour.cpp @@ -16,9 +16,7 @@ #include "wx/gdicmn.h" #include "wx/colour.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -#endif // Colour diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index 905f3180aa..d1fd686a85 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -16,9 +16,7 @@ #include "wx/combobox.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -#endif // right now we don't support editable comboboxes diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index 037d95784f..5065b239e9 100644 --- a/src/mac/carbon/control.cpp +++ b/src/mac/carbon/control.cpp @@ -18,7 +18,6 @@ #include "wx/tabctrl.h" #include "wx/spinbutt.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) @@ -26,7 +25,6 @@ BEGIN_EVENT_TABLE(wxControl, wxWindow) EVT_CHAR( wxControl::OnKeyDown ) EVT_PAINT( wxControl::OnPaint ) END_EVENT_TABLE() -#endif #include diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp index bcbe30008b..dee7c92b5f 100644 --- a/src/mac/carbon/cursor.cpp +++ b/src/mac/carbon/cursor.cpp @@ -16,9 +16,7 @@ #include "wx/cursor.h" #include "wx/icon.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap) -#endif const short kwxCursorHandId = 9 ; const short kwxCursorSizeWEId = 10 ; diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp index e7b0e503fa..0043d823fb 100644 --- a/src/mac/carbon/dc.cpp +++ b/src/mac/carbon/dc.cpp @@ -15,9 +15,7 @@ #include "wx/dc.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -#endif //----------------------------------------------------------------------------- // constants diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index b4155b572d..12100b81cd 100644 --- a/src/mac/carbon/dcclient.cpp +++ b/src/mac/carbon/dcclient.cpp @@ -28,11 +28,9 @@ // wxPaintDC //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) -#endif /* * wxWindowDC diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp index 2b0bf64c50..449f44e206 100644 --- a/src/mac/carbon/dcprint.cpp +++ b/src/mac/carbon/dcprint.cpp @@ -27,9 +27,7 @@ #include "math.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxPrinterDC, wxDC) -#endif GrafPtr macPrintFormerPort = NULL ; diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp index 1ea12f3d29..1d802afba4 100644 --- a/src/mac/carbon/dcscreen.cpp +++ b/src/mac/carbon/dcscreen.cpp @@ -15,9 +15,7 @@ #include "wx/dcscreen.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) -#endif // Create a DC representing the whole screen wxScreenDC::wxScreenDC() diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp index d0068bc451..d75706f6a3 100644 --- a/src/mac/carbon/dialog.cpp +++ b/src/mac/carbon/dialog.cpp @@ -27,7 +27,6 @@ wxList wxModalDialogs; wxList wxModelessWindows; // Frames and modeless dialogs extern wxList wxPendingDelete; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) BEGIN_EVENT_TABLE(wxDialog, wxPanel) @@ -40,7 +39,6 @@ BEGIN_EVENT_TABLE(wxDialog, wxPanel) EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() -#endif wxDialog::wxDialog() { diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp index edfc211caa..344b8b32b9 100644 --- a/src/mac/carbon/dirdlg.cpp +++ b/src/mac/carbon/dirdlg.cpp @@ -20,9 +20,7 @@ #include "wx/cmndata.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxDirDialog, wxDialog) -#endif enum { kSelectItem = 10, // select button item number diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp index 66de687b80..ee50e2e6bd 100644 --- a/src/mac/carbon/filedlg.cpp +++ b/src/mac/carbon/filedlg.cpp @@ -19,9 +19,7 @@ #include "wx/filedlg.h" #include "wx/intl.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxFileDialog, wxDialog) -#endif // begin wxmac diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp index 988d1c81e2..a5df9049a2 100644 --- a/src/mac/carbon/font.cpp +++ b/src/mac/carbon/font.cpp @@ -18,9 +18,7 @@ #include "wx/font.h" #include "wx/gdicmn.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) -#endif diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp index d775c24c16..9a0843d64b 100644 --- a/src/mac/carbon/fontdlg.cpp +++ b/src/mac/carbon/fontdlg.cpp @@ -17,9 +17,7 @@ #include "wx/mac/fontdlg.h" #include "wx/cmndata.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) -#endif /* * wxFontDialog diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index ba1377151f..cded59c604 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -28,7 +28,6 @@ extern wxList wxModelessWindows; extern wxList wxPendingDelete; -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxWindow) EVT_SIZE(wxFrame::OnSize) EVT_ACTIVATE(wxFrame::OnActivate) @@ -39,7 +38,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxWindow) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif #if wxUSE_NATIVE_STATUSBAR bool wxFrame::m_useNativeStatusBar = TRUE; diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp index 7dc3b5e813..be0d0d0a3c 100644 --- a/src/mac/carbon/gauge.cpp +++ b/src/mac/carbon/gauge.cpp @@ -15,9 +15,7 @@ #include "wx/gauge.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) -#endif #include diff --git a/src/mac/carbon/gdiobj.cpp b/src/mac/carbon/gdiobj.cpp index 63697c8354..46b1aa871f 100644 --- a/src/mac/carbon/gdiobj.cpp +++ b/src/mac/carbon/gdiobj.cpp @@ -15,8 +15,6 @@ #include "wx/gdiobj.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) -#endif // TODO: Nothing to do, unless you want to. diff --git a/src/mac/carbon/helpxxxx.cpp b/src/mac/carbon/helpxxxx.cpp index 086762c646..b7f0babfa2 100644 --- a/src/mac/carbon/helpxxxx.cpp +++ b/src/mac/carbon/helpxxxx.cpp @@ -17,9 +17,7 @@ #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxXXXXHelpController, wxHelpControllerBase) -#endif wxXXXXHelpController::wxXXXXHelpController() { diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp index 537165343e..2fb0616ba8 100644 --- a/src/mac/carbon/icon.cpp +++ b/src/mac/carbon/icon.cpp @@ -15,9 +15,7 @@ #include "wx/icon.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) -#endif /* * Icons @@ -114,4 +112,4 @@ bool wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo return TRUE ; } return FALSE ; -} \ No newline at end of file +} diff --git a/src/mac/carbon/imaglist.cpp b/src/mac/carbon/imaglist.cpp index 4cb47b4e69..cb4b9ff01c 100644 --- a/src/mac/carbon/imaglist.cpp +++ b/src/mac/carbon/imaglist.cpp @@ -15,9 +15,7 @@ #include "wx/stubs/imaglist.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject) -#endif wxImageList::wxImageList() { diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index 19b16e5fe7..ae89e0bcab 100644 --- a/src/mac/carbon/listbox.cpp +++ b/src/mac/carbon/listbox.cpp @@ -21,13 +21,11 @@ #include "wx/utils.h" #include "extldef.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) BEGIN_EVENT_TABLE(wxListBox, wxControl) EVT_SIZE( wxListBox::OnSize ) END_EVENT_TABLE() -#endif #include diff --git a/src/mac/carbon/listctrl.cpp b/src/mac/carbon/listctrl.cpp index d1d8445652..2c11981bf2 100644 --- a/src/mac/carbon/listctrl.cpp +++ b/src/mac/carbon/listctrl.cpp @@ -16,11 +16,9 @@ #include "wx/stubs/textctrl.h" #include "wx/stubs/listctrl.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) -#endif wxListCtrl::wxListCtrl() { diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp index 598f62c3f5..8672b2f897 100644 --- a/src/mac/carbon/mdi.cpp +++ b/src/mac/carbon/mdi.cpp @@ -19,7 +19,6 @@ extern wxList wxModelessWindows; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow) @@ -34,7 +33,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow) EVT_SCROLL(wxMDIClientWindow::OnScroll) END_EVENT_TABLE() -#endif // Parent frame diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp index f288bc80e1..b52790b67d 100644 --- a/src/mac/carbon/menu.cpp +++ b/src/mac/carbon/menu.cpp @@ -33,10 +33,8 @@ // ---------------------- #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif // the (popup) menu title has this special id static const int idMenuTitle = -2; diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp index fc8d7885af..83ae7e0d84 100644 --- a/src/mac/carbon/menuitem.cpp +++ b/src/mac/carbon/menuitem.cpp @@ -25,9 +25,7 @@ // dynamic classes implementation // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) -#endif //USE_SHARED_LIBRARY void wxMacBuildMenuString(StringPtr outMacItemText, char *outMacShortcutChar , short *outMacModifiers , const char *inItemName , bool useShortcuts ) ; // ---------------------------------------------------------------------------- diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp index 97e31948bf..5742ba4ce6 100644 --- a/src/mac/carbon/metafile.cpp +++ b/src/mac/carbon/metafile.cpp @@ -39,10 +39,8 @@ extern bool wxClipboardIsOpen; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC) -#endif /* * Metafiles diff --git a/src/mac/carbon/minifram.cpp b/src/mac/carbon/minifram.cpp index 4f6f5e5fcb..cbe09b7d81 100644 --- a/src/mac/carbon/minifram.cpp +++ b/src/mac/carbon/minifram.cpp @@ -15,8 +15,6 @@ #include "wx/minifram.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) -#endif diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp index 5aa8554038..f19da7bb4f 100644 --- a/src/mac/carbon/msgdlg.cpp +++ b/src/mac/carbon/msgdlg.cpp @@ -16,9 +16,7 @@ #include "wx/msgdlg.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxMessageDialog, wxDialog) -#endif #define kMacOKAlertResourceID 128 #define kMacYesNoAlertResourceID 129 diff --git a/src/mac/carbon/notebook.cpp b/src/mac/carbon/notebook.cpp index a4f93917eb..3cb269c3cc 100644 --- a/src/mac/carbon/notebook.cpp +++ b/src/mac/carbon/notebook.cpp @@ -41,7 +41,6 @@ const short kwxMacTabBottomMargin = 16 ; // event table // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES BEGIN_EVENT_TABLE(wxNotebook, wxControl) EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) @@ -52,7 +51,6 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) -#endif // ============================================================================ // implementation diff --git a/src/mac/carbon/palette.cpp b/src/mac/carbon/palette.cpp index 85a9fd16d8..676f54739a 100644 --- a/src/mac/carbon/palette.cpp +++ b/src/mac/carbon/palette.cpp @@ -15,9 +15,7 @@ #include "wx/palette.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject) -#endif /* * Palette diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp index 1e3ced2a3a..2502b392fb 100644 --- a/src/mac/carbon/pen.cpp +++ b/src/mac/carbon/pen.cpp @@ -17,9 +17,7 @@ #include "wx/utils.h" #include "wx/pen.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) -#endif wxPenRefData::wxPenRefData() { diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp index 5f914ddbfd..a1f8f6b196 100644 --- a/src/mac/carbon/printdlg.cpp +++ b/src/mac/carbon/printdlg.cpp @@ -19,10 +19,8 @@ // Use generic page setup dialog: use your own native one if one exists. -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog) IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog) -#endif wxPrintDialog::wxPrintDialog() { diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp index 4b84cc1a1e..0d4862cfa2 100644 --- a/src/mac/carbon/printmac.cpp +++ b/src/mac/carbon/printmac.cpp @@ -35,10 +35,8 @@ #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase) IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase) -#endif /* * Printer diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp index 492c93133a..70da0df49c 100644 --- a/src/mac/carbon/radiobox.cpp +++ b/src/mac/carbon/radiobox.cpp @@ -20,9 +20,7 @@ #include "wx/radiobox.h" #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) -#endif #pragma mark - #pragma mark ### Constructors & destructor ### diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp index 0c712b61f9..a2fc26d840 100644 --- a/src/mac/carbon/radiobut.cpp +++ b/src/mac/carbon/radiobut.cpp @@ -15,9 +15,7 @@ #include "wx/radiobut.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) -#endif #include diff --git a/src/mac/carbon/region.cpp b/src/mac/carbon/region.cpp index c5c6332e06..5c01ddd438 100644 --- a/src/mac/carbon/region.cpp +++ b/src/mac/carbon/region.cpp @@ -15,10 +15,8 @@ #include "wx/region.h" #include "wx/gdicmn.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) -#endif //----------------------------------------------------------------------------- // wxRegionRefData implementation diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp index 92d6dd1faf..2db4a175bb 100644 --- a/src/mac/carbon/scrolbar.cpp +++ b/src/mac/carbon/scrolbar.cpp @@ -16,13 +16,11 @@ #include "wx/scrolbar.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) BEGIN_EVENT_TABLE(wxScrollBar, wxControl) END_EVENT_TABLE() -#endif extern ControlActionUPP wxMacLiveScrollbarActionUPP ; diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp index 936ccddb47..9218d560bb 100644 --- a/src/mac/carbon/slider.cpp +++ b/src/mac/carbon/slider.cpp @@ -16,12 +16,10 @@ #include "wx/slider.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) BEGIN_EVENT_TABLE(wxSlider, wxControl) END_EVENT_TABLE() -#endif diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp index f48ad3de9e..5ec5e1b8a2 100644 --- a/src/mac/carbon/spinbutt.cpp +++ b/src/mac/carbon/spinbutt.cpp @@ -24,10 +24,8 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent); -#endif bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp index 86a8528929..8bd5fecb71 100644 --- a/src/mac/carbon/statbmp.cpp +++ b/src/mac/carbon/statbmp.cpp @@ -15,9 +15,7 @@ #include "wx/statbmp.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) -#endif /* * wxStaticBitmap diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp index abae14d07e..ea7ca9dfbb 100644 --- a/src/mac/carbon/statbox.cpp +++ b/src/mac/carbon/statbox.cpp @@ -16,14 +16,12 @@ #include "wx/statbox.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) BEGIN_EVENT_TABLE(wxStaticBox, wxControl) EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground) END_EVENT_TABLE() -#endif /* * Static box diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index 54f6eb4e58..ec4de7cc31 100644 --- a/src/mac/carbon/stattext.cpp +++ b/src/mac/carbon/stattext.cpp @@ -18,9 +18,7 @@ #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) -#endif #include diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp index ea057aae52..ed13c3ac8a 100644 --- a/src/mac/carbon/tabctrl.cpp +++ b/src/mac/carbon/tabctrl.cpp @@ -17,12 +17,10 @@ #include "wx/tabctrl.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl) BEGIN_EVENT_TABLE(wxTabCtrl, wxControl) END_EVENT_TABLE() -#endif wxTabCtrl::wxTabCtrl() { diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 21648fc476..c1b98861b0 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -38,14 +38,12 @@ #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_DROP_FILES(wxTextCtrl::OnDropFiles) EVT_CHAR(wxTextCtrl::OnChar) END_EVENT_TABLE() -#endif // Text item wxTextCtrl::wxTextCtrl() diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp index 5262040cf6..d845d50108 100644 --- a/src/mac/carbon/timer.cpp +++ b/src/mac/carbon/timer.cpp @@ -15,9 +15,7 @@ #include "wx/timer.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -#endif wxTimer::wxTimer() { diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index 56654a1af6..81d3711a54 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -19,12 +19,10 @@ #include "wx/toolbar.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) END_EVENT_TABLE() -#endif #include diff --git a/src/mac/carbon/treectrl.cpp b/src/mac/carbon/treectrl.cpp index 137a885dbf..3aea32e970 100644 --- a/src/mac/carbon/treectrl.cpp +++ b/src/mac/carbon/treectrl.cpp @@ -16,11 +16,9 @@ #include "wx/stubs/textctrl.h" #include "wx/stubs/treectrl.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject) -#endif wxTreeCtrl::wxTreeCtrl() { diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index ed8396c774..cae38465c2 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -54,7 +54,6 @@ extern wxList wxPendingDelete; wxWindow* gFocusWindow = NULL ; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler) BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) @@ -65,7 +64,6 @@ BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) // EVT_SCROLL(wxWindow::OnScroll) END_EVENT_TABLE() -#endif diff --git a/src/mac/checkbox.cpp b/src/mac/checkbox.cpp index ca99c4b778..aa589bd32d 100644 --- a/src/mac/checkbox.cpp +++ b/src/mac/checkbox.cpp @@ -15,10 +15,8 @@ #include "wx/checkbox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) -#endif #include diff --git a/src/mac/checklst.cpp b/src/mac/checklst.cpp index 2f43152c2a..7387e3e471 100644 --- a/src/mac/checklst.cpp +++ b/src/mac/checklst.cpp @@ -23,9 +23,7 @@ // implementation // ============================================================================ -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) -#endif // ---------------------------------------------------------------------------- // implementation of wxCheckListBox class diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp index 42c52012b2..301b0731a8 100644 --- a/src/mac/choice.cpp +++ b/src/mac/choice.cpp @@ -17,9 +17,7 @@ #include "wx/choice.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) -#endif bool wxChoice::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, diff --git a/src/mac/colordlg.cpp b/src/mac/colordlg.cpp index c6037a9f96..e91938f8ad 100644 --- a/src/mac/colordlg.cpp +++ b/src/mac/colordlg.cpp @@ -16,9 +16,7 @@ #include "wx/mac/colordlg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) -#endif /* * wxColourDialog diff --git a/src/mac/colour.cpp b/src/mac/colour.cpp index cc549b5f11..68abfa77bd 100644 --- a/src/mac/colour.cpp +++ b/src/mac/colour.cpp @@ -16,9 +16,7 @@ #include "wx/gdicmn.h" #include "wx/colour.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -#endif // Colour diff --git a/src/mac/combobox.cpp b/src/mac/combobox.cpp index 905f3180aa..d1fd686a85 100644 --- a/src/mac/combobox.cpp +++ b/src/mac/combobox.cpp @@ -16,9 +16,7 @@ #include "wx/combobox.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -#endif // right now we don't support editable comboboxes diff --git a/src/mac/control.cpp b/src/mac/control.cpp index 037d95784f..5065b239e9 100644 --- a/src/mac/control.cpp +++ b/src/mac/control.cpp @@ -18,7 +18,6 @@ #include "wx/tabctrl.h" #include "wx/spinbutt.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) @@ -26,7 +25,6 @@ BEGIN_EVENT_TABLE(wxControl, wxWindow) EVT_CHAR( wxControl::OnKeyDown ) EVT_PAINT( wxControl::OnPaint ) END_EVENT_TABLE() -#endif #include diff --git a/src/mac/cursor.cpp b/src/mac/cursor.cpp index bcbe30008b..dee7c92b5f 100644 --- a/src/mac/cursor.cpp +++ b/src/mac/cursor.cpp @@ -16,9 +16,7 @@ #include "wx/cursor.h" #include "wx/icon.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap) -#endif const short kwxCursorHandId = 9 ; const short kwxCursorSizeWEId = 10 ; diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp index e7b0e503fa..0043d823fb 100644 --- a/src/mac/dc.cpp +++ b/src/mac/dc.cpp @@ -15,9 +15,7 @@ #include "wx/dc.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -#endif //----------------------------------------------------------------------------- // constants diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp index b4155b572d..12100b81cd 100644 --- a/src/mac/dcclient.cpp +++ b/src/mac/dcclient.cpp @@ -28,11 +28,9 @@ // wxPaintDC //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) -#endif /* * wxWindowDC diff --git a/src/mac/dcprint.cpp b/src/mac/dcprint.cpp index 2b0bf64c50..449f44e206 100644 --- a/src/mac/dcprint.cpp +++ b/src/mac/dcprint.cpp @@ -27,9 +27,7 @@ #include "math.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxPrinterDC, wxDC) -#endif GrafPtr macPrintFormerPort = NULL ; diff --git a/src/mac/dcscreen.cpp b/src/mac/dcscreen.cpp index 1ea12f3d29..1d802afba4 100644 --- a/src/mac/dcscreen.cpp +++ b/src/mac/dcscreen.cpp @@ -15,9 +15,7 @@ #include "wx/dcscreen.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) -#endif // Create a DC representing the whole screen wxScreenDC::wxScreenDC() diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp index d0068bc451..d75706f6a3 100644 --- a/src/mac/dialog.cpp +++ b/src/mac/dialog.cpp @@ -27,7 +27,6 @@ wxList wxModalDialogs; wxList wxModelessWindows; // Frames and modeless dialogs extern wxList wxPendingDelete; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) BEGIN_EVENT_TABLE(wxDialog, wxPanel) @@ -40,7 +39,6 @@ BEGIN_EVENT_TABLE(wxDialog, wxPanel) EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() -#endif wxDialog::wxDialog() { diff --git a/src/mac/dirdlg.cpp b/src/mac/dirdlg.cpp index edfc211caa..344b8b32b9 100644 --- a/src/mac/dirdlg.cpp +++ b/src/mac/dirdlg.cpp @@ -20,9 +20,7 @@ #include "wx/cmndata.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxDirDialog, wxDialog) -#endif enum { kSelectItem = 10, // select button item number diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp index 66de687b80..ee50e2e6bd 100644 --- a/src/mac/filedlg.cpp +++ b/src/mac/filedlg.cpp @@ -19,9 +19,7 @@ #include "wx/filedlg.h" #include "wx/intl.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxFileDialog, wxDialog) -#endif // begin wxmac diff --git a/src/mac/font.cpp b/src/mac/font.cpp index 988d1c81e2..a5df9049a2 100644 --- a/src/mac/font.cpp +++ b/src/mac/font.cpp @@ -18,9 +18,7 @@ #include "wx/font.h" #include "wx/gdicmn.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) -#endif diff --git a/src/mac/fontdlg.cpp b/src/mac/fontdlg.cpp index d775c24c16..9a0843d64b 100644 --- a/src/mac/fontdlg.cpp +++ b/src/mac/fontdlg.cpp @@ -17,9 +17,7 @@ #include "wx/mac/fontdlg.h" #include "wx/cmndata.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) -#endif /* * wxFontDialog diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp index ba1377151f..cded59c604 100644 --- a/src/mac/frame.cpp +++ b/src/mac/frame.cpp @@ -28,7 +28,6 @@ extern wxList wxModelessWindows; extern wxList wxPendingDelete; -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxWindow) EVT_SIZE(wxFrame::OnSize) EVT_ACTIVATE(wxFrame::OnActivate) @@ -39,7 +38,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxWindow) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif #if wxUSE_NATIVE_STATUSBAR bool wxFrame::m_useNativeStatusBar = TRUE; diff --git a/src/mac/gauge.cpp b/src/mac/gauge.cpp index 7dc3b5e813..be0d0d0a3c 100644 --- a/src/mac/gauge.cpp +++ b/src/mac/gauge.cpp @@ -15,9 +15,7 @@ #include "wx/gauge.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) -#endif #include diff --git a/src/mac/gdiobj.cpp b/src/mac/gdiobj.cpp index 63697c8354..46b1aa871f 100644 --- a/src/mac/gdiobj.cpp +++ b/src/mac/gdiobj.cpp @@ -15,8 +15,6 @@ #include "wx/gdiobj.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) -#endif // TODO: Nothing to do, unless you want to. diff --git a/src/mac/helpxxxx.cpp b/src/mac/helpxxxx.cpp index 086762c646..b7f0babfa2 100644 --- a/src/mac/helpxxxx.cpp +++ b/src/mac/helpxxxx.cpp @@ -17,9 +17,7 @@ #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxXXXXHelpController, wxHelpControllerBase) -#endif wxXXXXHelpController::wxXXXXHelpController() { diff --git a/src/mac/icon.cpp b/src/mac/icon.cpp index 537165343e..2fb0616ba8 100644 --- a/src/mac/icon.cpp +++ b/src/mac/icon.cpp @@ -15,9 +15,7 @@ #include "wx/icon.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) -#endif /* * Icons @@ -114,4 +112,4 @@ bool wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo return TRUE ; } return FALSE ; -} \ No newline at end of file +} diff --git a/src/mac/imaglist.cpp b/src/mac/imaglist.cpp index 4cb47b4e69..cb4b9ff01c 100644 --- a/src/mac/imaglist.cpp +++ b/src/mac/imaglist.cpp @@ -15,9 +15,7 @@ #include "wx/stubs/imaglist.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject) -#endif wxImageList::wxImageList() { diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp index 19b16e5fe7..ae89e0bcab 100644 --- a/src/mac/listbox.cpp +++ b/src/mac/listbox.cpp @@ -21,13 +21,11 @@ #include "wx/utils.h" #include "extldef.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) BEGIN_EVENT_TABLE(wxListBox, wxControl) EVT_SIZE( wxListBox::OnSize ) END_EVENT_TABLE() -#endif #include diff --git a/src/mac/listctrl.cpp b/src/mac/listctrl.cpp index d1d8445652..2c11981bf2 100644 --- a/src/mac/listctrl.cpp +++ b/src/mac/listctrl.cpp @@ -16,11 +16,9 @@ #include "wx/stubs/textctrl.h" #include "wx/stubs/listctrl.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) -#endif wxListCtrl::wxListCtrl() { diff --git a/src/mac/mdi.cpp b/src/mac/mdi.cpp index 598f62c3f5..8672b2f897 100644 --- a/src/mac/mdi.cpp +++ b/src/mac/mdi.cpp @@ -19,7 +19,6 @@ extern wxList wxModelessWindows; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow) @@ -34,7 +33,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow) EVT_SCROLL(wxMDIClientWindow::OnScroll) END_EVENT_TABLE() -#endif // Parent frame diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp index f288bc80e1..b52790b67d 100644 --- a/src/mac/menu.cpp +++ b/src/mac/menu.cpp @@ -33,10 +33,8 @@ // ---------------------- #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif // the (popup) menu title has this special id static const int idMenuTitle = -2; diff --git a/src/mac/menuitem.cpp b/src/mac/menuitem.cpp index fc8d7885af..83ae7e0d84 100644 --- a/src/mac/menuitem.cpp +++ b/src/mac/menuitem.cpp @@ -25,9 +25,7 @@ // dynamic classes implementation // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) -#endif //USE_SHARED_LIBRARY void wxMacBuildMenuString(StringPtr outMacItemText, char *outMacShortcutChar , short *outMacModifiers , const char *inItemName , bool useShortcuts ) ; // ---------------------------------------------------------------------------- diff --git a/src/mac/metafile.cpp b/src/mac/metafile.cpp index 97e31948bf..5742ba4ce6 100644 --- a/src/mac/metafile.cpp +++ b/src/mac/metafile.cpp @@ -39,10 +39,8 @@ extern bool wxClipboardIsOpen; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC) -#endif /* * Metafiles diff --git a/src/mac/minifram.cpp b/src/mac/minifram.cpp index 4f6f5e5fcb..cbe09b7d81 100644 --- a/src/mac/minifram.cpp +++ b/src/mac/minifram.cpp @@ -15,8 +15,6 @@ #include "wx/minifram.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) -#endif diff --git a/src/mac/msgdlg.cpp b/src/mac/msgdlg.cpp index 5aa8554038..f19da7bb4f 100644 --- a/src/mac/msgdlg.cpp +++ b/src/mac/msgdlg.cpp @@ -16,9 +16,7 @@ #include "wx/msgdlg.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxMessageDialog, wxDialog) -#endif #define kMacOKAlertResourceID 128 #define kMacYesNoAlertResourceID 129 diff --git a/src/mac/notebook.cpp b/src/mac/notebook.cpp index a4f93917eb..3cb269c3cc 100644 --- a/src/mac/notebook.cpp +++ b/src/mac/notebook.cpp @@ -41,7 +41,6 @@ const short kwxMacTabBottomMargin = 16 ; // event table // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES BEGIN_EVENT_TABLE(wxNotebook, wxControl) EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) @@ -52,7 +51,6 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) -#endif // ============================================================================ // implementation diff --git a/src/mac/palette.cpp b/src/mac/palette.cpp index 85a9fd16d8..676f54739a 100644 --- a/src/mac/palette.cpp +++ b/src/mac/palette.cpp @@ -15,9 +15,7 @@ #include "wx/palette.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject) -#endif /* * Palette diff --git a/src/mac/pen.cpp b/src/mac/pen.cpp index 1e3ced2a3a..2502b392fb 100644 --- a/src/mac/pen.cpp +++ b/src/mac/pen.cpp @@ -17,9 +17,7 @@ #include "wx/utils.h" #include "wx/pen.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) -#endif wxPenRefData::wxPenRefData() { diff --git a/src/mac/printdlg.cpp b/src/mac/printdlg.cpp index 5f914ddbfd..a1f8f6b196 100644 --- a/src/mac/printdlg.cpp +++ b/src/mac/printdlg.cpp @@ -19,10 +19,8 @@ // Use generic page setup dialog: use your own native one if one exists. -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog) IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog) -#endif wxPrintDialog::wxPrintDialog() { diff --git a/src/mac/printmac.cpp b/src/mac/printmac.cpp index 4b84cc1a1e..0d4862cfa2 100644 --- a/src/mac/printmac.cpp +++ b/src/mac/printmac.cpp @@ -35,10 +35,8 @@ #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase) IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase) -#endif /* * Printer diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp index 492c93133a..70da0df49c 100644 --- a/src/mac/radiobox.cpp +++ b/src/mac/radiobox.cpp @@ -20,9 +20,7 @@ #include "wx/radiobox.h" #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) -#endif #pragma mark - #pragma mark ### Constructors & destructor ### diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp index 0c712b61f9..a2fc26d840 100644 --- a/src/mac/radiobut.cpp +++ b/src/mac/radiobut.cpp @@ -15,9 +15,7 @@ #include "wx/radiobut.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) -#endif #include diff --git a/src/mac/region.cpp b/src/mac/region.cpp index c5c6332e06..5c01ddd438 100644 --- a/src/mac/region.cpp +++ b/src/mac/region.cpp @@ -15,10 +15,8 @@ #include "wx/region.h" #include "wx/gdicmn.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) -#endif //----------------------------------------------------------------------------- // wxRegionRefData implementation diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp index 92d6dd1faf..2db4a175bb 100644 --- a/src/mac/scrolbar.cpp +++ b/src/mac/scrolbar.cpp @@ -16,13 +16,11 @@ #include "wx/scrolbar.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) BEGIN_EVENT_TABLE(wxScrollBar, wxControl) END_EVENT_TABLE() -#endif extern ControlActionUPP wxMacLiveScrollbarActionUPP ; diff --git a/src/mac/slider.cpp b/src/mac/slider.cpp index 936ccddb47..9218d560bb 100644 --- a/src/mac/slider.cpp +++ b/src/mac/slider.cpp @@ -16,12 +16,10 @@ #include "wx/slider.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) BEGIN_EVENT_TABLE(wxSlider, wxControl) END_EVENT_TABLE() -#endif diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp index f48ad3de9e..5ec5e1b8a2 100644 --- a/src/mac/spinbutt.cpp +++ b/src/mac/spinbutt.cpp @@ -24,10 +24,8 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent); -#endif bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) diff --git a/src/mac/statbmp.cpp b/src/mac/statbmp.cpp index 86a8528929..8bd5fecb71 100644 --- a/src/mac/statbmp.cpp +++ b/src/mac/statbmp.cpp @@ -15,9 +15,7 @@ #include "wx/statbmp.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) -#endif /* * wxStaticBitmap diff --git a/src/mac/statbox.cpp b/src/mac/statbox.cpp index abae14d07e..ea7ca9dfbb 100644 --- a/src/mac/statbox.cpp +++ b/src/mac/statbox.cpp @@ -16,14 +16,12 @@ #include "wx/statbox.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) BEGIN_EVENT_TABLE(wxStaticBox, wxControl) EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground) END_EVENT_TABLE() -#endif /* * Static box diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp index 54f6eb4e58..ec4de7cc31 100644 --- a/src/mac/stattext.cpp +++ b/src/mac/stattext.cpp @@ -18,9 +18,7 @@ #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) -#endif #include diff --git a/src/mac/tabctrl.cpp b/src/mac/tabctrl.cpp index ea057aae52..ed13c3ac8a 100644 --- a/src/mac/tabctrl.cpp +++ b/src/mac/tabctrl.cpp @@ -17,12 +17,10 @@ #include "wx/tabctrl.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl) BEGIN_EVENT_TABLE(wxTabCtrl, wxControl) END_EVENT_TABLE() -#endif wxTabCtrl::wxTabCtrl() { diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp index 21648fc476..c1b98861b0 100644 --- a/src/mac/textctrl.cpp +++ b/src/mac/textctrl.cpp @@ -38,14 +38,12 @@ #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_DROP_FILES(wxTextCtrl::OnDropFiles) EVT_CHAR(wxTextCtrl::OnChar) END_EVENT_TABLE() -#endif // Text item wxTextCtrl::wxTextCtrl() diff --git a/src/mac/timer.cpp b/src/mac/timer.cpp index 5262040cf6..d845d50108 100644 --- a/src/mac/timer.cpp +++ b/src/mac/timer.cpp @@ -15,9 +15,7 @@ #include "wx/timer.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -#endif wxTimer::wxTimer() { diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp index 56654a1af6..81d3711a54 100644 --- a/src/mac/toolbar.cpp +++ b/src/mac/toolbar.cpp @@ -19,12 +19,10 @@ #include "wx/toolbar.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) END_EVENT_TABLE() -#endif #include diff --git a/src/mac/treectrl.cpp b/src/mac/treectrl.cpp index 137a885dbf..3aea32e970 100644 --- a/src/mac/treectrl.cpp +++ b/src/mac/treectrl.cpp @@ -16,11 +16,9 @@ #include "wx/stubs/textctrl.h" #include "wx/stubs/treectrl.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject) -#endif wxTreeCtrl::wxTreeCtrl() { diff --git a/src/mac/window.cpp b/src/mac/window.cpp index ed8396c774..cae38465c2 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -54,7 +54,6 @@ extern wxList wxPendingDelete; wxWindow* gFocusWindow = NULL ; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler) BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) @@ -65,7 +64,6 @@ BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) // EVT_SCROLL(wxWindow::OnScroll) END_EVENT_TABLE() -#endif diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp index 1a24c747b2..d90a47b958 100644 --- a/src/motif/accel.cpp +++ b/src/motif/accel.cpp @@ -19,9 +19,7 @@ #include "wx/utils.h" #include -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) -#endif class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData { diff --git a/src/motif/app.cpp b/src/motif/app.cpp index 9339363f0f..916c8b9419 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -62,13 +62,11 @@ wxApp *wxTheApp = NULL; wxHashTable *wxWidgetHashTable = NULL; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) END_EVENT_TABLE() -#endif long wxApp::sm_lastMessageTime = 0; diff --git a/src/motif/bitmap.cpp b/src/motif/bitmap.cpp index c7fb9ee8e8..90c225d8ae 100644 --- a/src/motif/bitmap.cpp +++ b/src/motif/bitmap.cpp @@ -37,10 +37,8 @@ #include #endif -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) -#endif wxBitmapRefData::wxBitmapRefData() { diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp index 29f0d9ae28..8abd0e2167 100644 --- a/src/motif/bmpbuttn.cpp +++ b/src/motif/bmpbuttn.cpp @@ -31,9 +31,7 @@ void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr); Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap ); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) -#endif wxBitmapButton::wxBitmapButton() { diff --git a/src/motif/brush.cpp b/src/motif/brush.cpp index 1b8069646b..a09564e955 100644 --- a/src/motif/brush.cpp +++ b/src/motif/brush.cpp @@ -17,9 +17,7 @@ #include "wx/utils.h" #include "wx/brush.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) -#endif wxBrushRefData::wxBrushRefData() { diff --git a/src/motif/button.cpp b/src/motif/button.cpp index 6953b76006..95f4f5b009 100644 --- a/src/motif/button.cpp +++ b/src/motif/button.cpp @@ -30,9 +30,7 @@ void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) -#endif // Button diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp index d528c697f9..ac259ac03a 100644 --- a/src/motif/checkbox.cpp +++ b/src/motif/checkbox.cpp @@ -32,10 +32,8 @@ void wxCheckBoxCallback (Widget w, XtPointer clientData, XtPointer ptr); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) -#endif // Single check box item bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp index 7da541fa9a..b609661ac9 100644 --- a/src/motif/checklst.cpp +++ b/src/motif/checklst.cpp @@ -23,9 +23,7 @@ // implementation // ============================================================================ -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) -#endif // ---------------------------------------------------------------------------- // implementation of wxCheckListBox class diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp index baf409f0df..45a2430847 100644 --- a/src/motif/choice.cpp +++ b/src/motif/choice.cpp @@ -30,9 +30,7 @@ #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) -#endif void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer ptr); diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp index cc6c5e21b3..41afb324d3 100644 --- a/src/motif/clipbrd.cpp +++ b/src/motif/clipbrd.cpp @@ -37,10 +37,8 @@ #include -#if !USE_SHARED_LIBRARY // IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject) // IMPLEMENT_ABSTRACT_CLASS(wxClipboardClient, wxObject) -#endif static bool gs_clipboardIsOpen = FALSE; diff --git a/src/motif/colordlg.cpp b/src/motif/colordlg.cpp index 9326ffd42b..b62041652d 100644 --- a/src/motif/colordlg.cpp +++ b/src/motif/colordlg.cpp @@ -16,9 +16,7 @@ #include "wx/motif/colordlg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) -#endif /* * wxColourDialog diff --git a/src/motif/colour.cpp b/src/motif/colour.cpp index 94063c0cfc..bd112d6a4a 100644 --- a/src/motif/colour.cpp +++ b/src/motif/colour.cpp @@ -30,9 +30,7 @@ #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -#endif // Colour diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp index 098ed1b0cb..6794324428 100644 --- a/src/motif/combobox.cpp +++ b/src/motif/combobox.cpp @@ -29,9 +29,7 @@ void wxComboBoxCallback (Widget w, XtPointer clientData, XmComboBoxSelectionCallbackStruct * cbs); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -#endif bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value, diff --git a/src/motif/control.cpp b/src/motif/control.cpp index d93439940d..423c53e580 100644 --- a/src/motif/control.cpp +++ b/src/motif/control.cpp @@ -25,12 +25,10 @@ #pragma message enable nosimpint #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) END_EVENT_TABLE() -#endif // Item members wxControl::wxControl() diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp index 8df07639c2..24ce2516a0 100644 --- a/src/motif/cursor.cpp +++ b/src/motif/cursor.cpp @@ -30,10 +30,8 @@ #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap) IMPLEMENT_DYNAMIC_CLASS(wxXCursor, wxObject) -#endif wxCursorRefData::wxCursorRefData() { diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp index cba31c0c30..cc5c5359a4 100644 --- a/src/motif/dc.cpp +++ b/src/motif/dc.cpp @@ -17,9 +17,7 @@ #include "wx/dcmemory.h" #include "wx/defs.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -#endif //----------------------------------------------------------------------------- // constants diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp index a488d9466a..aa4970ddef 100644 --- a/src/motif/dcclient.cpp +++ b/src/motif/dcclient.cpp @@ -82,11 +82,9 @@ static Pixmap bdiag, cdiag, fdiag, cross, horiz, verti; // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) -#endif // ---------------------------------------------------------------------------- // prototypes diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp index 9686ee49b6..1b0597df23 100644 --- a/src/motif/dcscreen.cpp +++ b/src/motif/dcscreen.cpp @@ -27,9 +27,7 @@ #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) -#endif WXWindow wxScreenDC::sm_overlayWindow = 0; int wxScreenDC::sm_overlayWindowX = 0; diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp index 2b19f81499..a9a097e096 100644 --- a/src/motif/dialog.cpp +++ b/src/motif/dialog.cpp @@ -68,7 +68,6 @@ extern wxList wxPendingDelete; #define wxUSE_INVISIBLE_RESIZE 1 -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) BEGIN_EVENT_TABLE(wxDialog, wxPanel) @@ -81,7 +80,6 @@ BEGIN_EVENT_TABLE(wxDialog, wxPanel) EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() -#endif wxDialog::wxDialog() { diff --git a/src/motif/dirdlg.cpp b/src/motif/dirdlg.cpp index 56828d883f..9fc854de05 100644 --- a/src/motif/dirdlg.cpp +++ b/src/motif/dirdlg.cpp @@ -20,9 +20,7 @@ #include "wx/cmndata.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxDirDialog, wxDialog) -#endif wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message, const wxString& defaultPath, diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp index 101def7118..f01b0fbb19 100644 --- a/src/motif/filedlg.cpp +++ b/src/motif/filedlg.cpp @@ -40,9 +40,7 @@ #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxFileDialog, wxDialog) -#endif #define DEFAULT_FILE_SELECTOR_SIZE 0 // Let Motif defines the size of File diff --git a/src/motif/font.cpp b/src/motif/font.cpp index f7df581fb6..e112ff2d26 100644 --- a/src/motif/font.cpp +++ b/src/motif/font.cpp @@ -36,9 +36,7 @@ #include "wx/utils.h" // for wxGetDisplay() #include "wx/fontutil.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) -#endif // ---------------------------------------------------------------------------- // private classes diff --git a/src/motif/fontdlg.cpp b/src/motif/fontdlg.cpp index f7ebeed956..3524f77d0e 100644 --- a/src/motif/fontdlg.cpp +++ b/src/motif/fontdlg.cpp @@ -17,9 +17,7 @@ #include "wx/motif/fontdlg.h" #include "wx/cmndata.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) -#endif /* * wxFontDialog diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index 6f3126fefd..54a0466fff 100644 --- a/src/motif/frame.cpp +++ b/src/motif/frame.cpp @@ -91,14 +91,12 @@ static bool wxTopLevelUsed = FALSE; // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_ACTIVATE(wxFrame::OnActivate) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif // ============================================================================ // implementation diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp index 58bb544b9d..b933ec5c87 100644 --- a/src/motif/gauge.cpp +++ b/src/motif/gauge.cpp @@ -24,9 +24,7 @@ #endif #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) -#endif // XmGauge copyright notice: diff --git a/src/motif/gdiobj.cpp b/src/motif/gdiobj.cpp index adda2bcab1..63613b5727 100644 --- a/src/motif/gdiobj.cpp +++ b/src/motif/gdiobj.cpp @@ -15,6 +15,4 @@ #include "wx/gdiobj.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) -#endif diff --git a/src/motif/helpxxxx.cpp b/src/motif/helpxxxx.cpp index 439c9acde3..0cb9e0f147 100644 --- a/src/motif/helpxxxx.cpp +++ b/src/motif/helpxxxx.cpp @@ -17,9 +17,7 @@ #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxXXXXHelpController, wxHelpControllerBase) -#endif wxXXXXHelpController::wxXXXXHelpController() { diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp index 17e5b111c1..fb9802ebfa 100644 --- a/src/motif/icon.cpp +++ b/src/motif/icon.cpp @@ -27,9 +27,7 @@ #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) -#endif /* * Icons diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp index 706ea7297d..a21d2e62d4 100644 --- a/src/motif/listbox.cpp +++ b/src/motif/listbox.cpp @@ -28,9 +28,7 @@ #endif #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) -#endif static void wxListBoxCallback(Widget w, XtPointer clientData, diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp index 0af3109490..98608e9055 100644 --- a/src/motif/mdi.cpp +++ b/src/motif/mdi.cpp @@ -44,7 +44,6 @@ extern void wxFrameFocusProc(Widget workArea, XtPointer clientData, #define wxID_NOTEBOOK_CLIENT_AREA wxID_HIGHEST + 100 -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxNotebook) @@ -61,7 +60,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxNotebook) EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged) END_EVENT_TABLE() -#endif // USE_SHARED_LIBRARY // Parent frame diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index 192264a201..949c95064f 100644 --- a/src/motif/menu.cpp +++ b/src/motif/menu.cpp @@ -51,10 +51,8 @@ // other standard headers #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif // ============================================================================ // implementation diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp index d582065f47..01ed0ccdaa 100644 --- a/src/motif/menuitem.cpp +++ b/src/motif/menuitem.cpp @@ -60,9 +60,7 @@ static void wxMenuItemDisarmCallback(Widget w, XtPointer clientData, XtPointer p // dynamic classes implementation // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) -#endif //USE_SHARED_LIBRARY // ---------------------------------------------------------------------------- // wxMenuItem diff --git a/src/motif/metafile.cpp b/src/motif/metafile.cpp index e8c45e00e3..e84337aa05 100644 --- a/src/motif/metafile.cpp +++ b/src/motif/metafile.cpp @@ -21,10 +21,8 @@ extern bool wxClipboardIsOpen; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMetaFile, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxMetaFileDC, wxDC) -#endif wxMetaFile::wxMetaFile(const wxString& file) { diff --git a/src/motif/minifram.cpp b/src/motif/minifram.cpp index bf6c50b350..1161e3de57 100644 --- a/src/motif/minifram.cpp +++ b/src/motif/minifram.cpp @@ -15,8 +15,6 @@ #include "wx/minifram.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) -#endif diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp index e33abee805..90bf77844c 100644 --- a/src/motif/msgdlg.cpp +++ b/src/motif/msgdlg.cpp @@ -41,9 +41,7 @@ // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxMessageDialog, wxDialog) -#endif // ============================================================================ // implementation diff --git a/src/motif/palette.cpp b/src/motif/palette.cpp index 610d5d6c10..ef2b2597a6 100644 --- a/src/motif/palette.cpp +++ b/src/motif/palette.cpp @@ -52,10 +52,8 @@ not the functionality that wxPalette::Create() aims to provide. #endif #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxXPalette, wxObject) -#endif /* * Palette diff --git a/src/motif/pen.cpp b/src/motif/pen.cpp index 8d0c0a47cf..bb5ab62127 100644 --- a/src/motif/pen.cpp +++ b/src/motif/pen.cpp @@ -17,9 +17,7 @@ #include "wx/utils.h" #include "wx/pen.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) -#endif wxPenRefData::wxPenRefData() { diff --git a/src/motif/printdlg.cpp b/src/motif/printdlg.cpp index 7136ec67a7..0e94d44e4b 100644 --- a/src/motif/printdlg.cpp +++ b/src/motif/printdlg.cpp @@ -20,10 +20,8 @@ // Use generic page setup dialog: use your own native one if one exists. #include "wx/generic/prntdlgg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog) IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog) -#endif wxPrintDialog::wxPrintDialog(): wxDialog() diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp index 2cd62c7578..0fbaa83a5e 100644 --- a/src/motif/radiobox.cpp +++ b/src/motif/radiobox.cpp @@ -35,9 +35,7 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData, XmToggleButtonCallbackStruct * cbs); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) -#endif // Radio box item wxRadioBox::wxRadioBox() diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp index 4c7e3c755e..7e14e8d11c 100644 --- a/src/motif/radiobut.cpp +++ b/src/motif/radiobut.cpp @@ -34,9 +34,7 @@ void wxRadioButtonCallback (Widget w, XtPointer clientData, XmToggleButtonCallbackStruct * cbs); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) -#endif wxRadioButton::wxRadioButton() { diff --git a/src/motif/region.cpp b/src/motif/region.cpp index 1bc220fc30..57a0343e3a 100644 --- a/src/motif/region.cpp +++ b/src/motif/region.cpp @@ -24,10 +24,8 @@ #endif // #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) -#endif // ---------------------------------------------------------------------------- // list types diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp index 0ceefef6b6..a6d1870345 100644 --- a/src/motif/scrolbar.cpp +++ b/src/motif/scrolbar.cpp @@ -31,9 +31,7 @@ static void wxScrollBarCallback(Widget widget, XtPointer clientData, XmScaleCallbackStruct *cbs); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) -#endif // Scrollbar bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp index 59edd44bb7..3fa3e0bfc1 100644 --- a/src/motif/slider.cpp +++ b/src/motif/slider.cpp @@ -32,12 +32,10 @@ void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) BEGIN_EVENT_TABLE(wxSlider, wxControl) END_EVENT_TABLE() -#endif diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp index 2be88d497a..ae086ae319 100644 --- a/src/motif/spinbutt.cpp +++ b/src/motif/spinbutt.cpp @@ -15,10 +15,8 @@ #include "wx/spinbutt.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent); -#endif bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& WXUNUSED(pos), const wxSize& WXUNUSED(size), long style, const wxString& name) diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp index 32a9835b81..9d8c27fd00 100644 --- a/src/motif/statbmp.cpp +++ b/src/motif/statbmp.cpp @@ -28,9 +28,7 @@ #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) -#endif /* * wxStaticBitmap diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp index b13b1cfcde..d0af7ee303 100644 --- a/src/motif/statbox.cpp +++ b/src/motif/statbox.cpp @@ -29,14 +29,12 @@ #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) BEGIN_EVENT_TABLE(wxStaticBox, wxControl) //EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground) END_EVENT_TABLE() -#endif /* * Static box diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp index e66312abaa..537e5f5750 100644 --- a/src/motif/stattext.cpp +++ b/src/motif/stattext.cpp @@ -28,9 +28,7 @@ #pragma message enable nosimpint #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) -#endif bool wxStaticText::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/motif/tabctrl.cpp b/src/motif/tabctrl.cpp index 07216d262a..c9f33458ed 100644 --- a/src/motif/tabctrl.cpp +++ b/src/motif/tabctrl.cpp @@ -16,12 +16,10 @@ #include "wx/control.h" #include "wx/tabctrl.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl) BEGIN_EVENT_TABLE(wxTabCtrl, wxControl) END_EVENT_TABLE() -#endif wxTabCtrl::wxTabCtrl() { diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp index fe48ec22b6..07bd42afba 100644 --- a/src/motif/textctrl.cpp +++ b/src/motif/textctrl.cpp @@ -57,7 +57,6 @@ static void wxTextWindowGainFocusProc(Widget w, XtPointer clientData, XmAnyCallb static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs); static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) @@ -77,7 +76,6 @@ static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallba EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) END_EVENT_TABLE() -#endif // ============================================================================ // implementation diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp index 64f94518a6..b28820804c 100644 --- a/src/motif/timer.cpp +++ b/src/motif/timer.cpp @@ -27,9 +27,7 @@ #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -#endif static wxList wxTimerList(wxKEY_INTEGER); diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp index 727ef5421c..1864a875ef 100644 --- a/src/motif/toolbar.cpp +++ b/src/motif/toolbar.cpp @@ -34,12 +34,10 @@ #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) END_EVENT_TABLE() -#endif static void wxToolButtonCallback (Widget w, XtPointer clientData, XtPointer ptr); diff --git a/src/motif/window.cpp b/src/motif/window.cpp index d14efb385d..e310f1bae3 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -120,14 +120,12 @@ static int str16len(const char *s) // event tables // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) BEGIN_EVENT_TABLE(wxWindow, wxWindowBase) EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged) EVT_IDLE(wxWindow::OnIdle) END_EVENT_TABLE() -#endif // USE_SHARED_LIBRARY // ============================================================================ // implementation diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index 58f7eeea8c..e433443dd3 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -30,9 +30,7 @@ #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) -#endif class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData { diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 9c46030706..c83a623b80 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -167,7 +167,6 @@ LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); // wxApp // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) @@ -175,7 +174,6 @@ LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); EVT_END_SESSION(wxApp::OnEndSession) EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) END_EVENT_TABLE() -#endif //// Initialize bool wxApp::Initialize() diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index 7f7aa14f75..008aa3ec21 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -50,12 +50,10 @@ // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) -#endif // ============================================================================ // implementation diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp index 6990666692..22234319d3 100644 --- a/src/msw/bmpbuttn.cpp +++ b/src/msw/bmpbuttn.cpp @@ -27,9 +27,7 @@ #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) -#endif #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1) diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp index 486caf5827..7e107855c9 100644 --- a/src/msw/brush.cpp +++ b/src/msw/brush.cpp @@ -33,9 +33,7 @@ #include "assert.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) -#endif wxBrushRefData::wxBrushRefData(void) { diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 490c1154e4..cce54d6389 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -42,9 +42,7 @@ // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) -#endif // this macro tries to adjust the default button height to a reasonable value // using the char height as the base diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp index 63458de14b..fec4da27fc 100644 --- a/src/msw/checkbox.cpp +++ b/src/msw/checkbox.cpp @@ -39,10 +39,8 @@ // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) -#endif // ============================================================================ // implementation diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index c15c16e0d1..ea5b2a56f2 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -60,9 +60,7 @@ // implementation // ============================================================================ -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) -#endif // ---------------------------------------------------------------------------- // declaration and implementation of wxCheckListBoxItem class diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index c92de5c4cc..2c5fd437f1 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -37,9 +37,7 @@ #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) -#endif // ============================================================================ // implementation diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index c79f438df9..66e0a3ef73 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -51,9 +51,7 @@ #define wxDIALOG_DEFAULT_X 300 #define wxDIALOG_DEFAULT_Y 300 -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) -#endif /* * wxColourDialog diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index ed446cbaba..a7df1a6f25 100644 --- a/src/msw/colour.cpp +++ b/src/msw/colour.cpp @@ -25,9 +25,7 @@ #include #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -#endif // Colour diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 71e501dbcc..dd0de6353c 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -30,9 +30,7 @@ #include "wx/clipbrd.h" #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -#endif bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 75130e2547..f6f67bac35 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -34,13 +34,11 @@ #include #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground) END_EVENT_TABLE() -#endif // Item members wxControl::wxControl() diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index f9f6167d68..e914dff561 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -49,9 +49,7 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxCursorBase) -#endif // ---------------------------------------------------------------------------- // wxCursorRefData diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index e006996324..c111cfa543 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -58,9 +58,7 @@ #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -#endif // --------------------------------------------------------------------------- // constants diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp index c675ce039f..ca1caadb27 100644 --- a/src/msw/dcclient.cpp +++ b/src/msw/dcclient.cpp @@ -62,11 +62,9 @@ WX_DEFINE_OBJARRAY(wxArrayDCInfo); // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) -#endif // ---------------------------------------------------------------------------- // global variables diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp index af483ed3af..1a59e06627 100644 --- a/src/msw/dcmemory.cpp +++ b/src/msw/dcmemory.cpp @@ -41,9 +41,7 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC) -#endif // ============================================================================ // implementation diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index 4344e59772..05daa7826d 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -38,9 +38,7 @@ #include #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxPrinterDC, wxDC) -#endif // This form is deprecated wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_name, const wxString& file, bool interactive, int orientation) diff --git a/src/msw/dcscreen.cpp b/src/msw/dcscreen.cpp index 65f897ccf3..511c3b25bc 100644 --- a/src/msw/dcscreen.cpp +++ b/src/msw/dcscreen.cpp @@ -30,9 +30,7 @@ #include "wx/dcscreen.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) -#endif // Create a DC representing the whole screen wxScreenDC::wxScreenDC(void) diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp index ad4f8174a2..8986ce0e56 100644 --- a/src/msw/dde.cpp +++ b/src/msw/dde.cpp @@ -54,11 +54,9 @@ #define _EXPORT _export #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDDEServer, wxServerBase) IMPLEMENT_DYNAMIC_CLASS(wxDDEClient, wxClientBase) IMPLEMENT_CLASS(wxDDEConnection, wxConnectionBase) -#endif static wxDDEConnection *DDEFindConnection(HCONV hConv); static void DDEDeleteConnection(HCONV hConv); diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 0ded488a51..531a3fc9c8 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -46,7 +46,6 @@ wxWindowList wxModalDialogs; wxWindowList wxModelessWindows; // Frames and modeless dialogs extern wxList WXDLLEXPORT wxPendingDelete; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) BEGIN_EVENT_TABLE(wxDialog, wxPanel) @@ -58,7 +57,6 @@ extern wxList WXDLLEXPORT wxPendingDelete; EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() -#endif wxDialog::wxDialog() { diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp index 156dfaa4d4..7f76a6c7cd 100644 --- a/src/msw/dirdlg.cpp +++ b/src/msw/dirdlg.cpp @@ -58,9 +58,7 @@ // wxWindows macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxDirDialog, wxDialog) -#endif // ---------------------------------------------------------------------------- // private functions prototypes diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp index 27dc25f1b4..55757f2ea6 100644 --- a/src/msw/dragimag.cpp +++ b/src/msw/dragimag.cpp @@ -42,9 +42,7 @@ #include #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDragImage, wxObject) -#endif wxDragImage::wxDragImage() { diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index ba1869e1c5..bd3fa99176 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -43,9 +43,7 @@ #include #include -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxFileDialog, wxDialog) -#endif wxString wxFileSelector(const wxChar *title, const wxChar *defaultDir, diff --git a/src/msw/font.cpp b/src/msw/font.cpp index bd43058f11..e318eeb71f 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -39,13 +39,11 @@ #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) #if wxUSE_PORTABLE_FONTS_IN_MSW IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject) #endif -#endif // ---------------------------------------------------------------------------- // wxFontRefData - the internal description of the font diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp index 972f0e4534..75acaeeea3 100644 --- a/src/msw/fontdlg.cpp +++ b/src/msw/fontdlg.cpp @@ -52,9 +52,7 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) -#endif // ============================================================================ // implementation diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 14b25e89b8..3bd33d6bef 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -69,14 +69,12 @@ extern wxMenu *wxCurrentPopupMenu; // event tables // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_ACTIVATE(wxFrame::OnActivate) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif // ============================================================================ // implementation diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp index 0ddfcba4d4..0805a02f98 100644 --- a/src/msw/gauge95.cpp +++ b/src/msw/gauge95.cpp @@ -33,9 +33,7 @@ #include #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl) -#endif bool wxGauge95::Create(wxWindow *parent, wxWindowID id, int range, diff --git a/src/msw/gaugemsw.cpp b/src/msw/gaugemsw.cpp index 5a86380c51..542c123163 100644 --- a/src/msw/gaugemsw.cpp +++ b/src/msw/gaugemsw.cpp @@ -60,9 +60,7 @@ /* public function prototypes */ BOOL FAR PASCAL gaugeInit(HINSTANCE hInstance); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGaugeMSW, wxControl) -#endif bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id, int range, diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index ae1820d19a..9e2947717d 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -163,12 +163,10 @@ private: // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler) IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler) IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxGDIImageHandler) IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxGDIImageHandler) -#endif // ---------------------------------------------------------------------------- // private functions diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp index 3a10a3fefe..81c0f3d3c0 100644 --- a/src/msw/gdiobj.cpp +++ b/src/msw/gdiobj.cpp @@ -32,9 +32,7 @@ #include "wx/msw/private.h" #include "assert.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) -#endif /* void wxGDIObject::IncrementResourceUsage(void) diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp index 1a376ba5a6..66e868d54d 100644 --- a/src/msw/helpwin.cpp +++ b/src/msw/helpwin.cpp @@ -41,9 +41,7 @@ // MAX length of Help descriptor #define _MAX_HELP_LEN 500 -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase) -#endif wxWinHelpController::wxWinHelpController(void) { diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp index 1ca4dafb12..00b0741ab7 100644 --- a/src/msw/icon.cpp +++ b/src/msw/icon.cpp @@ -47,9 +47,7 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase) -#endif // ============================================================================ // implementation diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp index 6c80416dd8..642fc9290c 100644 --- a/src/msw/imaglist.cpp +++ b/src/msw/imaglist.cpp @@ -41,9 +41,7 @@ #include #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject) -#endif wxImageList::wxImageList(void) { diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 1f51b5ded8..3b42780fcb 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -82,9 +82,7 @@ #endif #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) -#endif // ============================================================================ // list box item declaration and implementation diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index 756a9bea2c..97b639ead4 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -61,10 +61,8 @@ static void wxConvertFromMSWListItem(const wxListCtrl *ctrl, wxListItem& info, L // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) -#endif // USE_SHARED_LIBRARY // ============================================================================ // implementation diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 6e9e158a32..03b81da874 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -119,11 +119,9 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, // wxWin macros // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow) -#endif // USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame) EVT_SIZE(wxMDIParentFrame::OnSize) diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 7b85d29927..e2bb43b5f8 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -62,10 +62,8 @@ static const int idMenuTitle = -2; // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif // ============================================================================ // implementation diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp index 7f99f93c63..373a1400fd 100644 --- a/src/msw/metafile.cpp +++ b/src/msw/metafile.cpp @@ -40,10 +40,8 @@ extern bool wxClipboardIsOpen; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC) -#endif /* * Metafiles diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp index 57464f4e18..a8c7b9d0e8 100644 --- a/src/msw/minifram.cpp +++ b/src/msw/minifram.cpp @@ -35,9 +35,7 @@ #include "wx/minifram.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) -#endif #else @@ -55,9 +53,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) #endif #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) -#endif long wxMiniFrame::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp index 77bf94c6b9..70a83e908b 100644 --- a/src/msw/msgdlg.cpp +++ b/src/msw/msgdlg.cpp @@ -37,9 +37,7 @@ #define wxDIALOG_DEFAULT_X 300 #define wxDIALOG_DEFAULT_Y 300 -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxMessageDialog, wxDialog) -#endif wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption, long style, const wxPoint& pos) diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index d2fe79e557..8f6ad71029 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -83,7 +83,6 @@ // event table // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES BEGIN_EVENT_TABLE(wxNotebook, wxControl) EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) @@ -96,7 +95,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) -#endif // ============================================================================ // implementation diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp index 77569777f7..891815bf74 100644 --- a/src/msw/palette.cpp +++ b/src/msw/palette.cpp @@ -30,9 +30,7 @@ #include "assert.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject) -#endif /* * Palette diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index 53b26ab1e3..fd70094b25 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -32,9 +32,7 @@ #include "wx/msw/private.h" #include "assert.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) -#endif wxPenRefData::wxPenRefData() { diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index c9e98a3dbf..17f7a55d2b 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -50,10 +50,8 @@ // wxWin macros // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog) IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog) -#endif // =========================================================================== // implementation diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp index c9ee2c7368..f46993f88a 100644 --- a/src/msw/printwin.cpp +++ b/src/msw/printwin.cpp @@ -66,10 +66,8 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code); // wxWin macros // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase) IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase) -#endif // =========================================================================== // implementation diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index 20ce47a197..2767986d6a 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -43,9 +43,7 @@ #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) -#endif // VZ: the new behaviour is to create the radio buttons as children of the // radiobox instead of creating them as children of the radiobox' parent. diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp index d63f27cc79..67653ecc5d 100644 --- a/src/msw/radiobut.cpp +++ b/src/msw/radiobut.cpp @@ -29,10 +29,8 @@ #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) // IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton) -#endif bool wxRadioButton::MSWCommand(WXUINT param, WXWORD id) { diff --git a/src/msw/region.cpp b/src/msw/region.cpp index 718ad9de56..e40c381e7d 100644 --- a/src/msw/region.cpp +++ b/src/msw/region.cpp @@ -26,10 +26,8 @@ #include "wx/window.h" #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) -#endif //----------------------------------------------------------------------------- // wxRegionRefData implementation diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp index 955d42de97..2072573681 100644 --- a/src/msw/scrolbar.cpp +++ b/src/msw/scrolbar.cpp @@ -28,7 +28,6 @@ #include "wx/scrolbar.h" #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) BEGIN_EVENT_TABLE(wxScrollBar, wxControl) @@ -37,7 +36,6 @@ BEGIN_EVENT_TABLE(wxScrollBar, wxControl) #endif END_EVENT_TABLE() -#endif // Scrollbar bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index 56abc963b7..10a12ac3ef 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -35,9 +35,7 @@ #include #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl) -#endif // Slider wxSlider95::wxSlider95() diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp index c6124f512c..a915542d62 100644 --- a/src/msw/slidrmsw.cpp +++ b/src/msw/slidrmsw.cpp @@ -29,9 +29,7 @@ #include "wx/msw/slidrmsw.h" #include "wx/msw/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl) -#endif // Slider wxSliderMSW::wxSliderMSW() diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index 6cc04c468f..deafa898b2 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -54,10 +54,8 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent); -#endif // ---------------------------------------------------------------------------- // wxSpinButton diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp index 5cbac4deda..27b0b26c2d 100644 --- a/src/msw/spinctrl.cpp +++ b/src/msw/spinctrl.cpp @@ -50,9 +50,7 @@ // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl) -#endif // ---------------------------------------------------------------------------- // constants diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index e37a780841..e9ceb4890b 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -42,9 +42,7 @@ // macors // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) -#endif // =========================================================================== // implementation diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index e9d67bec8a..f08e16db70 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -41,9 +41,7 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) -#endif // ============================================================================ // implementation diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp index 4ab6b6c42d..b7e0f01365 100644 --- a/src/msw/stattext.cpp +++ b/src/msw/stattext.cpp @@ -30,9 +30,7 @@ #include "wx/msw/private.h" #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) -#endif bool wxStaticText::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp index b13f837e5e..57748ac81f 100644 --- a/src/msw/tabctrl.cpp +++ b/src/msw/tabctrl.cpp @@ -50,13 +50,11 @@ #include "wx/msw/private.h" #include "wx/msw/imaglist.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl) BEGIN_EVENT_TABLE(wxTabCtrl, wxControl) EVT_SYS_COLOUR_CHANGED(wxTabCtrl::OnSysColourChanged) END_EVENT_TABLE() -#endif wxTabCtrl::wxTabCtrl() { diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 9b2f4eeb50..3d8de5f7c6 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -58,7 +58,6 @@ bool wxTaskBarIcon::sm_registeredClass = FALSE; UINT wxTaskBarIcon::sm_taskbarMsg = 0; -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler) EVT_TASKBAR_MOVE (wxTaskBarIcon::_OnMouseMove) EVT_TASKBAR_LEFT_DOWN (wxTaskBarIcon::_OnLButtonDown) @@ -71,7 +70,6 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler) -#endif wxTaskBarIcon::wxTaskBarIcon(void) diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index ded652c304..36755cdc63 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -95,9 +95,7 @@ static void wxMapBitmap(HBITMAP hBitmap, int width, int height); // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) -#endif BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase) EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent) @@ -768,7 +766,7 @@ int wxToolBar95::GetIndexFromId(int id) const #define BGR_BUTTONSHADOW (RGB(128,128,128)) // dark grey #define BGR_BUTTONFACE (RGB(192,192,192)) // bright grey #define BGR_BUTTONHILIGHT (RGB(255,255,255)) // white -#define BGR_BACKGROUNDSEL (RGB(255,000,000)) // blue +#define BGR_BACKGROUNDSEL (RGB(000,000,255)) // blue #define BGR_BACKGROUND (RGB(255,000,255)) // magenta void wxMapBitmap(HBITMAP hBitmap, int width, int height) diff --git a/src/msw/tbarmsw.cpp b/src/msw/tbarmsw.cpp index 7f23bf7f63..9f2470286e 100644 --- a/src/msw/tbarmsw.cpp +++ b/src/msw/tbarmsw.cpp @@ -55,7 +55,6 @@ #error If wxUSE_IMAGE_LOADING_IN_MSW is set to 0, then wxUSE_BUTTONBAR must be set to 0 too. #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBarMSW, wxToolBarBase) @@ -63,7 +62,6 @@ BEGIN_EVENT_TABLE(wxToolBarMSW, wxToolBarBase) EVT_PAINT(wxToolBarMSW::OnPaint) EVT_MOUSE_EVENTS(wxToolBarMSW::OnMouseEvent) END_EVENT_TABLE() -#endif wxToolBarMSW::wxToolBarMSW(void) { @@ -858,7 +856,7 @@ typedef struct tagCOLORMAP2 #define BGR_BUTTONSHADOW (RGB(128,128,128)) // dark grey #define BGR_BUTTONFACE (RGB(192,192,192)) // bright grey #define BGR_BUTTONHILIGHT (RGB(255,255,255)) // white -#define BGR_BACKGROUNDSEL (RGB(255,000,000)) // blue +#define BGR_BACKGROUNDSEL (RGB(000,000,255)) // blue #define BGR_BACKGROUND (RGB(255,000,255)) // magenta #define FlipColor(rgb) (RGB(GetBValue(rgb), GetGValue(rgb), GetRValue(rgb))) diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 86967c3add..458cb8f4c8 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -62,7 +62,6 @@ #include #endif -#if !USE_SHARED_LIBRARY // ---------------------------------------------------------------------------- // event tables and other macros @@ -87,7 +86,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) END_EVENT_TABLE() -#endif // USE_SHARED_LIBRARY // ============================================================================ // implementation diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index 682f66980c..cd331eb4ec 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -51,9 +51,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD); #define _EXPORT _export #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -#endif // ============================================================================ // implementation diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index a350654153..0e0c3e0763 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -230,9 +230,7 @@ private: // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) -#endif // ---------------------------------------------------------------------------- // variables diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 7459dda311..2e4ccc5eac 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -141,9 +141,7 @@ wxWindow *wxFindWinFromHandle(WXHWND hWnd); // event tables // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) -#endif BEGIN_EVENT_TABLE(wxWindow, wxWindowBase) EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground) diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp index 881da9b4c5..7be1c6acd3 100644 --- a/src/os2/accel.cpp +++ b/src/os2/accel.cpp @@ -23,9 +23,7 @@ #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) -#endif class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData { diff --git a/src/os2/app.cpp b/src/os2/app.cpp index ee11aa649b..91434fe7dd 100644 --- a/src/os2/app.cpp +++ b/src/os2/app.cpp @@ -107,7 +107,6 @@ MRESULT wxWndProc( HWND // wxApp // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) @@ -115,7 +114,6 @@ MRESULT wxWndProc( HWND EVT_END_SESSION(wxApp::OnEndSession) EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) END_EVENT_TABLE() -#endif //// Initialize bool wxApp::Initialize( diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 47a6cdd53c..8c03d33f86 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -34,12 +34,10 @@ // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) -#endif // ============================================================================ // implementation diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp index 8f61361eba..ae0b2843da 100644 --- a/src/os2/bmpbuttn.cpp +++ b/src/os2/bmpbuttn.cpp @@ -19,9 +19,7 @@ #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) -#endif #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1) diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp index 76713cd289..53b8a95f2b 100644 --- a/src/os2/brush.cpp +++ b/src/os2/brush.cpp @@ -25,9 +25,7 @@ #include "assert.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) -#endif wxBrushRefData::wxBrushRefData() { diff --git a/src/os2/button.cpp b/src/os2/button.cpp index c9a6387c1e..cecadf63ee 100644 --- a/src/os2/button.cpp +++ b/src/os2/button.cpp @@ -23,9 +23,7 @@ #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) -#endif // Button diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp index 56dde6f8f8..b98fff5589 100644 --- a/src/os2/checkbox.cpp +++ b/src/os2/checkbox.cpp @@ -23,10 +23,8 @@ // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) -#endif // ============================================================================ // implementation diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp index b11ed7c1f8..cb94c109e2 100644 --- a/src/os2/checklst.cpp +++ b/src/os2/checklst.cpp @@ -44,9 +44,7 @@ // implementation // ============================================================================ -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) -#endif // ---------------------------------------------------------------------------- // declaration and implementation of wxCheckListBoxItem class diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp index be96555450..f834ab1fbc 100644 --- a/src/os2/choice.cpp +++ b/src/os2/choice.cpp @@ -20,9 +20,7 @@ #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) -#endif bool wxChoice::Create(wxWindow *parent, wxWindowID id, diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp index 9144cc4023..fa7a623970 100644 --- a/src/os2/colour.cpp +++ b/src/os2/colour.cpp @@ -17,9 +17,7 @@ #define INCL_PM #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -#endif // Colour diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp index a91a566f36..0a3802cb51 100644 --- a/src/os2/combobox.cpp +++ b/src/os2/combobox.cpp @@ -24,9 +24,7 @@ #include "wx/clipbrd.h" #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -#endif bool wxComboBox::OS2Command(WXUINT param, WXWORD WXUNUSED(id)) { diff --git a/src/os2/control.cpp b/src/os2/control.cpp index 16a0cb09ad..a0eaf12243 100644 --- a/src/os2/control.cpp +++ b/src/os2/control.cpp @@ -24,13 +24,11 @@ #include "wx/os2/private.h" #include "wx/control.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground) END_EVENT_TABLE() -#endif // Item members wxControl::wxControl() diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp index e3efb12c76..6490f0279e 100644 --- a/src/os2/cursor.cpp +++ b/src/os2/cursor.cpp @@ -26,9 +26,7 @@ #include "assert.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap) -#endif wxCursorRefData::wxCursorRefData(void) { diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp index 8983710b32..05dbc01904 100644 --- a/src/os2/dc.cpp +++ b/src/os2/dc.cpp @@ -31,9 +31,7 @@ #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -#endif // --------------------------------------------------------------------------- // constants diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp index ee5ad82aef..9fa35aa9d7 100644 --- a/src/os2/dcclient.cpp +++ b/src/os2/dcclient.cpp @@ -54,11 +54,9 @@ WX_DEFINE_OBJARRAY(wxArrayDCInfo); // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) -#endif // ---------------------------------------------------------------------------- // global variables diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp index 7f28afd8dd..1ab4a99f27 100644 --- a/src/os2/dcmemory.cpp +++ b/src/os2/dcmemory.cpp @@ -20,9 +20,7 @@ #include "wx/dcmemory.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC) -#endif /* * Memory DC diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp index eaff967696..7f9139ce16 100644 --- a/src/os2/dcprint.cpp +++ b/src/os2/dcprint.cpp @@ -27,9 +27,7 @@ #include "wx/dcprint.h" #include "math.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxPrinterDC, wxDC) -#endif // This form is deprecated diff --git a/src/os2/dcscreen.cpp b/src/os2/dcscreen.cpp index 58fc9b97cf..5eaa7dc200 100644 --- a/src/os2/dcscreen.cpp +++ b/src/os2/dcscreen.cpp @@ -26,9 +26,7 @@ #include "wx/dcscreen.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) -#endif // Create a DC representing the whole screen wxScreenDC::wxScreenDC() diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp index 3cd09826e3..7a5fd77c65 100644 --- a/src/os2/dialog.cpp +++ b/src/os2/dialog.cpp @@ -34,7 +34,6 @@ wxWindowList wxModalDialogs; wxWindowList wxModelessWindows; // Frames and modeless dialogs extern wxList WXDLLEXPORT wxPendingDelete; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) BEGIN_EVENT_TABLE(wxDialog, wxPanel) @@ -46,7 +45,6 @@ extern wxList WXDLLEXPORT wxPendingDelete; EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() -#endif wxDialog::wxDialog() { diff --git a/src/os2/dirdlg.cpp b/src/os2/dirdlg.cpp index 1dd38fa43a..f2ac2d3035 100644 --- a/src/os2/dirdlg.cpp +++ b/src/os2/dirdlg.cpp @@ -30,9 +30,7 @@ #define wxDIALOG_DEFAULT_X 300 #define wxDIALOG_DEFAULT_Y 300 -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxDirDialog, wxDialog) -#endif wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message, const wxString& defaultPath, diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp index 10a80890e0..aee711ce99 100644 --- a/src/os2/filedlg.cpp +++ b/src/os2/filedlg.cpp @@ -36,9 +36,7 @@ #include #include -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxFileDialog, wxDialog) -#endif wxString wxFileSelector( const char* title ,const char* defaultDir diff --git a/src/os2/font.cpp b/src/os2/font.cpp index 90094e4221..db5ecb184a 100644 --- a/src/os2/font.cpp +++ b/src/os2/font.cpp @@ -31,13 +31,11 @@ #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) #if wxUSE_PORTABLE_FONTS_IN_MSW IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject) #endif -#endif // ---------------------------------------------------------------------------- // wxFontRefData - the internal description of the font diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp index 841c3b56fd..065949e3c1 100644 --- a/src/os2/fontdlg.cpp +++ b/src/os2/fontdlg.cpp @@ -35,9 +35,7 @@ #define wxDIALOG_DEFAULT_X 300 #define wxDIALOG_DEFAULT_Y 300 -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) -#endif /* * wxFontDialog diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index fa543a0f52..47bfc39c75 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -49,14 +49,12 @@ extern wxMenu *wxCurrentPopupMenu; // event tables // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_ACTIVATE(wxFrame::OnActivate) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif // ============================================================================ // implementation diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp index d8185a69d9..620760fd5f 100644 --- a/src/os2/gauge.cpp +++ b/src/os2/gauge.cpp @@ -48,9 +48,7 @@ /* public function prototypes */ // BOOL _Optlink gaugeInit(HINSTANCE hInstance); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) -#endif bool wxGauge::Create(wxWindow *parent, wxWindowID id, int range, diff --git a/src/os2/gdiobj.cpp b/src/os2/gdiobj.cpp index 11b4d014af..af715606bc 100644 --- a/src/os2/gdiobj.cpp +++ b/src/os2/gdiobj.cpp @@ -13,8 +13,6 @@ #include "wx/gdiobj.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) -#endif // TODO: Nothing to do, unless you want to. diff --git a/src/os2/helpwin.cpp b/src/os2/helpwin.cpp index 3d7e6c1360..9e84bbf129 100644 --- a/src/os2/helpwin.cpp +++ b/src/os2/helpwin.cpp @@ -28,9 +28,7 @@ // MAX length of Help descriptor #define _MAX_HELP_LEN 500 -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase) -#endif wxWinHelpController::wxWinHelpController() { diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp index b03ecf734e..d4ef849d8f 100644 --- a/src/os2/icon.cpp +++ b/src/os2/icon.cpp @@ -29,9 +29,7 @@ #include "wx/icon.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase) -#endif // ============================================================================ // implementation diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp index 5408910fb3..2ecb09a5eb 100644 --- a/src/os2/listbox.cpp +++ b/src/os2/listbox.cpp @@ -34,9 +34,7 @@ #include "wx/ownerdrw.h" #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) -#endif // ============================================================================ // list box item declaration and implementation diff --git a/src/os2/mdi.cpp b/src/os2/mdi.cpp index ceac2aa938..c8cdaaec52 100644 --- a/src/os2/mdi.cpp +++ b/src/os2/mdi.cpp @@ -93,11 +93,9 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam, // wxWin macros // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow) -#endif // USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame) EVT_SIZE(wxMDIParentFrame::OnSize) diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp index c1d89ce224..129f2e8d91 100644 --- a/src/os2/menu.cpp +++ b/src/os2/menu.cpp @@ -46,10 +46,8 @@ static const int idMenuTitle = -2; // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif // ============================================================================ // implementation diff --git a/src/os2/metafile.cpp b/src/os2/metafile.cpp index 3ab444de6b..4cd1db8306 100644 --- a/src/os2/metafile.cpp +++ b/src/os2/metafile.cpp @@ -32,10 +32,8 @@ extern bool wxClipboardIsOpen; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC) -#endif /* * Metafiles diff --git a/src/os2/minifram.cpp b/src/os2/minifram.cpp index 0d2f2c7d11..b8034ec683 100644 --- a/src/os2/minifram.cpp +++ b/src/os2/minifram.cpp @@ -24,7 +24,5 @@ #include "wx/minifram.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) -#endif diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp index af819d103e..51704339e5 100644 --- a/src/os2/msgdlg.cpp +++ b/src/os2/msgdlg.cpp @@ -29,9 +29,7 @@ #define wxDIALOG_DEFAULT_X 300 #define wxDIALOG_DEFAULT_Y 300 -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxMessageDialog, wxDialog) -#endif wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption, long style, const wxPoint& pos) diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp index 9d105d5ae9..82ebe9a138 100644 --- a/src/os2/notebook.cpp +++ b/src/os2/notebook.cpp @@ -56,7 +56,6 @@ // event table // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES BEGIN_EVENT_TABLE(wxNotebook, wxControl) EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) EVT_SIZE(wxNotebook::OnSize) @@ -66,7 +65,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) -#endif // ============================================================================ // implementation diff --git a/src/os2/palette.cpp b/src/os2/palette.cpp index cab9adfc9d..e0461db8af 100644 --- a/src/os2/palette.cpp +++ b/src/os2/palette.cpp @@ -24,9 +24,7 @@ #include "assert.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject) -#endif /* * Palette diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp index 98c58163e7..905a09021b 100644 --- a/src/os2/pen.cpp +++ b/src/os2/pen.cpp @@ -24,9 +24,7 @@ #include "wx/os2/private.h" #include "assert.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) -#endif wxPenRefData::wxPenRefData() { diff --git a/src/os2/print.cpp b/src/os2/print.cpp index 7125a6a8f1..ee078d057e 100644 --- a/src/os2/print.cpp +++ b/src/os2/print.cpp @@ -23,10 +23,8 @@ #include "wx/os2/print.h" #include "wx/generic/prntdlgg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase) IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase) -#endif /* * Printer diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp index 0ea23cc062..40e46cd1cc 100644 --- a/src/os2/radiobox.cpp +++ b/src/os2/radiobox.cpp @@ -22,9 +22,7 @@ #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) -#endif // --------------------------------------------------------------------------- // private functions diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp index 1905f909e2..a2989ec2e0 100644 --- a/src/os2/radiobut.cpp +++ b/src/os2/radiobut.cpp @@ -25,10 +25,8 @@ #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton) -#endif bool wxRadioButton::OS2Command(WXUINT param, WXWORD id) { diff --git a/src/os2/region.cpp b/src/os2/region.cpp index 58495d9a9e..c991f9c046 100644 --- a/src/os2/region.cpp +++ b/src/os2/region.cpp @@ -18,10 +18,8 @@ #include "wx/window.h" #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) -#endif //----------------------------------------------------------------------------- // wxRegionRefData implementation diff --git a/src/os2/scrolbar.cpp b/src/os2/scrolbar.cpp index bcf4a9e187..e77bcbdb26 100644 --- a/src/os2/scrolbar.cpp +++ b/src/os2/scrolbar.cpp @@ -20,7 +20,6 @@ #include "wx/scrolbar.h" #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) BEGIN_EVENT_TABLE(wxScrollBar, wxControl) @@ -29,7 +28,6 @@ BEGIN_EVENT_TABLE(wxScrollBar, wxControl) #endif END_EVENT_TABLE() -#endif // Scrollbar bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp index 7817503b7f..c0d6c909bb 100644 --- a/src/os2/slider.cpp +++ b/src/os2/slider.cpp @@ -25,9 +25,7 @@ #include "wx/slider.h" #include "wx/os2/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) -#endif // Slider wxSlider::wxSlider() diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp index df775d9b3a..21afeeab63 100644 --- a/src/os2/spinbutt.cpp +++ b/src/os2/spinbutt.cpp @@ -32,9 +32,7 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) -#endif bool wxSpinButton::Create( wxWindow* parent diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp index 66b5fe5f99..07eb547a4a 100644 --- a/src/os2/spinctrl.cpp +++ b/src/os2/spinctrl.cpp @@ -33,9 +33,7 @@ // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl) -#endif // ---------------------------------------------------------------------------- // constants diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp index 36d6463c72..5d674c3826 100644 --- a/src/os2/statbmp.cpp +++ b/src/os2/statbmp.cpp @@ -26,9 +26,7 @@ // macors // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) -#endif // --------------------------------------------------------------------------- // wxStaticBitmap diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp index 1911f67045..3f1bd033fb 100644 --- a/src/os2/statbox.cpp +++ b/src/os2/statbox.cpp @@ -22,14 +22,12 @@ #include "wx/statbox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) BEGIN_EVENT_TABLE(wxStaticBox, wxControl) EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground) END_EVENT_TABLE() -#endif /* * Group box diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp index 524cd0d9ba..6642dccd8e 100644 --- a/src/os2/stattext.cpp +++ b/src/os2/stattext.cpp @@ -22,9 +22,7 @@ #include "wx/os2/private.h" #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) -#endif bool wxStaticText::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/os2/tabctrl.cpp b/src/os2/tabctrl.cpp index ea95ab839e..2894ebf86e 100644 --- a/src/os2/tabctrl.cpp +++ b/src/os2/tabctrl.cpp @@ -27,12 +27,10 @@ #include "wx/os2/private.h" #include "wx/generic/imaglist.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl) BEGIN_EVENT_TABLE(wxTabCtrl, wxControl) END_EVENT_TABLE() -#endif wxTabCtrl::wxTabCtrl() { diff --git a/src/os2/taskbar.cpp b/src/os2/taskbar.cpp index 723ec93a3d..f9b432aa2b 100644 --- a/src/os2/taskbar.cpp +++ b/src/os2/taskbar.cpp @@ -36,7 +36,6 @@ bool wxTaskBarIcon::sm_registeredClass = FALSE; UINT wxTaskBarIcon::sm_taskbarMsg = 0; -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler) EVT_TASKBAR_MOVE (wxTaskBarIcon::_OnMouseMove) EVT_TASKBAR_LEFT_DOWN (wxTaskBarIcon::_OnLButtonDown) @@ -48,7 +47,6 @@ BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler) -#endif wxTaskBarIcon::wxTaskBarIcon(void) diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp index 2c23d29d1d..3ca7f9177c 100644 --- a/src/os2/textctrl.cpp +++ b/src/os2/textctrl.cpp @@ -43,7 +43,6 @@ # include #endif -#if !USE_SHARED_LIBRARY // ---------------------------------------------------------------------------- // event tables and other macros @@ -68,7 +67,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) END_EVENT_TABLE() -#endif // USE_SHARED_LIBRARY // ============================================================================ // implementation diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp index 54c26cbbeb..05784150e4 100644 --- a/src/os2/timer.cpp +++ b/src/os2/timer.cpp @@ -42,9 +42,7 @@ ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG); // macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -#endif wxTimer::wxTimer() { diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp index 4ed0456193..718318b17c 100644 --- a/src/os2/toolbar.cpp +++ b/src/os2/toolbar.cpp @@ -51,9 +51,7 @@ NM_CUSTOMDRAW message and do your custom drawing. #define DEFAULTBUTTONY 24 #define DEFAULTBARHEIGHT 27 -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) -#endif BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent) diff --git a/src/os2/window.cpp b/src/os2/window.cpp index 865455f6c6..088db7e071 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -109,9 +109,7 @@ wxWindow *wxFindWinFromHandle(WXHWND hWnd); // event tables // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) -#endif BEGIN_EVENT_TABLE(wxWindow, wxWindowBase) EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground) diff --git a/src/qt/app.cpp b/src/qt/app.cpp index f34b677837..0294c58bc4 100644 --- a/src/qt/app.cpp +++ b/src/qt/app.cpp @@ -40,12 +40,10 @@ extern wxList wxPendingDelete; wxApp *wxTheApp = NULL; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) END_EVENT_TABLE() -#endif long wxApp::sm_lastMessageTime = 0; diff --git a/src/qt/bitmap.cpp b/src/qt/bitmap.cpp index 1e6255f551..d6f9fa87e3 100644 --- a/src/qt/bitmap.cpp +++ b/src/qt/bitmap.cpp @@ -20,10 +20,8 @@ #include "wx/icon.h" #include "wx/log.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) -#endif wxBitmapRefData::wxBitmapRefData() { diff --git a/src/qt/bmpbuttn.cpp b/src/qt/bmpbuttn.cpp index 9e46c22b2b..03c4ceeb63 100644 --- a/src/qt/bmpbuttn.cpp +++ b/src/qt/bmpbuttn.cpp @@ -15,9 +15,7 @@ #include "wx/bmpbuttn.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) -#endif bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, diff --git a/src/qt/brush.cpp b/src/qt/brush.cpp index 72c12935ff..587080575b 100644 --- a/src/qt/brush.cpp +++ b/src/qt/brush.cpp @@ -17,9 +17,7 @@ #include "wx/utils.h" #include "wx/brush.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) -#endif wxBrushRefData::wxBrushRefData() { diff --git a/src/qt/button.cpp b/src/qt/button.cpp index befd0d7156..2928e0d96f 100644 --- a/src/qt/button.cpp +++ b/src/qt/button.cpp @@ -15,9 +15,7 @@ #include "wx/button.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) -#endif // Button diff --git a/src/qt/checkbox.cpp b/src/qt/checkbox.cpp index dd2e2abe7a..f7b1c6ad10 100644 --- a/src/qt/checkbox.cpp +++ b/src/qt/checkbox.cpp @@ -15,10 +15,8 @@ #include "wx/checkbox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) -#endif // Single check box item bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/qt/choice.cpp b/src/qt/choice.cpp index a584d5303f..c6a1d250e2 100644 --- a/src/qt/choice.cpp +++ b/src/qt/choice.cpp @@ -16,9 +16,7 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/choice.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) -#endif bool wxChoice::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, diff --git a/src/qt/colour.cpp b/src/qt/colour.cpp index d342d516de..4ccd4afc15 100644 --- a/src/qt/colour.cpp +++ b/src/qt/colour.cpp @@ -16,9 +16,7 @@ #include "wx/gdicmn.h" #include "wx/colour.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -#endif // Colour diff --git a/src/qt/combobox.cpp b/src/qt/combobox.cpp index f1bbccaeb0..788a456b7f 100644 --- a/src/qt/combobox.cpp +++ b/src/qt/combobox.cpp @@ -15,9 +15,7 @@ #include "wx/combobox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -#endif bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value, diff --git a/src/qt/control.cpp b/src/qt/control.cpp index 651b272953..4786140bef 100644 --- a/src/qt/control.cpp +++ b/src/qt/control.cpp @@ -15,12 +15,10 @@ #include "wx/control.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) END_EVENT_TABLE() -#endif // Item members wxControl::wxControl() diff --git a/src/qt/cursor.cpp b/src/qt/cursor.cpp index c856f5e9e0..29b7d5c996 100644 --- a/src/qt/cursor.cpp +++ b/src/qt/cursor.cpp @@ -15,9 +15,7 @@ #include "wx/cursor.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap) -#endif wxCursorRefData::wxCursorRefData() { diff --git a/src/qt/dc.cpp b/src/qt/dc.cpp index e56f268e35..a4cb431cf9 100644 --- a/src/qt/dc.cpp +++ b/src/qt/dc.cpp @@ -15,9 +15,7 @@ #include "wx/dc.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -#endif //----------------------------------------------------------------------------- // constants diff --git a/src/qt/dcclient.cpp b/src/qt/dcclient.cpp index e25920d94f..081a7d57f5 100644 --- a/src/qt/dcclient.cpp +++ b/src/qt/dcclient.cpp @@ -27,11 +27,9 @@ // wxPaintDC //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY //IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxDC) //IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxDC) -#endif wxPaintDC::wxPaintDC(void) diff --git a/src/qt/dcmemory.cpp b/src/qt/dcmemory.cpp index c6066bb1ab..91552f1c58 100644 --- a/src/qt/dcmemory.cpp +++ b/src/qt/dcmemory.cpp @@ -15,9 +15,7 @@ #include "wx/dcmemory.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC) -#endif //----------------------------------------------------------------------------- // wxMemoryDC diff --git a/src/qt/dcscreen.cpp b/src/qt/dcscreen.cpp index 04bbf4f353..cea4a7c792 100644 --- a/src/qt/dcscreen.cpp +++ b/src/qt/dcscreen.cpp @@ -15,9 +15,7 @@ #include "wx/dcscreen.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxPaintDC) -#endif // Create a DC representing the whole screen wxScreenDC::wxScreenDC() diff --git a/src/qt/dialog.cpp b/src/qt/dialog.cpp index c486c876cb..d49b4cf98c 100644 --- a/src/qt/dialog.cpp +++ b/src/qt/dialog.cpp @@ -25,7 +25,6 @@ wxList wxModalDialogs; wxList wxModelessWindows; // Frames and modeless dialogs extern wxList wxPendingDelete; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) BEGIN_EVENT_TABLE(wxDialog, wxPanel) @@ -37,7 +36,6 @@ BEGIN_EVENT_TABLE(wxDialog, wxPanel) EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() -#endif wxDialog::wxDialog() { diff --git a/src/qt/filedlg.cpp b/src/qt/filedlg.cpp index cf096037d6..57ff74897b 100644 --- a/src/qt/filedlg.cpp +++ b/src/qt/filedlg.cpp @@ -18,9 +18,7 @@ #include "wx/dialog.h" #include "wx/filedlg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxFileDialog, wxDialog) -#endif char *wxFileSelector(const char *title, const char *defaultDir, const char *defaultFileName, diff --git a/src/qt/font.cpp b/src/qt/font.cpp index 5835259696..a47c8e43ec 100644 --- a/src/qt/font.cpp +++ b/src/qt/font.cpp @@ -15,9 +15,7 @@ #include "wx/font.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) -#endif wxFontRefData::wxFontRefData() { diff --git a/src/qt/frame.cpp b/src/qt/frame.cpp index f371fe0724..8807b62f89 100644 --- a/src/qt/frame.cpp +++ b/src/qt/frame.cpp @@ -21,7 +21,6 @@ extern wxList wxModelessWindows; extern wxList wxPendingDelete; -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxWindow) EVT_SIZE(wxFrame::OnSize) EVT_ACTIVATE(wxFrame::OnActivate) @@ -32,7 +31,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxWindow) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif #if wxUSE_NATIVE_STATUSBAR bool wxFrame::m_useNativeStatusBar = TRUE; diff --git a/src/qt/gauge.cpp b/src/qt/gauge.cpp index 8e11c5001b..14b5c4267d 100644 --- a/src/qt/gauge.cpp +++ b/src/qt/gauge.cpp @@ -15,9 +15,7 @@ #include "wx/gauge.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) -#endif bool wxGauge::Create(wxWindow *parent, wxWindowID id, int range, diff --git a/src/qt/gdiobj.cpp b/src/qt/gdiobj.cpp index 63697c8354..46b1aa871f 100644 --- a/src/qt/gdiobj.cpp +++ b/src/qt/gdiobj.cpp @@ -15,8 +15,6 @@ #include "wx/gdiobj.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) -#endif // TODO: Nothing to do, unless you want to. diff --git a/src/qt/icon.cpp b/src/qt/icon.cpp index 6deee7dbdc..cc5b28500e 100644 --- a/src/qt/icon.cpp +++ b/src/qt/icon.cpp @@ -15,9 +15,7 @@ #include "wx/icon.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) -#endif /* * Icons diff --git a/src/qt/listbox.cpp b/src/qt/listbox.cpp index a54523ab3d..f3d95d0d97 100644 --- a/src/qt/listbox.cpp +++ b/src/qt/listbox.cpp @@ -18,9 +18,7 @@ #include "wx/dynarray.h" #include "wx/log.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) -#endif // ============================================================================ // list box control implementation diff --git a/src/qt/mdi.cpp b/src/qt/mdi.cpp index 3823536063..7ece99f432 100644 --- a/src/qt/mdi.cpp +++ b/src/qt/mdi.cpp @@ -17,7 +17,6 @@ extern wxList wxModelessWindows; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow) @@ -32,7 +31,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow) EVT_SCROLL(wxMDIClientWindow::OnScroll) END_EVENT_TABLE() -#endif // Parent frame diff --git a/src/qt/menu.cpp b/src/qt/menu.cpp index 217e6c8b88..fcb7f97014 100644 --- a/src/qt/menu.cpp +++ b/src/qt/menu.cpp @@ -30,10 +30,8 @@ // ---------------------- #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif // ============================================================================ // implementation diff --git a/src/qt/notebook.cpp b/src/qt/notebook.cpp index aecb879f4b..b0448791a4 100644 --- a/src/qt/notebook.cpp +++ b/src/qt/notebook.cpp @@ -36,7 +36,6 @@ // event table // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES BEGIN_EVENT_TABLE(wxNotebook, wxControl) EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) @@ -47,7 +46,6 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) -#endif // ============================================================================ // implementation diff --git a/src/qt/palette.cpp b/src/qt/palette.cpp index 445b545f0c..dfbc153094 100644 --- a/src/qt/palette.cpp +++ b/src/qt/palette.cpp @@ -15,9 +15,7 @@ #include "wx/palette.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject) -#endif /* * Palette diff --git a/src/qt/pen.cpp b/src/qt/pen.cpp index d7b2ce264c..90cb80f41d 100644 --- a/src/qt/pen.cpp +++ b/src/qt/pen.cpp @@ -17,9 +17,7 @@ #include "wx/utils.h" #include "wx/pen.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) -#endif wxPenRefData::wxPenRefData() { diff --git a/src/qt/radiobox.cpp b/src/qt/radiobox.cpp index da582d0e52..a3ecae6d01 100644 --- a/src/qt/radiobox.cpp +++ b/src/qt/radiobox.cpp @@ -15,9 +15,7 @@ #include "wx/radiobox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) -#endif // Radio box item wxRadioBox::wxRadioBox() diff --git a/src/qt/radiobut.cpp b/src/qt/radiobut.cpp index 65baab38b6..3fd6d78d2d 100644 --- a/src/qt/radiobut.cpp +++ b/src/qt/radiobut.cpp @@ -15,9 +15,7 @@ #include "wx/radiobut.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) -#endif bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/qt/region.cpp b/src/qt/region.cpp index d03d8e8020..7945594c99 100644 --- a/src/qt/region.cpp +++ b/src/qt/region.cpp @@ -23,10 +23,8 @@ #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) -#endif //----------------------------------------------------------------------------- // wxRegionRefData implementation diff --git a/src/qt/scrolbar.cpp b/src/qt/scrolbar.cpp index 0058a14f53..942fe02228 100644 --- a/src/qt/scrolbar.cpp +++ b/src/qt/scrolbar.cpp @@ -15,10 +15,8 @@ #include "wx/scrolbar.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) -#endif // Scrollbar bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, diff --git a/src/qt/slider.cpp b/src/qt/slider.cpp index 97c453b989..b3d00c8af6 100644 --- a/src/qt/slider.cpp +++ b/src/qt/slider.cpp @@ -15,9 +15,7 @@ #include "wx/msw/slider.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) -#endif // Slider wxSlider::wxSlider() diff --git a/src/qt/statbmp.cpp b/src/qt/statbmp.cpp index a67c558465..115d5cc999 100644 --- a/src/qt/statbmp.cpp +++ b/src/qt/statbmp.cpp @@ -15,9 +15,7 @@ #include "wx/statbmp.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) -#endif /* * wxStaticBitmap diff --git a/src/qt/statbox.cpp b/src/qt/statbox.cpp index b239dc738c..95bfc3b2c4 100644 --- a/src/qt/statbox.cpp +++ b/src/qt/statbox.cpp @@ -15,14 +15,12 @@ #include "wx/statbox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) BEGIN_EVENT_TABLE(wxStaticBox, wxControl) EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground) END_EVENT_TABLE() -#endif /* * Static box diff --git a/src/qt/stattext.cpp b/src/qt/stattext.cpp index 1958826916..7f551c4569 100644 --- a/src/qt/stattext.cpp +++ b/src/qt/stattext.cpp @@ -28,9 +28,7 @@ #include "wx/msw/private.h" #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) -#endif bool wxStaticText::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/qt/textctrl.cpp b/src/qt/textctrl.cpp index ce3459256d..f8267f300b 100644 --- a/src/qt/textctrl.cpp +++ b/src/qt/textctrl.cpp @@ -28,7 +28,6 @@ #endif #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) @@ -36,7 +35,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_DROP_FILES(wxTextCtrl::OnDropFiles) EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground) END_EVENT_TABLE() -#endif // Text item wxTextCtrl::wxTextCtrl() diff --git a/src/qt/timer.cpp b/src/qt/timer.cpp index f976056c77..c07c4a5f82 100644 --- a/src/qt/timer.cpp +++ b/src/qt/timer.cpp @@ -15,9 +15,7 @@ #include "wx/timer.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -#endif wxTimer::wxTimer() { diff --git a/src/qt/window.cpp b/src/qt/window.cpp index dce26c84da..761e34e9d0 100644 --- a/src/qt/window.cpp +++ b/src/qt/window.cpp @@ -38,7 +38,6 @@ extern wxList wxPendingDelete; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler) BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) @@ -49,7 +48,6 @@ BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) EVT_IDLE(wxWindow::OnIdle) END_EVENT_TABLE() -#endif // Constructor diff --git a/src/stubs/accel.cpp b/src/stubs/accel.cpp index b0b8734d55..f8796e111a 100644 --- a/src/stubs/accel.cpp +++ b/src/stubs/accel.cpp @@ -17,9 +17,7 @@ #include "wx/accel.h" #include "wx/string.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) -#endif class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData { diff --git a/src/stubs/app.cpp b/src/stubs/app.cpp index b04a01bbe2..681e661556 100644 --- a/src/stubs/app.cpp +++ b/src/stubs/app.cpp @@ -40,12 +40,10 @@ extern wxList wxPendingDelete; wxApp *wxTheApp = NULL; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) END_EVENT_TABLE() -#endif long wxApp::sm_lastMessageTime = 0; diff --git a/src/stubs/bitmap.cpp b/src/stubs/bitmap.cpp index 1e6255f551..d6f9fa87e3 100644 --- a/src/stubs/bitmap.cpp +++ b/src/stubs/bitmap.cpp @@ -20,10 +20,8 @@ #include "wx/icon.h" #include "wx/log.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) -#endif wxBitmapRefData::wxBitmapRefData() { diff --git a/src/stubs/bmpbuttn.cpp b/src/stubs/bmpbuttn.cpp index 169f0d557a..b39c2c3bcd 100644 --- a/src/stubs/bmpbuttn.cpp +++ b/src/stubs/bmpbuttn.cpp @@ -15,9 +15,7 @@ #include "wx/bmpbuttn.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) -#endif bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, diff --git a/src/stubs/brush.cpp b/src/stubs/brush.cpp index 4f28e92f53..7c9f52ae2a 100644 --- a/src/stubs/brush.cpp +++ b/src/stubs/brush.cpp @@ -17,9 +17,7 @@ #include "wx/utils.h" #include "wx/brush.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) -#endif wxBrushRefData::wxBrushRefData() { diff --git a/src/stubs/button.cpp b/src/stubs/button.cpp index befd0d7156..2928e0d96f 100644 --- a/src/stubs/button.cpp +++ b/src/stubs/button.cpp @@ -15,9 +15,7 @@ #include "wx/button.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) -#endif // Button diff --git a/src/stubs/checkbox.cpp b/src/stubs/checkbox.cpp index 258a9cc6c3..1fcf88c9e6 100644 --- a/src/stubs/checkbox.cpp +++ b/src/stubs/checkbox.cpp @@ -15,10 +15,8 @@ #include "wx/checkbox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) -#endif // Single check box item bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/stubs/checklst.cpp b/src/stubs/checklst.cpp index ecabf5408e..18433b99d0 100644 --- a/src/stubs/checklst.cpp +++ b/src/stubs/checklst.cpp @@ -23,9 +23,7 @@ // implementation // ============================================================================ -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) -#endif // ---------------------------------------------------------------------------- // implementation of wxCheckListBox class diff --git a/src/stubs/choice.cpp b/src/stubs/choice.cpp index a584d5303f..c6a1d250e2 100644 --- a/src/stubs/choice.cpp +++ b/src/stubs/choice.cpp @@ -16,9 +16,7 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/choice.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) -#endif bool wxChoice::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, diff --git a/src/stubs/clipbrd.cpp b/src/stubs/clipbrd.cpp index 3fe9ebfb72..6ffe21ddb5 100644 --- a/src/stubs/clipbrd.cpp +++ b/src/stubs/clipbrd.cpp @@ -23,10 +23,8 @@ #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxClipboardClient, wxObject) -#endif bool wxOpenClipboard() { diff --git a/src/stubs/colordlg.cpp b/src/stubs/colordlg.cpp index 2275a9a39d..56450e7304 100644 --- a/src/stubs/colordlg.cpp +++ b/src/stubs/colordlg.cpp @@ -16,9 +16,7 @@ #include "wx/stubs/colordlg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) -#endif /* * wxColourDialog diff --git a/src/stubs/colour.cpp b/src/stubs/colour.cpp index 8d0827ef1d..f2c7fe382c 100644 --- a/src/stubs/colour.cpp +++ b/src/stubs/colour.cpp @@ -16,9 +16,7 @@ #include "wx/gdicmn.h" #include "wx/colour.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -#endif // Colour diff --git a/src/stubs/combobox.cpp b/src/stubs/combobox.cpp index 0be841bad4..568529db54 100644 --- a/src/stubs/combobox.cpp +++ b/src/stubs/combobox.cpp @@ -15,9 +15,7 @@ #include "wx/combobox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -#endif bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value, diff --git a/src/stubs/control.cpp b/src/stubs/control.cpp index b141a80ff1..6ce584b2ea 100644 --- a/src/stubs/control.cpp +++ b/src/stubs/control.cpp @@ -15,12 +15,10 @@ #include "wx/control.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) END_EVENT_TABLE() -#endif // Item members wxControl::wxControl() diff --git a/src/stubs/cursor.cpp b/src/stubs/cursor.cpp index 4333364c93..bc04cc617c 100644 --- a/src/stubs/cursor.cpp +++ b/src/stubs/cursor.cpp @@ -16,9 +16,7 @@ #include "wx/cursor.h" #include "wx/icon.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap) -#endif wxCursorRefData::wxCursorRefData() { diff --git a/src/stubs/dc.cpp b/src/stubs/dc.cpp index 2c1c613595..a70a0f1d13 100644 --- a/src/stubs/dc.cpp +++ b/src/stubs/dc.cpp @@ -15,9 +15,7 @@ #include "wx/dc.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -#endif //----------------------------------------------------------------------------- // constants diff --git a/src/stubs/dcclient.cpp b/src/stubs/dcclient.cpp index 925d9609ee..4962885bf9 100644 --- a/src/stubs/dcclient.cpp +++ b/src/stubs/dcclient.cpp @@ -28,11 +28,9 @@ // wxPaintDC //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) -#endif /* * wxWindowDC diff --git a/src/stubs/dcscreen.cpp b/src/stubs/dcscreen.cpp index e03bbac0c8..5d592d8b96 100644 --- a/src/stubs/dcscreen.cpp +++ b/src/stubs/dcscreen.cpp @@ -15,9 +15,7 @@ #include "wx/dcscreen.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) -#endif // Create a DC representing the whole screen wxScreenDC::wxScreenDC() diff --git a/src/stubs/dialog.cpp b/src/stubs/dialog.cpp index bf3cae5e35..f0358af36a 100644 --- a/src/stubs/dialog.cpp +++ b/src/stubs/dialog.cpp @@ -25,7 +25,6 @@ wxList wxModalDialogs; wxList wxModelessWindows; // Frames and modeless dialogs extern wxList wxPendingDelete; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) BEGIN_EVENT_TABLE(wxDialog, wxPanel) @@ -37,7 +36,6 @@ BEGIN_EVENT_TABLE(wxDialog, wxPanel) EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() -#endif wxDialog::wxDialog() { diff --git a/src/stubs/dirdlg.cpp b/src/stubs/dirdlg.cpp index 095621b978..511f8f929b 100644 --- a/src/stubs/dirdlg.cpp +++ b/src/stubs/dirdlg.cpp @@ -20,9 +20,7 @@ #include "wx/cmndata.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxDirDialog, wxDialog) -#endif wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message, const wxString& defaultPath, diff --git a/src/stubs/filedlg.cpp b/src/stubs/filedlg.cpp index 8832598af4..8d1b8731a0 100644 --- a/src/stubs/filedlg.cpp +++ b/src/stubs/filedlg.cpp @@ -19,9 +19,7 @@ #include "wx/filedlg.h" #include "wx/intl.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxFileDialog, wxDialog) -#endif wxString wxFileSelector(const char *title, const char *defaultDir, const char *defaultFileName, diff --git a/src/stubs/font.cpp b/src/stubs/font.cpp index 493a6a25ba..c152046ec4 100644 --- a/src/stubs/font.cpp +++ b/src/stubs/font.cpp @@ -18,9 +18,7 @@ #include "wx/font.h" #include "wx/gdicmn.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) -#endif wxFontRefData::wxFontRefData() { diff --git a/src/stubs/fontdlg.cpp b/src/stubs/fontdlg.cpp index 60e8e9b987..13fa1b0c47 100644 --- a/src/stubs/fontdlg.cpp +++ b/src/stubs/fontdlg.cpp @@ -17,9 +17,7 @@ #include "wx/stubs/fontdlg.h" #include "wx/cmndata.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) -#endif /* * wxFontDialog diff --git a/src/stubs/frame.cpp b/src/stubs/frame.cpp index 0a15c650af..aeb2a78007 100644 --- a/src/stubs/frame.cpp +++ b/src/stubs/frame.cpp @@ -26,7 +26,6 @@ extern wxList wxModelessWindows; extern wxList wxPendingDelete; -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxWindow) EVT_SIZE(wxFrame::OnSize) EVT_ACTIVATE(wxFrame::OnActivate) @@ -37,7 +36,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxWindow) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif #if wxUSE_NATIVE_STATUSBAR bool wxFrame::m_useNativeStatusBar = TRUE; diff --git a/src/stubs/gauge.cpp b/src/stubs/gauge.cpp index a85fbc498f..98976d4311 100644 --- a/src/stubs/gauge.cpp +++ b/src/stubs/gauge.cpp @@ -15,9 +15,7 @@ #include "wx/gauge.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) -#endif bool wxGauge::Create(wxWindow *parent, wxWindowID id, int range, diff --git a/src/stubs/gdiobj.cpp b/src/stubs/gdiobj.cpp index 63697c8354..46b1aa871f 100644 --- a/src/stubs/gdiobj.cpp +++ b/src/stubs/gdiobj.cpp @@ -15,8 +15,6 @@ #include "wx/gdiobj.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) -#endif // TODO: Nothing to do, unless you want to. diff --git a/src/stubs/helpxxxx.cpp b/src/stubs/helpxxxx.cpp index 086762c646..b7f0babfa2 100644 --- a/src/stubs/helpxxxx.cpp +++ b/src/stubs/helpxxxx.cpp @@ -17,9 +17,7 @@ #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxXXXXHelpController, wxHelpControllerBase) -#endif wxXXXXHelpController::wxXXXXHelpController() { diff --git a/src/stubs/icon.cpp b/src/stubs/icon.cpp index 6deee7dbdc..cc5b28500e 100644 --- a/src/stubs/icon.cpp +++ b/src/stubs/icon.cpp @@ -15,9 +15,7 @@ #include "wx/icon.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) -#endif /* * Icons diff --git a/src/stubs/imaglist.cpp b/src/stubs/imaglist.cpp index 4cb47b4e69..cb4b9ff01c 100644 --- a/src/stubs/imaglist.cpp +++ b/src/stubs/imaglist.cpp @@ -15,9 +15,7 @@ #include "wx/stubs/imaglist.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject) -#endif wxImageList::wxImageList() { diff --git a/src/stubs/listbox.cpp b/src/stubs/listbox.cpp index 1dad21e12c..2445810473 100644 --- a/src/stubs/listbox.cpp +++ b/src/stubs/listbox.cpp @@ -18,9 +18,7 @@ #include "wx/dynarray.h" #include "wx/log.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) -#endif // ============================================================================ // list box control implementation diff --git a/src/stubs/listctrl.cpp b/src/stubs/listctrl.cpp index d1d8445652..2c11981bf2 100644 --- a/src/stubs/listctrl.cpp +++ b/src/stubs/listctrl.cpp @@ -16,11 +16,9 @@ #include "wx/stubs/textctrl.h" #include "wx/stubs/listctrl.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) -#endif wxListCtrl::wxListCtrl() { diff --git a/src/stubs/mdi.cpp b/src/stubs/mdi.cpp index 4869697cd7..9e62e1d15c 100644 --- a/src/stubs/mdi.cpp +++ b/src/stubs/mdi.cpp @@ -19,7 +19,6 @@ extern wxList wxModelessWindows; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow) @@ -34,7 +33,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow) EVT_SCROLL(wxMDIClientWindow::OnScroll) END_EVENT_TABLE() -#endif // Parent frame diff --git a/src/stubs/menu.cpp b/src/stubs/menu.cpp index 5880beab53..32188c4b4a 100644 --- a/src/stubs/menu.cpp +++ b/src/stubs/menu.cpp @@ -31,10 +31,8 @@ // ---------------------- #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif // ============================================================================ // implementation diff --git a/src/stubs/menuitem.cpp b/src/stubs/menuitem.cpp index 38d31737e7..4827ada322 100644 --- a/src/stubs/menuitem.cpp +++ b/src/stubs/menuitem.cpp @@ -24,9 +24,7 @@ // dynamic classes implementation // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) -#endif //USE_SHARED_LIBRARY // ---------------------------------------------------------------------------- // wxMenuItem diff --git a/src/stubs/metafile.cpp b/src/stubs/metafile.cpp index 03c29bcb79..4c5d6ac137 100644 --- a/src/stubs/metafile.cpp +++ b/src/stubs/metafile.cpp @@ -21,10 +21,8 @@ extern bool wxClipboardIsOpen; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMetaFile, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxMetaFileDC, wxDC) -#endif wxMetaFile::wxMetaFile(const wxString& file) { diff --git a/src/stubs/minifram.cpp b/src/stubs/minifram.cpp index 4f6f5e5fcb..cbe09b7d81 100644 --- a/src/stubs/minifram.cpp +++ b/src/stubs/minifram.cpp @@ -15,8 +15,6 @@ #include "wx/minifram.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) -#endif diff --git a/src/stubs/msgdlg.cpp b/src/stubs/msgdlg.cpp index aeaa9bac7a..11831c3c34 100644 --- a/src/stubs/msgdlg.cpp +++ b/src/stubs/msgdlg.cpp @@ -15,9 +15,7 @@ #include "wx/stubs/msgdlg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxMessageDialog, wxDialog) -#endif wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption, long style, const wxPoint& pos) diff --git a/src/stubs/notebook.cpp b/src/stubs/notebook.cpp index f7ee49cd5d..9ac9c0bf4a 100644 --- a/src/stubs/notebook.cpp +++ b/src/stubs/notebook.cpp @@ -36,7 +36,6 @@ // event table // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES BEGIN_EVENT_TABLE(wxNotebook, wxControl) EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) @@ -47,7 +46,6 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) -#endif // ============================================================================ // implementation diff --git a/src/stubs/palette.cpp b/src/stubs/palette.cpp index f8db96f8d0..44ae8cc9e3 100644 --- a/src/stubs/palette.cpp +++ b/src/stubs/palette.cpp @@ -15,9 +15,7 @@ #include "wx/palette.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject) -#endif /* * Palette diff --git a/src/stubs/pen.cpp b/src/stubs/pen.cpp index 1e3ced2a3a..2502b392fb 100644 --- a/src/stubs/pen.cpp +++ b/src/stubs/pen.cpp @@ -17,9 +17,7 @@ #include "wx/utils.h" #include "wx/pen.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) -#endif wxPenRefData::wxPenRefData() { diff --git a/src/stubs/print.cpp b/src/stubs/print.cpp index 61fd6e7e99..d694aadd4f 100644 --- a/src/stubs/print.cpp +++ b/src/stubs/print.cpp @@ -16,10 +16,8 @@ #include "wx/stubs/print.h" #include "wx/stubs/printdlg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase) IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase) -#endif /* * Printer diff --git a/src/stubs/printdlg.cpp b/src/stubs/printdlg.cpp index eae3b95568..c6438e083c 100644 --- a/src/stubs/printdlg.cpp +++ b/src/stubs/printdlg.cpp @@ -20,10 +20,8 @@ // Use generic page setup dialog: use your own native one if one exists. #include "wx/generic/prntdlgg.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog) IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog) -#endif wxPrintDialog::wxPrintDialog(): wxDialog() diff --git a/src/stubs/radiobox.cpp b/src/stubs/radiobox.cpp index da582d0e52..a3ecae6d01 100644 --- a/src/stubs/radiobox.cpp +++ b/src/stubs/radiobox.cpp @@ -15,9 +15,7 @@ #include "wx/radiobox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) -#endif // Radio box item wxRadioBox::wxRadioBox() diff --git a/src/stubs/radiobut.cpp b/src/stubs/radiobut.cpp index 65baab38b6..3fd6d78d2d 100644 --- a/src/stubs/radiobut.cpp +++ b/src/stubs/radiobut.cpp @@ -15,9 +15,7 @@ #include "wx/radiobut.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) -#endif bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/stubs/region.cpp b/src/stubs/region.cpp index c71d4c605a..85aea95133 100644 --- a/src/stubs/region.cpp +++ b/src/stubs/region.cpp @@ -15,10 +15,8 @@ #include "wx/region.h" #include "wx/gdicmn.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) -#endif //----------------------------------------------------------------------------- // wxRegionRefData implementation diff --git a/src/stubs/scrolbar.cpp b/src/stubs/scrolbar.cpp index 54df181166..dca07b3b79 100644 --- a/src/stubs/scrolbar.cpp +++ b/src/stubs/scrolbar.cpp @@ -15,10 +15,8 @@ #include "wx/scrolbar.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) -#endif // Scrollbar bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, diff --git a/src/stubs/slider.cpp b/src/stubs/slider.cpp index c9952342a9..54d33f1a0f 100644 --- a/src/stubs/slider.cpp +++ b/src/stubs/slider.cpp @@ -15,12 +15,10 @@ #include "wx/slider.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) BEGIN_EVENT_TABLE(wxSlider, wxControl) END_EVENT_TABLE() -#endif diff --git a/src/stubs/spinbutt.cpp b/src/stubs/spinbutt.cpp index cbea725592..754b935cfd 100644 --- a/src/stubs/spinbutt.cpp +++ b/src/stubs/spinbutt.cpp @@ -15,9 +15,7 @@ #include "wx/spinbutt.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) -#endif wxSpinButton::wxSpinButton() { diff --git a/src/stubs/statbmp.cpp b/src/stubs/statbmp.cpp index a67c558465..115d5cc999 100644 --- a/src/stubs/statbmp.cpp +++ b/src/stubs/statbmp.cpp @@ -15,9 +15,7 @@ #include "wx/statbmp.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) -#endif /* * wxStaticBitmap diff --git a/src/stubs/statbox.cpp b/src/stubs/statbox.cpp index b239dc738c..95bfc3b2c4 100644 --- a/src/stubs/statbox.cpp +++ b/src/stubs/statbox.cpp @@ -15,14 +15,12 @@ #include "wx/statbox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) BEGIN_EVENT_TABLE(wxStaticBox, wxControl) EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground) END_EVENT_TABLE() -#endif /* * Static box diff --git a/src/stubs/stattext.cpp b/src/stubs/stattext.cpp index 3b19c7184d..9de4821b48 100644 --- a/src/stubs/stattext.cpp +++ b/src/stubs/stattext.cpp @@ -18,9 +18,7 @@ #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) -#endif bool wxStaticText::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/stubs/tabctrl.cpp b/src/stubs/tabctrl.cpp index b3b45a72d1..07aa4a3056 100644 --- a/src/stubs/tabctrl.cpp +++ b/src/stubs/tabctrl.cpp @@ -16,12 +16,10 @@ #include "wx/control.h" #include "wx/tabctrl.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl) BEGIN_EVENT_TABLE(wxTabCtrl, wxControl) END_EVENT_TABLE() -#endif wxTabCtrl::wxTabCtrl() { diff --git a/src/stubs/textctrl.cpp b/src/stubs/textctrl.cpp index 720e6082be..cb3d68aad0 100644 --- a/src/stubs/textctrl.cpp +++ b/src/stubs/textctrl.cpp @@ -30,7 +30,6 @@ #endif #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) @@ -47,7 +46,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo) EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) END_EVENT_TABLE() -#endif // Text item wxTextCtrl::wxTextCtrl() diff --git a/src/stubs/timer.cpp b/src/stubs/timer.cpp index 5262040cf6..d845d50108 100644 --- a/src/stubs/timer.cpp +++ b/src/stubs/timer.cpp @@ -15,9 +15,7 @@ #include "wx/timer.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -#endif wxTimer::wxTimer() { diff --git a/src/stubs/toolbar.cpp b/src/stubs/toolbar.cpp index 3cb859e366..b83ce5e0e8 100644 --- a/src/stubs/toolbar.cpp +++ b/src/stubs/toolbar.cpp @@ -16,12 +16,10 @@ #include "wx/wx.h" #include "wx/toolbar.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) END_EVENT_TABLE() -#endif wxToolBar::wxToolBar() { diff --git a/src/stubs/treectrl.cpp b/src/stubs/treectrl.cpp index 137a885dbf..3aea32e970 100644 --- a/src/stubs/treectrl.cpp +++ b/src/stubs/treectrl.cpp @@ -16,11 +16,9 @@ #include "wx/stubs/textctrl.h" #include "wx/stubs/treectrl.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject) -#endif wxTreeCtrl::wxTreeCtrl() { diff --git a/src/stubs/window.cpp b/src/stubs/window.cpp index 6970db0614..0eeda07dfc 100644 --- a/src/stubs/window.cpp +++ b/src/stubs/window.cpp @@ -39,7 +39,6 @@ extern wxList wxPendingDelete; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler) BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) @@ -52,7 +51,6 @@ BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) EVT_IDLE(wxWindow::OnIdle) END_EVENT_TABLE() -#endif // Constructor diff --git a/utils/wxMMedia2/lib/cdbase.cpp b/utils/wxMMedia2/lib/cdbase.cpp index 0f570e2eba..0bbda32bd7 100644 --- a/utils/wxMMedia2/lib/cdbase.cpp +++ b/utils/wxMMedia2/lib/cdbase.cpp @@ -17,9 +17,7 @@ #pragma hdrstop #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxCDAudio, wxObject) -#endif wxCDtime wxCDAudio::CDtoc::GetTrackTime(wxUint8 track) const { diff --git a/utils/wxMMedia2/lib/cdunix.cpp b/utils/wxMMedia2/lib/cdunix.cpp index 73563d8182..d17148a23a 100644 --- a/utils/wxMMedia2/lib/cdunix.cpp +++ b/utils/wxMMedia2/lib/cdunix.cpp @@ -33,9 +33,7 @@ #include "cdbase.h" #include "cdunix.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCDAudioLinux, wxCDAudio) -#endif wxCDAudioLinux::wxCDAudioLinux() : wxCDAudio(), m_fd(-1) diff --git a/utils/wxMMedia2/lib/vidbase.cpp b/utils/wxMMedia2/lib/vidbase.cpp index 6e0b1d9de5..955687ea93 100644 --- a/utils/wxMMedia2/lib/vidbase.cpp +++ b/utils/wxMMedia2/lib/vidbase.cpp @@ -24,10 +24,8 @@ #pragma hdrstop #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxVideoBaseDriver, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxVideoOutput, wxWindow) -#endif wxVideoOutput::wxVideoOutput() : wxWindow() diff --git a/utils/wxMMedia2/lib/vidxanm.cpp b/utils/wxMMedia2/lib/vidxanm.cpp index 2dff4c3c68..522fad34b2 100644 --- a/utils/wxMMedia2/lib/vidxanm.cpp +++ b/utils/wxMMedia2/lib/vidxanm.cpp @@ -31,9 +31,7 @@ #include "vidbase.h" #include "vidxanm.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxVideoXANIM, wxVideoBaseDriver) -#endif wxVideoXANIM::wxVideoXANIM() : wxVideoBaseDriver()