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 045ff855563939604da7eddafbc42da3e97e7683..04cd0ccdb214a382263aecb7ab56d88c817e5427 100644 (file)
--- 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 47a054d20a83e62114bd7bc4b3168620cab95e67..4d506347eb83203a7e849f07c84db3d842409a4c 100644 (file)
--- 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 cdf0153e1b56685672a4ea5b2f98b4b229f30c77..5f8f8967915fe81ecfd6603ab825a7ad53e6ab82 100644 (file)
--- 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 795bbef44856bbc83d6004b09c21da7a95bf9c79..4b157d7e99d4525b4ce454ad0880a8a7a78edabe 100644 (file)
--- 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 88d201fa0311b95bf010c9161f2d205b32a2b5c8..e5b536b0a6d4c1e0c428350f25dfa0fbbb65770c 100644 (file)
--- 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 0ff2dfda365c6dbfbba6c0228912bd9ef37f7e43..70e4e9a688e42d2508bbb2409724407362e59bc2 100644 (file)
--- 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 6556626804785063c7b2eaba1db51a1bfc709797..eb97decf646bec28459a2323d84abcbca0c80eb8 100644 (file)
--- 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 330f4b990a33f9589189a48cfc66fb76abfcfe70..fbee85aceb619cce06625fec8cb3dbbfb793509e 100644 (file)
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -29,9 +29,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#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 da1d222c58a97a462d906adc587b43063b86ada5..94d808ac5b11aea9a6814247fb642e56830bcd12 100644 (file)
--- 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 bd5f2cad8f109b0026d09fdd3c22214a5b806b9b..26820e2f02a81f9acc36edd896ce2bc7447a28c8 100644 (file)
--- 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 36483f8172f8d188c92aedd6b115140fee23b185..556802bfadb61a52f7963b0881be9767cc895c0d 100644 (file)
--- 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 5931d63cb168c253cc871c3b70ee8b25ab040109..1eaadf02e212d71bc4d5dab7861ecce5548790b2 100644 (file)
--- 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 76d8c725940702b99f9627b9aa0d19ca1d49bd63..5bbe4ec0f8244ebfcd36a09055f52ba7b44da756 100644 (file)
--- 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 779d6cd4981005b3bafe3f2021233d800a4b0dcb..245f8d911c5b944edb48d88f0a1748c1907aae22 100644 (file)
--- 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 97e07ac067d351b0cf8ac9f59980d1dbc69bd99d..93d35028709696c1e1246ab992fcd73f68955bf4 100644 (file)
--- 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 3673027389e3fa7af114452e39689b19ea2a19f3..6a71a8c263383aecf003037b487399a89daab170 100644 (file)
--- 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 700ea8d0b6dfbf0765161fd8bdbef8371f39b674..3c34cbc82236a10ee4bfc8df87531ec1fe943e29 100644 (file)
--- 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 ab692dec262e0c54234e040b74b3c41840c193da..ed5b06bc76bbca8c01d7b764d5d68b25451a21f1 100644 (file)
--- 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 717eb20c60994b5e01be3ff03e9b3fb8cc63bf33..5ec21ae5741f746c497490253b71410ac9edd69e 100644 (file)
--- 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 188d4c6d8f5076d1f783809490aacd815a17d310..678e8bd1c135c63c54879d6da6d8e7ad902c357b 100644 (file)
--- 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 41fce11f1682a4b1023a3a8e3986f95468a6085e..0dadb599746f2cb0607aa5ae623bd1554ff11199 100644 (file)
--- 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 103fdda8afd42ec29b96d1b119d28743d9213115..bdf71719d7dd81adf4de93523c338b547bc29148 100644 (file)
--- 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 b2c77b66af66cab8756301e58c984889d092f86d..37dff8558d99e736f2bf06a307f082cfff3b8dfd 100644 (file)
--- 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 7966f5479b11d324b6c95ab4cdde78c68d2b9762..8ca74fb4d8881fc7c1008268b612ee82e3a6e0e3 100644 (file)
--- 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 64939970e69828cf3d18d7a190911f0d2ac9f769..eab8724ef458e123747f766ea5b1760a1b28a810 100644 (file)
--- 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 e070a680b4e8514dcd9ba0be1c96aefab3967cf9..22337514a117afe37464fba98afffa642123714b 100644 (file)
--- 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 fbfea8ce3b91702a965eedcca069ebe59d180cb1..75a6079af4a3a9205aebe802ae04cf9c5747673d 100644 (file)
--- 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 f5ddc187ea3210309a22e22dca672b9af89ac143..220f95294c0a6948d73efb3b2a2167016d78cfef 100644 (file)
--- 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 fa5863aa2c008b80ffc5c4a3b83fd834a0ba2f3a..b9e286ffbfbb4303041776f5fdf64451c2811d53 100644 (file)
--- 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 85388cf0d77d3fe98012a4848bd71b23463ee4ea..5bc0943b9e6d0807b88d0c292d64d2a7e7edf56c 100644 (file)
--- 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 608ccd38d415cf20adbbf3d29603c059c06f1865..795fc131dde877b4e7150742be94c9fc806db097 100644 (file)
--- 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 615d76c560c73209cf5d2637db44c8ed81c987bf..2f855b19a83cd4ef6747ef3e34cdc6329635a9ab 100644 (file)
--- 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 662c6aa4f806a9fc9d7631490274d26dd6d183b6..db6caf0cf28bd96238b379613393486aec395981 100644 (file)
--- 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 1e358e4a09c2c1cee39b4e75db838071e4014b3e..ee697899ea914397d486642a93f095601875dc9d 100644 (file)
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -45,9 +45,7 @@ seconds since January 1, 1901, GMT.
 
 #include <string.h>
 
-#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 71cae1f2f733eedc9d8b80c078edbdd9488b2787..8c680f6905fda10fb88bbaff181d34a40a3bbfe4 100644 (file)
--- 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 44e0caeeceb8adf77fb44313e5b66df57d1519aa..92848841c4f50696811652538d249ab4a8d78d04 100644 (file)
--- 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 9fdf5b77e78ad45f3bcb9be8e82da1bacd7be1bf..2d6bbca2f47fe88680d084d21d8b8cd414190e8d 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -40,13 +40,11 @@
     #include <clib.h>
 #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 9db80bb02826b8df2945548dc283a1218eba7636..bbfce13288cc298d55857de745e34f7beca7c516 100644 (file)
--- 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 a0636f159b306fa91aeecbf263c0785c3074f1ca..4e6b969ccc1daa5cae15e17d6cce9b83c56d381a 100644 (file)
--- 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 4d86072e80644c45a9ed16dcdcbe9d607a58d9a8..4049e421fe53cdee0290e76fec8b989666d45d9f 100644 (file)
--- 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 4810b320783863be264105436ebc9b6b47e41896..cdba095cf4b166f62c3ed186843535a310f6c34a 100644 (file)
--- 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 d86581761ff274d6af187378e47f20454b44c2d8..d5b8014cbf0cbea56b78be50c6c74781298734b4 100644 (file)
--- 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 494e6e104ff9e9a5fd25c442fd7f49195bf85090..a7c96f96672a7095513628e31b7afae0b823bc43 100644 (file)
--- 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 26bec27921ca8ad4af0c9b1f64a2aaf24b73b116..532fc03bcf2633cde92c82127efbefa28b8e2e72 100644 (file)
--- 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 19aefb7c06d7f0a4e25d7f8b1f6216f30a626c95..1fea61eafe63cc149a36ae301b63f220ff4790c4 100644 (file)
--- 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 89dca447937f2a5bd914f081c200561093e1cde7..926f404c0e853b095ca4961997a1e5442c69b3f5 100644 (file)
--- 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 38d4b13ee3901b7cf37bebf8c3e7f37bf51d607a..9ac21f6245eac7a1534207f5204cd8b0d2ea97e0 100644 (file)
--- 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 bab3bf9a56ceaed024c387a8e59a0201100ce9f8..0e994766b9cb1e8daa4ff739786754f5209b0dc6 100644 (file)
--- 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 e3fec631d5c800d982b747f3c20058f66d4d89bd..2458e8729aa5ffa93db0b13fad3e0f8e900b9c6b 100644 (file)
--- 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 46f42696d98a7d58f1abe2e1641cf3365eef3346..812b9a7e8c1158b02890c5e243f715b83802f084 100644 (file)
--- 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 ce5219a7132175768129330052b23552e51b0e76..5f4aac2abe4b18e25aaf50f11df2f1f0a04e5b6e 100644 (file)
--- 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 50d44cedd8aaf1deac77fe15be83a39fc67125bb..a582eb959f8faea70a28ef0a8d8956ddf68271f9 100644 (file)
--- 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 874a63621d7894d0e7cbf298e7cd4a09b51f7224..7070960e1e047667d7fdef8a01bd8d618b048fb4 100644 (file)
--- 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 98dc359b260f7c2f59ec70d14f740dcdc3c56251..73919d52ac5fba383952cea4d11f667989a59e23 100644 (file)
--- 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 40ca7ba6a348d304586ddd54f4ede83296d668d4..cee822d7afd75f0adafd4e3e2b28eebb8ce2dfb3 100644 (file)
--- 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 fe9fc047c7dcff90632ceb1f08062504a894260f..64f5b61dfa1132f475d2c2f819ed03e02549119f 100644 (file)
--- 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 771e96b078c412d3ccd76f16f3d1210ed0226bc9..0b0799b56ba738279776eb5e060cb247ef8637b3 100644 (file)
--- 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 fe9fc047c7dcff90632ceb1f08062504a894260f..64f5b61dfa1132f475d2c2f819ed03e02549119f 100644 (file)
--- 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 771e96b078c412d3ccd76f16f3d1210ed0226bc9..0b0799b56ba738279776eb5e060cb247ef8637b3 100644 (file)
--- 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 b0b8734d55b0d9702e88b40033d0e8bdb876d48b..f8796e111a18c8818e43fc86349a269e76f7f7cc 100644 (file)
--- 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 e85f293e1ce3f6f001cb87ccbc08da0285c9af1c..d5bb4c82d188b089dd992d65a076b4d0473353c1 100644 (file)
--- 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 3a66121d493152449872e4bf661e882abaad6552..d14b15ba7f3c7d936210fe0ef8e8339b1284cce5 100644 (file)
--- 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 <PictUtils.h>
 

diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp
index fecc971add528926cde9e4fb8ae8b4cbf2407c40..7c8d8d5b31e9147541e731f85a62f0dfbcfda516 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/brush.cpp b/src/mac/brush.cpp
index cb9d76d1ab28ca05b8bc687c4d0080cabc5feb5c..7ba6dfc99063c4114ad0a246184f4c896fb2c394 100644 (file)
--- 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 c2fad066737765aa9bc4fca095c13e22cbb0ad15..849aeee0e3addf5bcb96144244b0459e5258e2a2 100644 (file)
--- 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 <wx/mac/uma.h>
 // Button

diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp
index b0b8734d55b0d9702e88b40033d0e8bdb876d48b..f8796e111a18c8818e43fc86349a269e76f7f7cc 100644 (file)
--- 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 e85f293e1ce3f6f001cb87ccbc08da0285c9af1c..d5bb4c82d188b089dd992d65a076b4d0473353c1 100644 (file)
--- 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 3a66121d493152449872e4bf661e882abaad6552..d14b15ba7f3c7d936210fe0ef8e8339b1284cce5 100644 (file)
--- 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 <PictUtils.h>
 

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index fecc971add528926cde9e4fb8ae8b4cbf2407c40..7c8d8d5b31e9147541e731f85a62f0dfbcfda516 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index cb9d76d1ab28ca05b8bc687c4d0080cabc5feb5c..7ba6dfc99063c4114ad0a246184f4c896fb2c394 100644 (file)
--- 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 c2fad066737765aa9bc4fca095c13e22cbb0ad15..849aeee0e3addf5bcb96144244b0459e5258e2a2 100644 (file)
--- 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 <wx/mac/uma.h>
 // Button

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index ca99c4b778bbfe036bad4482e3ca4f1a4ade410d..aa589bd32db9d517554e6c59f95c79e9f9bbe3e3 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 2f43152c2a1ceae6beb1ea7bd062f1ce918100d2..7387e3e4719c555bb3ecfe8271e469c978185811 100644 (file)
--- 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 42c52012b2f3e7dd017a4096b6b4d02c274e23a2..301b0731a84a8cbfc4e89cfa551c17678d70274c 100644 (file)
--- 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 c6037a9f964eb9959db27a0dc3f02957e76028e4..e91938f8ad7d402d7e4285767a95d6aa11646d19 100644 (file)
--- 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 cc549b5f1144e11e602a5fad4b94f8132ab95a14..68abfa77bd2bec2d26134546ad9cbb0a76007813 100644 (file)
--- 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 905f3180aa4bc0af8bed2c60774a2725ee19d3e3..d1fd686a8566ec255f14ac730bd162916010a243 100644 (file)
--- 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 037d95784fd494f9aa25cabd3953a27c1af8678a..5065b239e9dd15a792c6d9ebe6432b4b1fd74110 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index bcbe30008b84c592cd30444e29edbee1092d5c05..dee7c92b5f128a56414063d82a3aa8ce27d7c8f1 100644 (file)
--- 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 e7b0e503fa3668b2e75d45851a5794e8b9f76edd..0043d823fb3b8a3669e995e309da2d8c7006225a 100644 (file)
--- 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 b4155b572dd7d7439d34543614805206476e5d39..12100b81cdef2320b31f5b789f8db2b4825eac2a 100644 (file)
--- 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 2b0bf64c5051766ae0808e7f7f7843493235f19a..449f44e2060e3205e4f7c729e25675d028c4d35d 100644 (file)
--- 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 1ea12f3d29c45024a2ef8e5d73f94163ebfbf70c..1d802afba448d938bd239e659616e413a051eba8 100644 (file)
--- 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 d0068bc4516506fb96484f2aa1310485957b888f..d75706f6a3594dcc43354f4efa09bff5ca0a9384 100644 (file)
--- 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 edfc211caa05465c25cd36acde69e55c778c1d88..344b8b32b93e6e9a1691f257393f263bd27213ae 100644 (file)
--- 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 66de687b80b6f5ebeffc3376fec4455d6d4aa5b5..ee50e2e6bd98a197d2fc6bc1ca25d54ae33fbc73 100644 (file)
--- 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 988d1c81e2369c6ecedbd85d522e1eb094e48c83..a5df9049a20fa3b8ea2d01e50130f4fd920d1a42 100644 (file)
--- 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 d775c24c169eeefdea89bd141b3df424f2226783..9a0843d64bc0aba3ca60e6ea408328178ee18bfd 100644 (file)
--- 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 ba1377151f40e3185e51fe84282bbaf4ad580c0d..cded59c604887d003c26c948ada38447adf10940 100644 (file)
--- 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 7dc3b5e8133e9435f0faec3340983159249815ed..be0d0d0a3c904d1983126b5abc2aa3339f81f55a 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/carbon/gdiobj.cpp b/src/mac/carbon/gdiobj.cpp
index 63697c835427fdea399f1bf61d3a3b046d4af9c9..46b1aa871fc57fd8ed02bd1ad813ad4655bfb5bd 100644 (file)
--- 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 086762c6462598ee2843740606907910b37c451e..b7f0babfa212b608402e9a04bf273570e904b878 100644 (file)
--- a/src/mac/carbon/helpxxxx.cpp
+++ b/src/mac/carbon/helpxxxx.cpp
@@ -17,9 +17,7 @@
 
 #include <string.h>
 
-#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 537165343e72e87a96ec2bf6ac7b8bbd81daf955..2fb0616ba868dd7be6f3d61460c6c464f2489fed 100644 (file)
--- 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 4cb47b4e693ba6a9a223ded7a417fd4336e80087..cb4b9ff01c4da817ba0904b0416fcaf1b6a7782e 100644 (file)
--- 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 19b16e5fe79502249bd82cb45877222d63b6160f..ae89e0bcab84e46b6af8bed6c3e8c37e3edbc1af 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/carbon/listctrl.cpp b/src/mac/carbon/listctrl.cpp
index d1d844565201ff29c49e1f4de52ee49ec1495579..2c11981bf2621628487b9d2ef9283c4895f9bb4d 100644 (file)
--- 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 598f62c3f5470f3921db8c9066b6b183a2ee93d4..8672b2f8973cd7e74390e3fe7863f4a06dde6737 100644 (file)
--- 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 f288bc80e1b610856ffa0c19e0295656a4fe984e..b52790b67d5df2d952388f1a470e8e8edc17a0af 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -33,10 +33,8 @@
 // ----------------------
 #include <string.h>
 
-#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 fc8d7885af51fb8293192dae9967b1be127c1423..83ae7e0d8403b9d23a81072a71e1a0af3a10a100 100644 (file)
--- 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 97e31948bf9db3a05d19b4190b481f2cec35de83..5742ba4ce62e1148ccf4f8e04818a9df9c898d65 100644 (file)
--- 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 4f6f5e5fcbb6005644fb9f5e23ed542f19fb71f9..cbe09b7d812883ed928eef6dc9cb3744e6caeda2 100644 (file)
--- 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 5aa8554038e4959c5e492e2f80a5c1c413f5f1ec..f19da7bb4f12ee6fb0c10b4e5d168cc8bfdb593e 100644 (file)
--- 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 a4f93917eb93c6a26ecb3eae157a7d41bcbc9093..3cb269c3cce1d5054d3974f186c7cf8b7af40c1d 100644 (file)
--- 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 85a9fd16d8346f140ac9127f71b2217f94747e27..676f54739aa1b8b2be49a6e394ad455461566535 100644 (file)
--- 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 1e3ced2a3a484c777157da7da10c70737831a760..2502b392fb674055cd560cb4061ea3757a91bb11 100644 (file)
--- 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 5f914ddbfd90632dd3091071bfd7831794f984a0..a1f8f6b196b18553f4bd2bd2d6f18399588c1072 100644 (file)
--- 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 4b84cc1a1ef5561ff5eb8cd29c35297bec7016cd..0d4862cfa241c17ab35c59b818c7356f89de8d24 100644 (file)
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -35,10 +35,8 @@
 
 #include <stdlib.h>
 
-#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 492c93133afb9bd2161adb2700fca191d66fd8c4..70da0df49cf3d86360985c4ff1275e96f3697a6b 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -20,9 +20,7 @@
 #include "wx/radiobox.h"
 #include <wx/mac/uma.h>
 
-#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 0c712b61f9e9072b2dc10689b15e2a327496c448..a2fc26d840dc5b1e6be46b6dff01b3215570870e 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/carbon/region.cpp b/src/mac/carbon/region.cpp
index c5c6332e06fbd1c45a0f00372d4a252a2f3aadce..5c01ddd438b31c848d782db2e7d34e2c1d59fcc2 100644 (file)
--- 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 92d6dd1fafe7b9b1f1c27a2b6774ab810d21420f..2db4a175bb25a42339c81534f792deb339ef20f5 100644 (file)
--- 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 936ccddb477dfede68c3a6e1bb809583925c08cf..9218d560bb8dbe1d6d4e2d679d28f9ad80dd4966 100644 (file)
--- 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 f48ad3de9e965fd4c4691100a110c3d7857cf32e..5ec5e1b8a2ac19cce1e5f426c08a8259bf042395 100644 (file)
--- 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 86a8528929d10ae721c5025b8d0d48a35a22e8e8..8bd5fecb71b2a5853109deb3c8512a27e11a8859 100644 (file)
--- 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 abae14d07e2a1a03c8cb029640840d84b34e82d5..ea7ca9dfbbad0aec9a119692f7e34d4e5693b794 100644 (file)
--- 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 54f6eb4e58206d3ffe3b6bf1698884d7c813560d..ec4de7cc317e0181c8c54dcc303c3a4de8b246a9 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -18,9 +18,7 @@
 
 #include <stdio.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
 
 #include <wx/mac/uma.h>
 

diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp
index ea057aae520a2607ca18ac0ac57a9d7b6415f995..ed13c3ac8aa2a0ef896c7e9ac9566288c2616127 100644 (file)
--- 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 21648fc476ed1444f6a18f2602857e2fd3d84089..c1b98861b03d6f1c41cdfb7833064da1af5a547c 100644 (file)
--- 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 5262040cf6dc4e5fb091ed200b32b5a9f385164b..d845d50108efea892a4dff22c4d4c0e09344fb30 100644 (file)
--- 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 56654a1af61f09775494a23db3f187caaf7b6dbe..81d3711a54b19b055026db5952bb9c4f58dbd785 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/carbon/treectrl.cpp b/src/mac/carbon/treectrl.cpp
index 137a885dbfa7e32c9096f78376146fda7cffaf68..3aea32e970e95e791b783448a9c81f198ab64193 100644 (file)
--- 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 ed8396c774fee8dc55a7fc6cabb70cefab2cd86c..cae38465c2c7b09522f9a1beb88497958f450b8d 100644 (file)
--- 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 ca99c4b778bbfe036bad4482e3ca4f1a4ade410d..aa589bd32db9d517554e6c59f95c79e9f9bbe3e3 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/checklst.cpp b/src/mac/checklst.cpp
index 2f43152c2a1ceae6beb1ea7bd062f1ce918100d2..7387e3e4719c555bb3ecfe8271e469c978185811 100644 (file)
--- 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 42c52012b2f3e7dd017a4096b6b4d02c274e23a2..301b0731a84a8cbfc4e89cfa551c17678d70274c 100644 (file)
--- 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 c6037a9f964eb9959db27a0dc3f02957e76028e4..e91938f8ad7d402d7e4285767a95d6aa11646d19 100644 (file)
--- 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 cc549b5f1144e11e602a5fad4b94f8132ab95a14..68abfa77bd2bec2d26134546ad9cbb0a76007813 100644 (file)
--- 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 905f3180aa4bc0af8bed2c60774a2725ee19d3e3..d1fd686a8566ec255f14ac730bd162916010a243 100644 (file)
--- 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 037d95784fd494f9aa25cabd3953a27c1af8678a..5065b239e9dd15a792c6d9ebe6432b4b1fd74110 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/cursor.cpp b/src/mac/cursor.cpp
index bcbe30008b84c592cd30444e29edbee1092d5c05..dee7c92b5f128a56414063d82a3aa8ce27d7c8f1 100644 (file)
--- 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 e7b0e503fa3668b2e75d45851a5794e8b9f76edd..0043d823fb3b8a3669e995e309da2d8c7006225a 100644 (file)
--- 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 b4155b572dd7d7439d34543614805206476e5d39..12100b81cdef2320b31f5b789f8db2b4825eac2a 100644 (file)
--- 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 2b0bf64c5051766ae0808e7f7f7843493235f19a..449f44e2060e3205e4f7c729e25675d028c4d35d 100644 (file)
--- 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 1ea12f3d29c45024a2ef8e5d73f94163ebfbf70c..1d802afba448d938bd239e659616e413a051eba8 100644 (file)
--- 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 d0068bc4516506fb96484f2aa1310485957b888f..d75706f6a3594dcc43354f4efa09bff5ca0a9384 100644 (file)
--- 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 edfc211caa05465c25cd36acde69e55c778c1d88..344b8b32b93e6e9a1691f257393f263bd27213ae 100644 (file)
--- 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 66de687b80b6f5ebeffc3376fec4455d6d4aa5b5..ee50e2e6bd98a197d2fc6bc1ca25d54ae33fbc73 100644 (file)
--- 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 988d1c81e2369c6ecedbd85d522e1eb094e48c83..a5df9049a20fa3b8ea2d01e50130f4fd920d1a42 100644 (file)
--- 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 d775c24c169eeefdea89bd141b3df424f2226783..9a0843d64bc0aba3ca60e6ea408328178ee18bfd 100644 (file)
--- 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 ba1377151f40e3185e51fe84282bbaf4ad580c0d..cded59c604887d003c26c948ada38447adf10940 100644 (file)
--- 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 7dc3b5e8133e9435f0faec3340983159249815ed..be0d0d0a3c904d1983126b5abc2aa3339f81f55a 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/gdiobj.cpp b/src/mac/gdiobj.cpp
index 63697c835427fdea399f1bf61d3a3b046d4af9c9..46b1aa871fc57fd8ed02bd1ad813ad4655bfb5bd 100644 (file)
--- 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 086762c6462598ee2843740606907910b37c451e..b7f0babfa212b608402e9a04bf273570e904b878 100644 (file)
--- a/src/mac/helpxxxx.cpp
+++ b/src/mac/helpxxxx.cpp
@@ -17,9 +17,7 @@
 
 #include <string.h>
 
-#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 537165343e72e87a96ec2bf6ac7b8bbd81daf955..2fb0616ba868dd7be6f3d61460c6c464f2489fed 100644 (file)
--- 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 4cb47b4e693ba6a9a223ded7a417fd4336e80087..cb4b9ff01c4da817ba0904b0416fcaf1b6a7782e 100644 (file)
--- 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 19b16e5fe79502249bd82cb45877222d63b6160f..ae89e0bcab84e46b6af8bed6c3e8c37e3edbc1af 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/listctrl.cpp b/src/mac/listctrl.cpp
index d1d844565201ff29c49e1f4de52ee49ec1495579..2c11981bf2621628487b9d2ef9283c4895f9bb4d 100644 (file)
--- 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 598f62c3f5470f3921db8c9066b6b183a2ee93d4..8672b2f8973cd7e74390e3fe7863f4a06dde6737 100644 (file)
--- 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 f288bc80e1b610856ffa0c19e0295656a4fe984e..b52790b67d5df2d952388f1a470e8e8edc17a0af 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -33,10 +33,8 @@
 // ----------------------
 #include <string.h>
 
-#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 fc8d7885af51fb8293192dae9967b1be127c1423..83ae7e0d8403b9d23a81072a71e1a0af3a10a100 100644 (file)
--- 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 97e31948bf9db3a05d19b4190b481f2cec35de83..5742ba4ce62e1148ccf4f8e04818a9df9c898d65 100644 (file)
--- 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 4f6f5e5fcbb6005644fb9f5e23ed542f19fb71f9..cbe09b7d812883ed928eef6dc9cb3744e6caeda2 100644 (file)
--- 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 5aa8554038e4959c5e492e2f80a5c1c413f5f1ec..f19da7bb4f12ee6fb0c10b4e5d168cc8bfdb593e 100644 (file)
--- 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 a4f93917eb93c6a26ecb3eae157a7d41bcbc9093..3cb269c3cce1d5054d3974f186c7cf8b7af40c1d 100644 (file)
--- 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 85a9fd16d8346f140ac9127f71b2217f94747e27..676f54739aa1b8b2be49a6e394ad455461566535 100644 (file)
--- 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 1e3ced2a3a484c777157da7da10c70737831a760..2502b392fb674055cd560cb4061ea3757a91bb11 100644 (file)
--- 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 5f914ddbfd90632dd3091071bfd7831794f984a0..a1f8f6b196b18553f4bd2bd2d6f18399588c1072 100644 (file)
--- 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 4b84cc1a1ef5561ff5eb8cd29c35297bec7016cd..0d4862cfa241c17ab35c59b818c7356f89de8d24 100644 (file)
--- a/src/mac/printmac.cpp
+++ b/src/mac/printmac.cpp
@@ -35,10 +35,8 @@
 
 #include <stdlib.h>
 
-#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 492c93133afb9bd2161adb2700fca191d66fd8c4..70da0df49cf3d86360985c4ff1275e96f3697a6b 100644 (file)
--- a/src/mac/radiobox.cpp
+++ b/src/mac/radiobox.cpp
@@ -20,9 +20,7 @@
 #include "wx/radiobox.h"
 #include <wx/mac/uma.h>
 
-#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 0c712b61f9e9072b2dc10689b15e2a327496c448..a2fc26d840dc5b1e6be46b6dff01b3215570870e 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/region.cpp b/src/mac/region.cpp
index c5c6332e06fbd1c45a0f00372d4a252a2f3aadce..5c01ddd438b31c848d782db2e7d34e2c1d59fcc2 100644 (file)
--- 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 92d6dd1fafe7b9b1f1c27a2b6774ab810d21420f..2db4a175bb25a42339c81534f792deb339ef20f5 100644 (file)
--- 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 936ccddb477dfede68c3a6e1bb809583925c08cf..9218d560bb8dbe1d6d4e2d679d28f9ad80dd4966 100644 (file)
--- 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 f48ad3de9e965fd4c4691100a110c3d7857cf32e..5ec5e1b8a2ac19cce1e5f426c08a8259bf042395 100644 (file)
--- 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 86a8528929d10ae721c5025b8d0d48a35a22e8e8..8bd5fecb71b2a5853109deb3c8512a27e11a8859 100644 (file)
--- 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 abae14d07e2a1a03c8cb029640840d84b34e82d5..ea7ca9dfbbad0aec9a119692f7e34d4e5693b794 100644 (file)
--- 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 54f6eb4e58206d3ffe3b6bf1698884d7c813560d..ec4de7cc317e0181c8c54dcc303c3a4de8b246a9 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -18,9 +18,7 @@
 
 #include <stdio.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
 
 #include <wx/mac/uma.h>
 

diff --git a/src/mac/tabctrl.cpp b/src/mac/tabctrl.cpp
index ea057aae520a2607ca18ac0ac57a9d7b6415f995..ed13c3ac8aa2a0ef896c7e9ac9566288c2616127 100644 (file)
--- 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 21648fc476ed1444f6a18f2602857e2fd3d84089..c1b98861b03d6f1c41cdfb7833064da1af5a547c 100644 (file)
--- 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 5262040cf6dc4e5fb091ed200b32b5a9f385164b..d845d50108efea892a4dff22c4d4c0e09344fb30 100644 (file)
--- 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 56654a1af61f09775494a23db3f187caaf7b6dbe..81d3711a54b19b055026db5952bb9c4f58dbd785 100644 (file)
--- 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 <wx/mac/uma.h>
 

diff --git a/src/mac/treectrl.cpp b/src/mac/treectrl.cpp
index 137a885dbfa7e32c9096f78376146fda7cffaf68..3aea32e970e95e791b783448a9c81f198ab64193 100644 (file)
--- 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 ed8396c774fee8dc55a7fc6cabb70cefab2cd86c..cae38465c2c7b09522f9a1beb88497958f450b8d 100644 (file)
--- 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 1a24c747b202352e97c8d69db4c7b02ba8112a81..d90a47b95863a50650286ef580c7ca34b9aee979 100644 (file)
--- a/src/motif/accel.cpp
+++ b/src/motif/accel.cpp
@@ -19,9 +19,7 @@
 #include "wx/utils.h"
 #include <ctype.h>
 
-#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 9339363f0fe77e7c298c1931cd8cce94064fe548..916c8b9419177615336d41028f166071c45b53f2 100644 (file)
--- 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 c7fb9ee8e8ada3b01203989bb86987b45272e86b..90c225d8ae23099114f8d46f511340ecaaf82d91 100644 (file)
--- a/src/motif/bitmap.cpp
+++ b/src/motif/bitmap.cpp
@@ -37,10 +37,8 @@
     #include <X11/xpm.h>
 #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 29f0d9ae28b4df66aadce7398fcb2400c0c04407..8abd0e2167abd531796a453fd76ad7e1f7926853 100644 (file)
--- 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 1b8069646b40086e797e76d2674872a220d0869a..a09564e95554a96fa63f7d15e5bd0a6edf5d9423 100644 (file)
--- 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 6953b76006d509e5913d267a78c5ec8aebe5c5a3..95f4f5b009cd459b75795162965af1735698c011 100644 (file)
--- 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 d528c697f9f4dc5ab6e8de99a96498627e590d24..ac259ac03a9c37119db56b598f02ab3ca839cbe6 100644 (file)
--- 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 7da541fa9a3126cf0a97fe7b6fafce535772240a..b609661ac9d71b86f258f8c73985a947100fe65f 100644 (file)
--- 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 baf409f0df9be0db410f096acea90ed61fae7109..45a24308472a5f420b16711e0bb68a7c44c36e2a 100644 (file)
--- 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 cc6c5e21b380aea3f0f879e62a0fd51f3a6d75a3..41afb324d308b393539aa8c0419f494b445858d6 100644 (file)
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -37,10 +37,8 @@
 
 #include <string.h>
 
-#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 9326ffd42b32476349d79db13e53ae65494b1e56..b62041652d187c9e52188357317eff947f4089bf 100644 (file)
--- 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 94063c0cfc7258c6471d34da411651571580b1f8..bd112d6a4ae17fefedbbb8d16f798dc970f0b960 100644 (file)
--- 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 098ed1b0cbae088f7d17863b209d52e04b066e52..67943244285895acc4e1818e0432b7235cadbe06 100644 (file)
--- 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 d93439940da41718d51b752bede556a45dfa03e9..423c53e5804742cba120ccd3c55956570f3a8ee9 100644 (file)
--- 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 8df07639c2c97ebac9b30ce0f491a0de26a60cc7..24ce2516a07ba91ac5d28449f00b28a113dde5a5 100644 (file)
--- 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 cba31c0c30b073872e7b765afc6feeeaf898bca2..cc5c5359a40be7d4cef5683d2b29c5bc72abf11f 100644 (file)
--- 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 a488d9466aa8fde55cea1742ece28704b6c17b62..aa4970ddef22ca0047b9d715959595fba7a30434 100644 (file)
--- 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 9686ee49b6d6fd2a692312f1a75a1e7032a5e4b7..1b0597df23a1a5608bcd467fe710ada2ba3cc1a0 100644 (file)
--- 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 2b19f814995d7b65f9c673611c65f2e4bd9a1287..a9a097e096deec8e72bb38942e44a7ab78b6c341 100644 (file)
--- 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 56828d883f65302842182c9fbacca8bad51661e6..9fc854de053743ce272bcd7406c27c352f33514a 100644 (file)
--- 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 101def7118c368344b5e9200e3e0766e1232e075..f01b0fbb19ea54202c4d6a93c45051afe06fb88d 100644 (file)
--- 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 f7df581fb66615fd5038db918fd61676aa430feb..e112ff2d26c1d31e077ea44168b8970c97e9bde3 100644 (file)
--- 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 f7ebeed9566f7d7e7bcb1c0ca2eb1b82acfb8751..3524f77d0e3be8831ba0d2cb1d5fefac212531f5 100644 (file)
--- 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 6f3126fefd90aca7a8c1f5525f9b9a6f23025391..54a0466fff14635b2c026e0c7f68cd1ba36beffb 100644 (file)
--- 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 58bb544b9d6c504c9c04d26ad1eb1f9b7caa5e90..b933ec5c8727d7db4426bb19faff70adcc557bb0 100644 (file)
--- 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 adda2bcab1e92aed48a527217f4dde5a4f015932..63613b5727bff812de3d1a3e4894609041ee0df7 100644 (file)
--- 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 439c9acde34318d7960f5afd415ca99b4ce1edb1..0cb9e0f1479a3b2e3497dfdc622b7f07aedb04c1 100644 (file)
--- a/src/motif/helpxxxx.cpp
+++ b/src/motif/helpxxxx.cpp
@@ -17,9 +17,7 @@
 
 #include <string.h>
 
-#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 17e5b111c13263ef642170dd8e9afc23fc920823..fb9802ebfa21d8b886b2dd1c899fb1419f46129b 100644 (file)
--- 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 706ea7297d61a0a594218e04e35168be7c2a6db4..a21d2e62d4a372578e403fa5d8e1184920163fa6 100644 (file)
--- 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 0af310949072f8a378c6ebad5a39e45ec594fc3d..98608e9055fd37a6c4a09bf23764052c92c0121b 100644 (file)
--- 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 192264a201eb840d6ae354b89d200b0cc01d699d..949c95064f32f8a1f160fb9932929d0134a0ab54 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -51,10 +51,8 @@
 // other standard headers
 #include <string.h>
 
-#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 d582065f4780aaee2bd290a6e73a97b38b627bc3..01ed0ccdaa0bb99e6b04e39c505cda7f918409cf 100644 (file)
--- 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 e8c45e00e3e05d7ed9baabd170eebb8c791713e4..e84337aa05c6c9d0d1db8a06ccfd3f01e76c43b6 100644 (file)
--- 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 bf6c50b3503e5a500419dcfd423f197e79150ca2..1161e3de571425436a2a02d641454e1ff1aa5f0a 100644 (file)
--- 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 e33abee8050234d581fa7f62a3238e393f4ba904..90bf77844c2406d1b1228ba59cdf2c70c65c653a 100644 (file)
--- 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 610d5d6c108f3a80fd293cc2721a511ace9c3b13..ef2b2597a6dacf5ddfee089eef663a775cd16a6d 100644 (file)
--- 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 8d0c0a47cf3fd8bfb10c91f579cd1b520e235874..bb5ab6212705c4fa4debd764253f8dccad86abcd 100644 (file)
--- 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 7136ec67a7f0a8a4a9beafb04ab231c2525e28d3..0e94d44e4b9c68e81f8e52133bd3203b59f5d735 100644 (file)
--- 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 2cd62c7578f5d9632198803b9cf79af1f3a8a1ac..0fbaa83a5e0a16f36ad23918e028275b70333406 100644 (file)
--- 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 4c7e3c755e65a36ec1e063452ad29eabac7e4d88..7e14e8d11c451887419efdfcd93d862f7e8c3fc3 100644 (file)
--- 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 1bc220fc30813f88feccecca90f0cf8ac4c804c2..57a0343e3a97067bd2b97a15d80091e47990f35e 100644 (file)
--- 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 0ceefef6b6b0226ea3e68d5213d11c1b60b3f371..a6d1870345fd7916b4f0bd198779a5de5f805478 100644 (file)
--- 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 59edd44bb708b84c0b0acf27345620077f8dcb9a..3fa3e0bfc164890f80376ed980813f89f029566d 100644 (file)
--- 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 2be88d497aa2b3516f1f6cdfb3ab15b141aa071b..ae086ae31962efb492ca6c1a4f96677378b04184 100644 (file)
--- 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 32a9835b81db25d0abf66609442c9443dc615787..9d8c27fd0030838097ea83740b8a6a27b589967c 100644 (file)
--- 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 b13b1cfcde56929ea6c462513c3f514f4dcf2e9f..d0af7ee303c4a1c3b6601c1e23a39bdc9e1e5ca6 100644 (file)
--- 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 e66312abaac9e5df9fb7f7c85cf5a0ad9f5b8f36..537e5f57504100770bc25913834f0f8a3d78fe6c 100644 (file)
--- 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 07216d262a97508729515037a5e113eb19bb8114..c9f33458ede36d9d3066aeee4ba73982c29bca6d 100644 (file)
--- 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 fe48ec22b6de1f8f80273c0d03bff4b2e8b27c15..07bd42afbab746490f163fd2ea0e7807c184ec26 100644 (file)
--- 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 64f94518a66c9cc92848ee5f4c470fd162755643..b28820804c0b41abe66f1815ed8e67fecd32c6f8 100644 (file)
--- 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 727ef5421c792d843214f2ae2326564dacddc7c3..1864a875ef9f360e25f8373b699a5df4fc398f80 100644 (file)
--- 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 d14efb385ddee57e778e9ba43f8104533fa282ff..e310f1bae3b83c7435fd12bab0bf91131ba06932 100644 (file)
--- 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 58f7eeea8ca9dd23a9dc68033ea8178dcfadf4c5..e433443dd3c681badc091cf21d1284ca316aae3e 100644 (file)
--- 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 9c46030706c1d1c2c0cbb1a3b7ff384e596a0c74..c83a623b802c32b8e1aad35a442faffab9620759 100644 (file)
--- 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 7f7aa14f75bd0a673e8aa3d46d5a09878d0d3039..008aa3ec21bceec53a44a3f8b2faaff41147eef1 100644 (file)
--- 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 69906666924d2abb6027e2740c94350d36aa0ebe..22234319d36dddb081069bc52af99a22a38148bd 100644 (file)
--- 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 486caf5827fecca9a9ce272ccdddda4015a15f73..7e107855c927f359167757ad11f125f5ad95febe 100644 (file)
--- 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 490c1154e420892c82a2305f3185aaa59cfc701a..cce54d63892b816e6aea30b32d140de9bdbb6bc9 100644 (file)
--- 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 63458de14b5bb947ae13e4140c9926f5e752fa22..fec4da27fc483f84635236f73d01c6417960e8df 100644 (file)
--- 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 c15c16e0d17de9083a4029dca2908451bccb257f..ea5b2a56f29fc056e0505cccdd4d289f7c58dea2 100644 (file)
--- 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 c92de5c4cc5edb61c907a2c305e6a05d996e7cb7..2c5fd437f1e6134154ab92267be4b0883762281b 100644 (file)
--- 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 c79f438df923900f3c143e530d7a0fb4e569078b..66e0a3ef73e4f59a1712afa5eb660d04e070f144 100644 (file)
--- 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 ed446cbaba77bd46d38e92cdba409aa8d4112da3..a7df1a6f25b4835e99858d1981dccfa1b1ba4266 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -25,9 +25,7 @@
 #include <string.h>
 #include <windows.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-#endif
 
 // Colour
 

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 71e501dbcc4070b8b68357c12aa15e9bc0ee938f..dd0de6353c03b705e5be31e52c7f190a7b5e465e 100644 (file)
--- 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 75130e2547da2e1b3c13af714bdb420f2f864ba3..f6f67bac355088e4230c344921cabd0ce5dffb1e 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -34,13 +34,11 @@
 #include <commctrl.h>
 #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 f9f6167d682e168afcb8340e325a58321a13b97e..e914dff561f34c9f134cba6ed08ab95e866198b7 100644 (file)
--- 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 e0069963244c4efcfbcf89c168bfd3a9d73cc6ff..c111cfa54331600890f89fa2d2e10cb3fb9aa7d2 100644 (file)
--- 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 c675ce039f3b5323abf3a870cb6d749b8b9d4623..ca1caadb274323696f5e0b35c198f225656feb17 100644 (file)
--- 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 af483ed3af754e508d3274e0f54d45403d732c0b..1a59e066277c9083bb5d34ec57ac2276590567da 100644 (file)
--- 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 4344e5977296f0c1fe0705104f110a3d0eb63b29..05daa7826dca9467b5b681952548fd3725c3bbd4 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -38,9 +38,7 @@
 #include <print.h>
 #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 65f897ccf38dd4fbdadd3e91c2da715272f15f70..511c3b25bcef7ae9ae8cd09abd454a36e0030f48 100644 (file)
--- 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 ad4f8174a2d4a21d127ad4680aa4b1c9b0aef94b..8986ce0e567985be371aca9f2b4613f816d37e15 100644 (file)
--- 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 0ded488a510711f199ee29a208518f58901dae34..531a3fc9c886e466d1e586e18b4807b606c4a71a 100644 (file)
--- 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 156dfaa4d40426ebebf9b59ca4cec0686bc63f5f..7f76a6c7cd32c23a352c8495b1504b494390931a 100644 (file)
--- 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 27dc25f1b480b56bdbfea3d45023d5ca0bc9ef1a..55757f2ea6ac8c9bc6a00a636a7864f27dfb9800 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -42,9 +42,7 @@
 #include <commctrl.h>
 #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 ba1869e1c52ce58383befaa84b76e11a5e7b250b..bd3fa99176dcb39c8b37b374b859c0a7f142678c 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -43,9 +43,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#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 bd43058f114661992ba83c1eed453e1226ce7560..e318eeb71f65e9480a377ba2567797a88ecb35e7 100644 (file)
--- 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 972f0e45341b3cc6c83d0b29934374d1e4ad4e43..75acaeeea323ac3d4ad90667696d2c37f9aaf359 100644 (file)
--- 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 14b25e89b8c5ee359b34ffa8a0dafd967f20066b..3bd33d6bef7aafedd279bdb15a2bc219b6bcbec1 100644 (file)
--- 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 0ddfcba4d4ea6141e91fa6d74f32ef353d182837..0805a02f9811754134af42b5f7bbb548753a66fb 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -33,9 +33,7 @@
 #include <commctrl.h>
 #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 5a86380c51738f04329fc28aec27af1cb0bcf5fb..542c1231638dd064ba77987fabc5ca444b2b4484 100644 (file)
--- 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 ae1820d19a3a42ce089f536f95e0fd1159b2955a..9e2947717d5c7b76aca3a303605d475714f2eb88 100644 (file)
--- 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 3a10a3fefea66a52dce2871f43cce849f9b59cc0..81c0f3d3c067ee80510ec33d6de9a415b03016e6 100644 (file)
--- 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 1a376ba5a6dfb7d5725ceca98b86adfb84e80e6a..66e868d54d1c17ba51c84c96094e646325e91f47 100644 (file)
--- 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 1ca4dafb129be16e2bdb6d1973a025c95bedcfb8..00b0741ab76d9f730dc0de70a8dcff846b000972 100644 (file)
--- 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 6c80416dd82f9162f1a21edffcfc5b906ba2eb58..642fc9290c2619630096d6f67a308b7a597cdc53 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -41,9 +41,7 @@
 #include <commctrl.h>
 #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 1f51b5ded8cbf42a39c415844dbf235c441c9487..3b42780fcb8d738636e758bb12f3aeba9cc2bc30 100644 (file)
--- 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 756a9bea2c0e037cb12ceadc2de5522609dc9e9c..97b639ead4babd078ba1f61e633bfb5909c21a84 100644 (file)
--- 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 6e9e158a329db5cbb0dc85b97d4fc5d4b401d8ed..03b81da874c56a53a43367df75965a95ffe8a855 100644 (file)
--- 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 7b85d299277d252f4988addeed3cab503a6b8bd2..e2bb43b5f80ac3783c699b4c6c7dbe5380db481d 100644 (file)
--- 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 7f99f93c635941562952265b6d8d00a13e460d0e..373a1400fd053254a8b832b227d9d07ab9103ea1 100644 (file)
--- 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 57464f4e1882588a55aa476854ac84d6b78a9a1b..a8c7b9d0e8c52bc10359233b65e800c15d78633e 100644 (file)
--- 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 77bf94c6b9e9b54392f3ad764b129af97235e426..70a83e908b93de17269f42ddb287d24e2ae7f09b 100644 (file)
--- 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 d2fe79e5575a770a55b2a422975b06dd98447b22..8f6ad71029e5350d768a3a444c73d50e54ade519 100644 (file)
--- 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 77569777f75801c880467ef20d07c0739567a13a..891815bf74f790054dab03fc6c7f32f565ec4eb5 100644 (file)
--- 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 53b26ab1e346c448077fbb597fc08e5dba325c13..fd70094b2530ff3ac7ac04280c09697168a6daf1 100644 (file)
--- 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 c9e98a3dbfa865e1c53a51b53d460f68f6433ea3..17f7a55d2bee2371e8a87de63d5589b5546e348a 100644 (file)
--- 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 c9ee2c73687edf4c277e39f341cebd1fea88cc41..f46993f88a36c37f4cad136064527cefc57be7e1 100644 (file)
--- 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 20ce47a197f364a0210c1d1d329cec1df86fb32c..2767986d6a5b49a3d76b7b5373daf12874b1b54b 100644 (file)
--- 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 d63f27cc79aa4e7fe43c689b05049254785f15d2..67653ecc5d253ad574774a244eb077adf15e79c0 100644 (file)
--- 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 718ad9de5693ecd213f01214d6cd629fe24befad..e40c381e7ddbddfc087527b2b23115d76e311bb5 100644 (file)
--- 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 955d42de97ddd91cf5c3b22ddcc0c39ed284c709..2072573681a91a6544950d98ea7f7d9233cd2622 100644 (file)
--- 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 56abc963b7c43e6f7a549e011267b290339fa9d2..10a12ac3efe3733a8cd21d80ba38f022303b2812 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -35,9 +35,7 @@
 #include <commctrl.h>
 #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 c6124f512cc8905b7d7c4cdb1b350b1454753b21..a915542d62f08e9291841d66dbbeb2f14f8c3cf4 100644 (file)
--- 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 6cc04c468f36ebb897f66a8db02107df6f9048cf..deafa898b21535fcea7cbe040a8a518364843cf5 100644 (file)
--- 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 5cbac4deda6006b2c748602bbc02ef0c44fe125a..27b0b26c2d4c64864b768e42823d405d6dbd69a6 100644 (file)
--- 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 e37a780841966d6a94a6548e0e4dcaa52f8b89e1..e9ceb4890b328156bb2923d81234616b6f57df79 100644 (file)
--- 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 e9d67bec8adecb9cf280673f12da0cd6c1ccf150..f08e16db70b1ca8d8c44e6bd62898a487fe4cab8 100644 (file)
--- 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 4ab6b6c42db6065a540de8b64a2fd3476ab4bdd9..b7e0f01365a610d50092448ee1c4282a2fb1655f 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -30,9 +30,7 @@
 #include "wx/msw/private.h"
 #include <stdio.h>
 
-#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 b13f837e5e30c36b4d671731c7878571db0123a8..57748ac81f68f07a306dc3d84dcf1cb3dd207814 100644 (file)
--- 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 9b2f4eeb50741017e86e248dcd9ee9be5344c3e9..3d8de5f7c64316f50c5385148a6b79e53a26b3cc 100644 (file)
--- 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 ded652c304efd2ed9b75136a22900552c4ada2c2..36755cdc6300333b7904b6c554f3374e5c4b0014 100644 (file)
--- 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 7f23bf7f632cee079cc699256f016b0bca5ad230..9f2470286e78c77109a219247def3b4d45964e52 100644 (file)
--- 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 86967c3addf82400e9efaa1eb9c83270229c3739..458cb8f4c800e9b10afef106406e80b2ee433073 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -62,7 +62,6 @@
     #include <richedit.h>
 #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 682f66980cc5eebc164e8d0eda987e1d14a4d6aa..cd331eb4ec1ce8b3e9ae74769622ce6df62f3f04 100644 (file)
--- 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 a350654153a8635d06943ca954d22750077baaa6..0e0c3e07634953a4ff0246d126269ea44e8e520f 100644 (file)
--- 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 7459dda31174f7dd3cd9635bb5a08e8c74c5d6a8..2e4ccc5eaccf4c7c536544396855fc83662af6b4 100644 (file)
--- 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 881da9b4c56f8b261d377b627c8467cf28fed1b8..7be1c6acd3a077728327bcfaee980278202a365e 100644 (file)
--- 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 ee11aa649bb44e1a7c23c0f31b611171c6f87910..91434fe7dd96a610e4015a2d0aa8951d32604bd9 100644 (file)
--- 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 47a6cdd53ca30c309c73cba243de85dfa593b9b9..8c03d33f86a37d90329f3f2e6fe8b64c7136e76e 100644 (file)
--- 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 8f61361eba44f941d4e258b88669db892535d19d..ae0b2843da50b8a1bd8940d80d74ec5e57be6c9e 100644 (file)
--- 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 76713cd289b0f259494f87e5ad5b7992aae14cdc..53b8a95f2b949a90679c341686523f6b016d0215 100644 (file)
--- 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 c9a6387c1ead4c8c821efa4a6a50a390e5032656..cecadf63eed7905f6d846c068c84aadda6b33b03 100644 (file)
--- 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 56dde6f8f8b2ae7af2360b2b063004a6fea13082..b98fff55896ec6b15cb43d84d9aa5594e33601d6 100644 (file)
--- 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 b11ed7c1f8cf0698961c32b9f76fb3500cbaf992..cb94c109e256fab7032e4f8f5f73c1d0aa620863 100644 (file)
--- 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 be96555450508cbe2838ccd1be60602f8432e0c0..f834ab1fbc505a11ee146996d3dd49dc62ce7529 100644 (file)
--- 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 9144cc402326a331ea613770fa24eaa40122d8dd..fa7a6239700e0f0a9591cbf778389ae5e5e93a95 100644 (file)
--- a/src/os2/colour.cpp
+++ b/src/os2/colour.cpp
@@ -17,9 +17,7 @@
 #define INCL_PM
 #include<os2.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-#endif
 
 // Colour
 

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index a91a566f367b3f9195d830d032e2d64d7b8f46e4..0a3802cb51e1c401f25c9b0d07962286354c96dd 100644 (file)
--- 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 16a0cb09ad81c44b9fe6f2286015a8130c7ad4d4..a0eaf122430cf76ec530c368df34634807d637b4 100644 (file)
--- 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 e3efb12c76bfa8c33439a519a8753b6f420b5ce5..6490f0279ed8015cd5bac6373c462a331a63983a 100644 (file)
--- 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 8983710b325038683f759ba39ccb5eeab09328c1..05dbc01904415c9720eb7cb57e9f11cc6fc86fc1 100644 (file)
--- 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 ee5ad82aef6cef7e280b80b20df56d50b547bf1c..9fa35aa9d7530f126f210b7475e23c13918e7701 100644 (file)
--- 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 7f28afd8dd81e6710e6d47c525623077f8b512fa..1ab4a99f27880821dc7bd3a512bbd3def1b7289c 100644 (file)
--- 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 eaff9676967698a216bc265b6f9a7ce8ba9307f5..7f9139ce16e5d932cc917c80348530fb5ebb0f0f 100644 (file)
--- 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 58fc9b97cfefabf3d354555a7c6f801d32ef0b22..5eaa7dc20011270232e72d1121bab28031f11cea 100644 (file)
--- 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 3cd09826e37497b7c505fccff45283139ee2afbf..7a5fd77c651b8605361991832c38e935cc6d7c2a 100644 (file)
--- 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 1dd38fa43a2d9701d976b3dc5b42ee35dd3c66ec..f2ac2d3035e9f58dfce9a152b8eb4d3f3a5b77b2 100644 (file)
--- 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 10a80890e08ef3827a7fda6433eb64b21cf7abca..aee711ce99540c7ed13cc71d2e0c165173f733d0 100644 (file)
--- a/src/os2/filedlg.cpp
+++ b/src/os2/filedlg.cpp
@@ -36,9 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#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 90094e4221e12df5537fda5ec3df38649ffee8c5..db5ecb184a71ecb77d59e30f1e06b60930ca0cab 100644 (file)
--- 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 841c3b56fd57c9232d7a1f01d876b3427cd3645e..065949e3c18e9bbd7fb63e4feab7a1138a83ae53 100644 (file)
--- 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 fa543a0f5259ef5d5a1d1cd3c03ae5e68485c76f..47bfc39c7567b8c69f4cf2c2a7965a5eb8f6a7bf 100644 (file)
--- 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 d8185a69d90b4dc6a9f03d949c73fce3dad32e33..620760fd5f6d5c2ecf85cbaeaadb1d8ac0621daa 100644 (file)
--- 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 11b4d014af53dad8a81a5e919c59f1a2f67811b1..af715606bc28110af9500fd3f35f38390a4beb47 100644 (file)
--- 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 3d7e6c1360a95f687e414a66fdfefb457a851297..9e84bbf12977bf000a3366a5c6fb944c70ae2e78 100644 (file)
--- 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 b03ecf734ee4e033b1f151e628584199a7632d0d..d4ef849d8fd539749c15613bca27230ac1d71237 100644 (file)
--- 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 5408910fb3864c529f9ae32f9a58b75e425190e8..2ecb09a5eb944a05685643aa4281473479bd34dc 100644 (file)
--- 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 ceac2aa938f0b0ef4da1984473c2d7bc726938fe..c8cdaaec523c097dfe98841a46aaf74bf146639c 100644 (file)
--- 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 c1d89ce224cdec7f736c0184e87931eeca61fa05..129f2e8d910e5565d0b162c99f6ae3d6d40d18c5 100644 (file)
--- 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 3ab444de6b8ee57b7e5e11c021aa01b0c2edb86e..4cd1db830657be6bcdd09ba60d79a75835f1d765 100644 (file)
--- 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 0d2f2c7d11af7031bc1fad25afc37507f45f2225..b8034ec68305c58f282772eb51afdf801803a15c 100644 (file)
--- 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 af819d103e542800c4b6fd78ef66d7d4d5b85649..51704339e5bfb45601900b404fec444a8bb068c4 100644 (file)
--- 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 9d105d5ae998c44f8426a5d7cb248082ac453616..82ebe9a138deddfe5498c3dc8a5008a7d1d94f00 100644 (file)
--- 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 cab9adfc9d4cee792875d693808b45011158dc43..e0461db8af2a05703198c3dbf112277eb21bf905 100644 (file)
--- 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 98c58163e71327cd61f1aec564e00846a96d5c51..905a09021b410211dd99c4170c684b8fd17bfb5a 100644 (file)
--- 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 7125a6a8f1ec66253f89bdb43647dab3bc31be48..ee078d057ef2b1d9bc8b952cdf1db3276b4f7101 100644 (file)
--- 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 0ea23cc0628556ec28a9fcd6ea9b5cb5a293f5d5..40e46cd1cce6dbde3afc9b62f2f600b62bbff029 100644 (file)
--- 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 1905f909e26e1a8cb13a1a25bf180e87fa4a2ff9..a2989ec2e09b4aa37ed376e04d7bff05c7923e50 100644 (file)
--- 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 58495d9a9e2b182d71009fcc2819a76e1f6449fa..c991f9c046325634024d203fdd75a67d6c5675f4 100644 (file)
--- 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 bcf4a9e18763f32f0f2b4c6fa72a88cb1fb73027..e77bcbdb26b19e97df9d23d8f7db9f9b7dad6f79 100644 (file)
--- 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 7817503b7f978e40a147568d34fef0ea76d36187..c0d6c909bbf2b845f65ad9b1d8c1665160873e59 100644 (file)
--- 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 df775d9b3a950ca8443cbe0bb99d846826e71743..21afeeab635ca8074fc6763c30c0144448aa2960 100644 (file)
--- 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 66b5fe5f9970cdcceefc2077ed01264ed6a92a5a..07eb547a4ad2c538e4612965677d139522ef05ef 100644 (file)
--- 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 36d6463c7217219e7e3d788c01c398588eed5e9f..5d674c3826c501aacb492e2f91ddbbf6cc668c06 100644 (file)
--- 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 1911f67045bf19c31536a725e4bdf53fe38256fe..3f1bd033fbb70b038ac05d3e946f26826044a777 100644 (file)
--- 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 524cd0d9ba190d8e01d4d31ba89cfc5f2f7a88d2..6642dccd8eae0410ed23ff60fd69798dedda8e0d 100644 (file)
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -22,9 +22,7 @@
 #include "wx/os2/private.h"
 #include <stdio.h>
 
-#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 ea95ab839eed872cc78072b5c8e2fddbf241b144..2894ebf86e1099832e73d2ab726cd37fca377983 100644 (file)
--- 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 723ec93a3d6701de0bbad2a33fe19fab2bd13ce2..f9b432aa2bc73ce3aa2ed7fe945eff144aa9771d 100644 (file)
--- 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 2c23d29d1dc8dfacbb5ec47ef41d2556eb7e842d..3ca7f9177c6ceedd219dc24ce50907d3f2dd7946 100644 (file)
--- a/src/os2/textctrl.cpp
+++ b/src/os2/textctrl.cpp
@@ -43,7 +43,6 @@
 #   include <fstream>
 #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 54c26cbbeb940a2b78a62afb3e8a8c8bad951e3c..05784150e481451763e88a241148bf5c503bfd97 100644 (file)
--- 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 4ed0456193349edac0ba7aaeda98fd6d49064ba8..718318b17c275f2e23079a81cf80246f87241325 100644 (file)
--- 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 865455f6c684893957f3198573c9f415e5612782..088db7e071e2c3d31c0d602ff202ee0d7c1602a4 100644 (file)
--- 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 f34b677837489612aca29a637b30f66baadfbde2..0294c58bc4930da9c416b65559fd34456d4149ea 100644 (file)
--- 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 1e6255f55162f1ea94dba34153f66508a6906847..d6f9fa87e39c0d40c6981f378b80687dc1f1c2ab 100644 (file)
--- 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 9e46c22b2b9ad6a0fd0479388fa380f968eb6501..03c4ceeb636be11c3cba4f63e5391d4e6ec79cdd 100644 (file)
--- 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 72c12935ff966ea0cd8eedf2cf288d7cfb609a51..587080575b37dbcaab8d9d0681d95f9b7e449116 100644 (file)
--- 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 befd0d71564ad3486bddfb4281f03acd6fd16e9d..2928e0d96f9254af3b908f782ce8d8631ab15247 100644 (file)
--- 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 dd2e2abe7ab8f644876b4e370b3ce0e77961ef75..f7b1c6ad100b35904e15bd985a17f802b9b7cdd7 100644 (file)
--- 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 a584d5303fb41c40ef4ba78fe4aa66f5e8b13818..c6a1d250e2c7a877a917dae055bb0cdf3196430a 100644 (file)
--- 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 d342d516de631ee3b2844d89fadbfbfc1bae0b42..4ccd4afc15d1d27e1ba5509e553938f475b46e9b 100644 (file)
--- 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 f1bbccaeb0f0f3b0b0faec3b7ae8e815ba9f460d..788a456b7f572a634392df0d1b817b2415d5c564 100644 (file)
--- 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 651b272953bcb846674bff1b6d9e7d92edbdcff8..4786140bef7c2bda6ecff8f7c1b69efcfc9cc8e4 100644 (file)
--- 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 c856f5e9e0caf1242ef0970a59ed10c6c3dac1dc..29b7d5c996d67eb887efa80dea96f82220a91d9a 100644 (file)
--- 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 e56f268e350aa16064f0b378342df62570d1f2db..a4cb431cf965f0be03219e32b2d2f73e3cc3ff09 100644 (file)
--- 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 e25920d94fea3062557688b3f5dd911a6aa15854..081a7d57f59894b123756bbe1ec6e96d7b2e26d5 100644 (file)
--- 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 c6066bb1abda33d50c34545a669ad9de5865c3c9..91552f1c589491fb6c6d2aaaaea5ec2c2ddd54df 100644 (file)
--- 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 04bbf4f35384486c68b8246c241ff6381d6c1b18..cea4a7c792c9323f0b9e60e2fc37698b38f0c589 100644 (file)
--- 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 c486c876cbed6237d832cf043be32a4d884c4d00..d49b4cf98c90eb189864b76c4f8f302d3d1b1d50 100644 (file)
--- 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 cf096037d662701646471c6e179c33a7ea308009..57ff74897b81b17c452af08ed0bba1915906f8a4 100644 (file)
--- 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 5835259696b8a0e40d5d3b37d0b1fb2a2d1cb1f0..a47c8e43ecaa1320fbe0d2fafa0b131bdb277de5 100644 (file)
--- 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 f371fe0724b69302927fed3d3c74979f03aa4b35..8807b62f892333fc4c4cccd3883db37819a77f1f 100644 (file)
--- 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 8e11c5001b1257ae253d8320a10eafc8613a5556..14b5c4267d3a4044bd58636843e0598d6a1c7358 100644 (file)
--- 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 63697c835427fdea399f1bf61d3a3b046d4af9c9..46b1aa871fc57fd8ed02bd1ad813ad4655bfb5bd 100644 (file)
--- 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 6deee7dbdc2d7baea731c76061cf01cda56e13ed..cc5b28500e090b734458e365379ff8e94c3a5434 100644 (file)
--- 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 a54523ab3d4f48ce33b4ad03b3ab2695f6ac9603..f3d95d0d97db36d67f0eef9c6db12b30600520a4 100644 (file)
--- 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 38235360637289d08a81512f149ac9c511ad12d8..7ece99f432e2b73b831eafbcf25321cf49b436cd 100644 (file)
--- 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 217e6c8b888b75e3f6ba539032c76e2ff9deaebd..fcb7f97014ae3ce9d4f62d64e1b6478330e101ee 100644 (file)
--- a/src/qt/menu.cpp
+++ b/src/qt/menu.cpp
@@ -30,10 +30,8 @@
 // ----------------------
 #include <string.h>
 
-#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 aecb879f4bf2a2c778d750c183db3d3ea9eaf2ad..b0448791a46888de9c58c5cb54ddfe34e5de7907 100644 (file)
--- 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 445b545f0c09bc388a90f28c5b4a1968c22f81dc..dfbc153094dd5c931ba28d1fce74914c42c1abd5 100644 (file)
--- 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 d7b2ce264cb548485b611004010fb563ccf718c9..90cb80f41df9885ae2a72076c8152f1a025b2aae 100644 (file)
--- 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 da582d0e52ef7fcb9755e3b355a3df8dda5785be..a3ecae6d0186e42e4aed44ee16e0afe9947ff065 100644 (file)
--- 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 65baab38b6731c39dd876d22546002a693ce1e41..3fd6d78d2d1e64c6f3bf3682ab6cfc5e57220fca 100644 (file)
--- 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 d03d8e802027250b9d813305f4505227f36c2f39..7945594c99cbabd76741206e18d3bc3d87f0695f 100644 (file)
--- a/src/qt/region.cpp
+++ b/src/qt/region.cpp
@@ -23,10 +23,8 @@
 
 #include <windows.h>
 
-#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 0058a14f53583ade1e186d2a0b3657bd787696bb..942fe0222803c42c85dd2c01a89a26d2c5fa2daa 100644 (file)
--- 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 97c453b9894fe62901459016f006ce4f68e2ed10..b3d00c8af6df13b8259efc1ed7304eb2572c4f3f 100644 (file)
--- 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 a67c55846579664d9442eb2c4d7d1d76207e5d56..115d5cc9991cb1cb44655614f3f7e4dcda816031 100644 (file)
--- 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 b239dc738c830175d1f18afc795245ca00b4ecee..95bfc3b2c47723544787cacc277d5b9f80c340d8 100644 (file)
--- 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 195882691686319af3ac32ab41087327a479eb40..7f551c4569fdc994d649f5ba46fa5060c6931b0e 100644 (file)
--- a/src/qt/stattext.cpp
+++ b/src/qt/stattext.cpp
@@ -28,9 +28,7 @@
 #include "wx/msw/private.h"
 #include <stdio.h>
 
-#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 ce3459256d159556092e58831e5e3cec300f1916..f8267f300b5670070cd860ccf6d8c13e10cd409e 100644 (file)
--- 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 f976056c779c976d191a0fad3cea64781a921a8d..c07c4a5f82a5656507018a6353d8072888c851da 100644 (file)
--- 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 dce26c84da3b919aef81d4d1b84bb874d4ff2a0a..761e34e9d077d7e00f6c01017924588b2ab74361 100644 (file)
--- 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 b0b8734d55b0d9702e88b40033d0e8bdb876d48b..f8796e111a18c8818e43fc86349a269e76f7f7cc 100644 (file)
--- 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 b04a01bbe254908e39fe0a9b0d67217474674ac7..681e66155693cdf5c877bb8212e7bc14cbf22ce6 100644 (file)
--- 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 1e6255f55162f1ea94dba34153f66508a6906847..d6f9fa87e39c0d40c6981f378b80687dc1f1c2ab 100644 (file)
--- 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 169f0d557acb5b622fb9b5e60c0755b8a8a3ee89..b39c2c3bcd0ca7f9cab58a5efb35bc1d12b22aab 100644 (file)
--- 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 4f28e92f53475598e8fb475fd7b1a0d387d7e90d..7c9f52ae2aa9061b0bcab24985489a1641d26091 100644 (file)
--- 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 befd0d71564ad3486bddfb4281f03acd6fd16e9d..2928e0d96f9254af3b908f782ce8d8631ab15247 100644 (file)
--- 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 258a9cc6c39bc0b89b2d57d92bd70dfe89eb7537..1fcf88c9e6f5616e6f0e74c3259da466360c1353 100644 (file)
--- 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 ecabf5408ec88e1889148ad9db7fd8210e8fc5db..18433b99d0dff088d8cf81d1fc1318f6d30b3c26 100644 (file)
--- 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 a584d5303fb41c40ef4ba78fe4aa66f5e8b13818..c6a1d250e2c7a877a917dae055bb0cdf3196430a 100644 (file)
--- 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 3fe9ebfb72bd1051ee93be1ef95df8aac44dea26..6ffe21ddb50bd629bf82cfaaced5c4f87d9be972 100644 (file)
--- a/src/stubs/clipbrd.cpp
+++ b/src/stubs/clipbrd.cpp
@@ -23,10 +23,8 @@
 
 #include <string.h>
 
-#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 2275a9a39d679502d0a4c20e4d09c29009dc9445..56450e7304177dc2e923102255055a46c7625e7d 100644 (file)
--- 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 8d0827ef1d7f1536832bf8c34eb3feb2e154cecb..f2c7fe382cbe5ba77894a58735e670882e8cf34c 100644 (file)
--- 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 0be841bad4dabe1a3db99195f50a26b7b2419441..568529db54db70b87f24ce8c72085edb0bfff1d2 100644 (file)
--- 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 b141a80ff1c9bc933cc4af9101ff80adb24cb527..6ce584b2eaa1c4ad8fa647792340607bdbb74904 100644 (file)
--- 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 4333364c931cc08c781cc38f2998b2fc29bc69c8..bc04cc617c23331fec3f00db6dc02dec3a995f0b 100644 (file)
--- 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 2c1c613595e27d5a9f17345e534f8dda57a4e3f3..a70a0f1d135132522880831a7e6ede6c771b47ec 100644 (file)
--- 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 925d9609ee1771b240d3b41f8196b63cdcf3dfc1..4962885bf9fdc7919f9f82dbd5cbed071e1fb907 100644 (file)
--- 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 e03bbac0c80d8fbfbb86a792919de9e65948729c..5d592d8b9650f0c8fc368e2fbfd11795ab88b85b 100644 (file)
--- 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 bf3cae5e352be74e0494d910408c79df3bdbac97..f0358af36aaa21fbdf4996950373a76a6bcf98fd 100644 (file)
--- 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 095621b978ebe12a862622298ae8d5f1f48db38d..511f8f929b8f9c57856390d8951c962263266582 100644 (file)
--- 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 8832598af41c29001acd781e577cf51a17f859e7..8d1b8731a0f5c0d8ba6961e46965b2b13d59d6fa 100644 (file)
--- 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 493a6a25baf3dbd7c84cbf073f857397f7e6b494..c152046ec4c691485b3d4a3415ab360a7f91d7a7 100644 (file)
--- 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 60e8e9b987958d84ca818de0d767cad90438f9c3..13fa1b0c4797b749ab3c56e25ac07793299e4148 100644 (file)
--- 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 0a15c650aff7e784c60b0e3c5e6dbc4cde816f30..aeb2a7800755437db1b5c4d485fd02a96f9c0342 100644 (file)
--- 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 a85fbc498ffacbc22cc601acc40b6835be0ffb0a..98976d431104e6843e1100c95441c0b3fc08be7d 100644 (file)
--- 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 63697c835427fdea399f1bf61d3a3b046d4af9c9..46b1aa871fc57fd8ed02bd1ad813ad4655bfb5bd 100644 (file)
--- 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 086762c6462598ee2843740606907910b37c451e..b7f0babfa212b608402e9a04bf273570e904b878 100644 (file)
--- a/src/stubs/helpxxxx.cpp
+++ b/src/stubs/helpxxxx.cpp
@@ -17,9 +17,7 @@
 
 #include <string.h>
 
-#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 6deee7dbdc2d7baea731c76061cf01cda56e13ed..cc5b28500e090b734458e365379ff8e94c3a5434 100644 (file)
--- 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 4cb47b4e693ba6a9a223ded7a417fd4336e80087..cb4b9ff01c4da817ba0904b0416fcaf1b6a7782e 100644 (file)
--- 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 1dad21e12c4167ff042aa439ebb08261f70c4caf..24458104734ab23217f5512d0035f141745806d6 100644 (file)
--- 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 d1d844565201ff29c49e1f4de52ee49ec1495579..2c11981bf2621628487b9d2ef9283c4895f9bb4d 100644 (file)
--- 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 4869697cd7ced1494032a5bafa462c6fdc8fd0ba..9e62e1d15cf86aa18456f78b03567f933c3acabe 100644 (file)
--- 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 5880beab530c0a58cd6881c075a15719b1d56a40..32188c4b4a26c7bc0ed32b1f86bda2aa3467e11f 100644 (file)
--- a/src/stubs/menu.cpp
+++ b/src/stubs/menu.cpp
@@ -31,10 +31,8 @@
 // ----------------------
 #include <string.h>
 
-#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 38d31737e7704c9429e23872d12ee6a04634eaa6..4827ada32248f94519a3faa0e79b6ef5b723f1f6 100644 (file)
--- 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 03c29bcb7953ad525471bb1ffc39e423f577a24d..4c5d6ac1377617ee3ad7a348cb750af6de9438ad 100644 (file)
--- 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 4f6f5e5fcbb6005644fb9f5e23ed542f19fb71f9..cbe09b7d812883ed928eef6dc9cb3744e6caeda2 100644 (file)
--- 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 aeaa9bac7ab149bfaf2aa5432038d9bfa9c563d8..11831c3c34bb2c986113e7bf36cd104305343afa 100644 (file)
--- 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 f7ee49cd5d09c1aec3707f8d9685a54308bb94ba..9ac9c0bf4a1a244b494a44e9a1b1ddc9b20b3243 100644 (file)
--- 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 f8db96f8d0894b7970275f7565fed661a7516cea..44ae8cc9e30db53219d9338297d0400c24b0d5b2 100644 (file)
--- 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 1e3ced2a3a484c777157da7da10c70737831a760..2502b392fb674055cd560cb4061ea3757a91bb11 100644 (file)
--- 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 61fd6e7e993835abbbd6d9bd7d9c27a7c9ca03c5..d694aadd4f7ad7a5ef608dca07623e87afb85918 100644 (file)
--- 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 eae3b95568777cc53ac4ed40f4e0f8b6a778cd09..c6438e083cadc2c28ffa81e7b722d54bd1b139f4 100644 (file)
--- 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 da582d0e52ef7fcb9755e3b355a3df8dda5785be..a3ecae6d0186e42e4aed44ee16e0afe9947ff065 100644 (file)
--- 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 65baab38b6731c39dd876d22546002a693ce1e41..3fd6d78d2d1e64c6f3bf3682ab6cfc5e57220fca 100644 (file)
--- 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 c71d4c605a45a15004c399c66b2a1577e4c6e716..85aea95133c863cc0edcf8884c1d9afcaa77ed6c 100644 (file)
--- 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 54df1811666b81aea8a5c83c27507e8fd2250ee8..dca07b3b798ed030a1b9722297597fc556436cf9 100644 (file)
--- 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 c9952342a968bc6f464811f2f05a047ee51d4028..54d33f1a0f1bf8eb144bb0cc587abf34a5ff3e1e 100644 (file)
--- 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 cbea725592c8f95dac6f02e666f996866107b16e..754b935cfd06960ddd43a8e70491cecd2bd5762c 100644 (file)
--- 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 a67c55846579664d9442eb2c4d7d1d76207e5d56..115d5cc9991cb1cb44655614f3f7e4dcda816031 100644 (file)
--- 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 b239dc738c830175d1f18afc795245ca00b4ecee..95bfc3b2c47723544787cacc277d5b9f80c340d8 100644 (file)
--- 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 3b19c7184dbe9748fbb2adba56d8cd2f840134dc..9de4821b481e8b135f4f40e97a08393ee2d80391 100644 (file)
--- a/src/stubs/stattext.cpp
+++ b/src/stubs/stattext.cpp
@@ -18,9 +18,7 @@
 
 #include <stdio.h>
 
-#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 b3b45a72d12a038b60322fd7c374ac7ca3108551..07aa4a3056d14b3e63d3acf5b416e39bf27760fa 100644 (file)
--- 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 720e6082be0ddc57b38b5d63999634d7d0435d1c..cb3d68aad0e105d78566d1405e93f29e27fd8717 100644 (file)
--- 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 5262040cf6dc4e5fb091ed200b32b5a9f385164b..d845d50108efea892a4dff22c4d4c0e09344fb30 100644 (file)
--- 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 3cb859e3663f8890c53ac03a83946a4211578515..b83ce5e0e8bcd65788ccf38b4240648da0db7a62 100644 (file)
--- 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 137a885dbfa7e32c9096f78376146fda7cffaf68..3aea32e970e95e791b783448a9c81f198ab64193 100644 (file)
--- 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 6970db0614bbfba50fd3f20362a12d788452c6aa..0eeda07dfc5d81bbb1269641ed4d7ab655eae19c 100644 (file)
--- 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 0f570e2eba52c7d6b7fd09be1ed4f71cf01473be..0bbda32bd7c47d689f209c0095001b8935d8b831 100644 (file)
--- 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 73563d8182a6f40fd73a4e96e4a8b4aa627ee869..d17148a23ad135412084565b943d8993a6e2b934 100644 (file)
--- 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 6e0b1d9de5c2b88a3b6e9abbde2eea6a0b241f67..955687ea93a7e19992373a532e2c6a6ed7d73262 100644 (file)
--- 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 2dff4c3c68c1a21b6bf7b251b1e451d29931204a..522fad34b2ae1223bcc0773dc6e9d938afe57423 100644 (file)
--- 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()