removed USE_SHARED_LIBRARY mentions (and all variations in spelling) (patch 1231184)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/cursor.mm b/src/cocoa/cursor.mm
index b8eee50500d3a1193ea149d9455ac922ab94b025..2489ea7b0696ebc057ecf47c7573f2e9f6b7d0f5 100644 (file)
--- a/src/cocoa/cursor.mm
+++ b/src/cocoa/cursor.mm
@@ -23,9 +23,7 @@
 #import <AppKit/NSImage.h>
 #include "wx/cocoa/string.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
-#endif
 
 typedef struct tagClassicCursor
 {

diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp
index 7133060f8f513ddc2d8a6d7a51a3c7f91ae18a28..dbfd16189954bbdd2bcc58594b957748552d28e7 100644 (file)
--- a/src/cocoa/font.cpp
+++ b/src/cocoa/font.cpp
@@ -19,9 +19,7 @@
 #include "wx/gdicmn.h"
 #include "wx/encinfo.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-#endif
 
 void wxFontRefData::Init(int size, int family, int style, int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding)
 {

diff --git a/src/cocoa/gdiobj.cpp b/src/cocoa/gdiobj.cpp
index 63697c835427fdea399f1bf61d3a3b046d4af9c9..46b1aa871fc57fd8ed02bd1ad813ad4655bfb5bd 100644 (file)
--- a/src/cocoa/gdiobj.cpp
+++ b/src/cocoa/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/accel.cpp b/src/mac/carbon/accel.cpp
index 69ad642818b21807498cbcb73f0836b03e67eb17..a0369c0c488e3467b625ede9f87d97293a32a602 100644 (file)
--- a/src/mac/carbon/accel.cpp
+++ b/src/mac/carbon/accel.cpp
@@ -18,9 +18,7 @@
 #include "wx/accel.h"
 #include "wx/string.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
-#endif
 
 // ----------------------------------------------------------------------------
 // wxAccelList: a list of wxAcceleratorEntries

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index 789be90f00b9ccc91e04daf49f01c63acd8ba3c1..72413a992ffa7426065302e84576305af466d134 100644 (file)
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -20,9 +20,7 @@
 
 #include "wx/mac/private.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
-#endif
 
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {

diff --git a/src/mac/carbon/colordlgosx.mm b/src/mac/carbon/colordlgosx.mm
index 13a59e41687b110a0b34a90cb4177fae226c1e7c..c792d21bff37f7b9836715f4147ef943986cc9ca 100644 (file)
--- a/src/mac/carbon/colordlgosx.mm
+++ b/src/mac/carbon/colordlgosx.mm
@@ -32,9 +32,7 @@
 //Mac OSX 10.2+ only
 #if USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
-#endif
 
 // Cocoa headers
 #include "wx/cocoa/autorelease.h"

diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp
index 21eb3135c1c86b66f90a48d1fb8c98faf98e9579..a0fad78acd195223f1b1f3e30882325b9f5f6a5b 100644 (file)
--- a/src/mac/carbon/combobxc.cpp
+++ b/src/mac/carbon/combobxc.cpp
@@ -25,9 +25,7 @@
 #endif
 #endif
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-#endif
 
 // composite combobox implementation by Dan "Bud" Keith bud@otsys.com
 

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index 6bb1ff40bc832053aaee8cad880e87b89eac4ba8..90e9489def2d70db387cdb857e7f4dcfcd7fc299 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -23,9 +23,7 @@
 
 #include "wx/mac/private.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
-#endif
 
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 {

diff --git a/src/mac/carbon/data.cpp b/src/mac/carbon/data.cpp
index 844ac0a4b92d5fa3d3ef0a82f156d481d2adf796..a99992c6aa61ce3357e5b3d2b9ce7ce63a487ba1 100644 (file)
--- a/src/mac/carbon/data.cpp
+++ b/src/mac/carbon/data.cpp
@@ -10,18 +10,3 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
-
-#include "wx/event.h"
-
-#if wxUSE_SHARED_LIBRARY
-///// Event tables (also must be in one, statically-linked file for shared libraries)
-
-// This is the base, wxEvtHandler 'bootstrap' code which is expanded manually here
-const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; }
-
-const wxEventTable wxEvtHandler::sm_eventTable =
-    { NULL, &wxEvtHandler::sm_eventTableEntries[0] };
-
-const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, NULL } };
-#endif
-

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 0a3f6497c22cffb1dfecf5adee83c68b662ca148..23d4dfd55f86c723edce982e4f155fadf0618ff8 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -28,9 +28,7 @@
 #include <ATSUnicode.h>
 #endif
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-#endif
 
 class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {

diff --git a/src/mac/carbon/fontdlgosx.mm b/src/mac/carbon/fontdlgosx.mm
index d1b741372ef63bca3883b3e935590fdf5de9e7e1..968d740727d515b71c94f655ddfc0404808551fa 100644 (file)
--- a/src/mac/carbon/fontdlgosx.mm
+++ b/src/mac/carbon/fontdlgosx.mm
@@ -29,9 +29,7 @@
 //Mac OSX 10.2+ only
 #if USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
-#endif
 
 // Cocoa headers
 #include "wx/cocoa/autorelease.h"

diff --git a/src/mac/carbon/gdiobj.cpp b/src/mac/carbon/gdiobj.cpp
index f0c713329895bbac370e3352c136467a694d3084..ec91782eda30a79c9c9267ff43b0609f7e5bc759 100644 (file)
--- a/src/mac/carbon/gdiobj.cpp
+++ b/src/mac/carbon/gdiobj.cpp
@@ -17,8 +17,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 e330ce2d7981a4546a1a9b481eadcc7c572390d9..a20dae3dcfddbe3da3aca4def096e2247183a3e0 100644 (file)
--- a/src/mac/carbon/helpxxxx.cpp
+++ b/src/mac/carbon/helpxxxx.cpp
@@ -19,9 +19,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 a3bd7817c1a5f1957437942df5d378e2bd692343..956d8f72c3f992f338b6c0bb0ae3c20b1fd1a150 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -17,9 +17,7 @@
 
 #include "wx/icon.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-#endif
 
 #include "wx/image.h"
 #include "wx/mac/private.h"

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 38bdecfd0176a694bafea1cd402e640de656180a..047c5fd7de3f609690420624483378111376c77d 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -27,7 +27,6 @@
 
 #include "wx/utils.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
@@ -36,7 +35,6 @@ BEGIN_EVENT_TABLE(wxListBox, wxControl)
     EVT_CHAR( wxListBox::OnChar )
 #endif
 END_EVENT_TABLE()
-#endif
 
 #include "wx/mac/uma.h"
 

diff --git a/src/mac/carbon/palette.cpp b/src/mac/carbon/palette.cpp
index adcbb30eba57f86479f4b9a92540403f05208d58..d6295de46a0f762da761139fe7aba5e0116b7803 100644 (file)
--- a/src/mac/carbon/palette.cpp
+++ b/src/mac/carbon/palette.cpp
@@ -19,9 +19,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 56130732a93b683ce08d6582a883b23bfb1ec8dd..8edb25bd5b32471a0e7dc6c459a1888cc972ecf4 100644 (file)
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -18,9 +18,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/treectrl.cpp b/src/mac/carbon/treectrl.cpp
index 0fa15e39ef86a659212c8c3bdf1b6b00a168ba0e..203bef61753c904713be1975b0b9bc7cd2bef9fc 100644 (file)
--- a/src/mac/carbon/treectrl.cpp
+++ b/src/mac/carbon/treectrl.cpp
@@ -19,12 +19,9 @@
 #include "wx/treebase.h"
 #include "wx/stubs/treectrl.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject)
 
-#endif
-
 wxTreeCtrl::wxTreeCtrl()
 {
     m_imageListNormal = NULL;

diff --git a/src/mac/classic/accel.cpp b/src/mac/classic/accel.cpp
index 14aa88e53a85fa2c05d76354fb15f32f314257d1..f2f6863596886944d9c87a11f1a2ee84386ac4cc 100644 (file)
--- a/src/mac/classic/accel.cpp
+++ b/src/mac/classic/accel.cpp
@@ -17,9 +17,7 @@
 #include "wx/accel.h"
 #include "wx/string.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
-#endif
 
 // ----------------------------------------------------------------------------
 // wxAccelList: a list of wxAcceleratorEntries

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index 38d66723aa602598c0197659501cc482dd18d19d..f3f0e91e88e064a29a2981b4c927d0b3e549ecba 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -85,15 +85,12 @@ static EventTime sleepTime = kEventDurationNoWait ;
 static long sleepTime = 0 ;
 #endif
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
     EVT_END_SESSION(wxApp::OnEndSession)
     EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
 END_EVENT_TABLE()
-#endif
-
 
 const short    kMacMinHeap = (29 * 1024) ;
 // platform specific static variables

diff --git a/src/mac/classic/bmpbuttn.cpp b/src/mac/classic/bmpbuttn.cpp
index b1bd49dff016b8483fa59b8d6ec6c20beeab63ac..9039004fffbcebbfa365bc8ef34e4daa70b7980a 100644 (file)
--- a/src/mac/classic/bmpbuttn.cpp
+++ b/src/mac/classic/bmpbuttn.cpp
@@ -16,9 +16,7 @@
 #include "wx/window.h"
 #include "wx/bmpbuttn.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-#endif
 
 #include "wx/mac/uma.h"
 #include "wx/bitmap.h"

diff --git a/src/mac/classic/brush.cpp b/src/mac/classic/brush.cpp
index d484314a2ce98af507fea1e9621cdd950f9ff496..9313ad10d92cf7da3ad66bc06421df01c3a03355 100644 (file)
--- a/src/mac/classic/brush.cpp
+++ b/src/mac/classic/brush.cpp
@@ -19,9 +19,7 @@
 
 #include "wx/mac/private.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
-#endif
 
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {
@@ -226,4 +224,4 @@ wxBitmap *wxBrush::GetStipple() const
 wxMacBrushKind wxBrush::MacGetBrushKind()  const 
 { 
     return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour); 
-}
\ No newline at end of file
+}

diff --git a/src/mac/classic/button.cpp b/src/mac/classic/button.cpp
index 912de02fb67ed1007e0e740d4678796c6e88ab4d..463cec6441e9c242acfa32adedbbe9a6463786d6 100644 (file)
--- a/src/mac/classic/button.cpp
+++ b/src/mac/classic/button.cpp
@@ -19,9 +19,7 @@
 #include "wx/panel.h"
 #include "wx/stockitem.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-#endif
 
 #include "wx/mac/uma.h"
 // Button

diff --git a/src/mac/classic/checkbox.cpp b/src/mac/classic/checkbox.cpp
index ba85d2fe53e9d650a9f7c354f785b85e84ee128f..aff53815ba980e7a00f8cfe3796533bb510fc4b2 100644 (file)
--- a/src/mac/classic/checkbox.cpp
+++ b/src/mac/classic/checkbox.cpp
@@ -17,10 +17,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/classic/choice.cpp b/src/mac/classic/choice.cpp
index f08d6b8a0dce664dc508ea63b6d17318aa38cbca..ecd459ed61e7b153ab67f7613a537acb52c88303 100644 (file)
--- a/src/mac/classic/choice.cpp
+++ b/src/mac/classic/choice.cpp
@@ -21,9 +21,7 @@
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-#endif
 
 extern MenuHandle NewUniqueMenu() ;
 

diff --git a/src/mac/classic/colordlg.cpp b/src/mac/classic/colordlg.cpp
index 3c8411319b333758f23b5b26de4f970a09fa6c64..bf8c90d0fcbdc1a0cc75c1db4cf9251de7e984a1 100644 (file)
--- a/src/mac/classic/colordlg.cpp
+++ b/src/mac/classic/colordlg.cpp
@@ -16,9 +16,7 @@
 
 #include "wx/mac/colordlg.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
-#endif
 
 #include "wx/mac/private.h"
 #ifndef __DARWIN__

diff --git a/src/mac/classic/colour.cpp b/src/mac/classic/colour.cpp
index 86487f7a35f68fed6fd8a54b8cbc4ee74bf2e62a..195914413fa60a0a674f67a362168c7fc5ea5834 100644 (file)
--- a/src/mac/classic/colour.cpp
+++ b/src/mac/classic/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/classic/combobox.cpp b/src/mac/classic/combobox.cpp
index 8562e17e72626ddd238c67a3fa3d1ba43a97c5c3..1a52315844545453c6a1a1ff3039ec21d5e960e4 100644 (file)
--- a/src/mac/classic/combobox.cpp
+++ b/src/mac/classic/combobox.cpp
@@ -18,9 +18,7 @@
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-#endif
 
 // composite combobox implementation by Dan "Bud" Keith bud@otsys.com
 

diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp
index e63e29d691ca03dfb5da746c3432ac23efdd0bdb..af8c5e03a8d673092652f8d4f0301496eeffd0f5 100644 (file)
--- a/src/mac/classic/control.cpp
+++ b/src/mac/classic/control.cpp
@@ -31,14 +31,12 @@
 #include "wx/sizer.h"
 #include "wx/stattext.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
     EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) 
     EVT_PAINT( wxControl::OnPaint ) 
 END_EVENT_TABLE()
-#endif
 
 #include "wx/mac/uma.h"
 #include "wx/mac/private.h"

diff --git a/src/mac/classic/cursor.cpp b/src/mac/classic/cursor.cpp
index 475c473b9175661536f809326442edd07de9eb13..a5f0b6618c843a9b47ffe171026cab4c54d7334a 100644 (file)
--- a/src/mac/classic/cursor.cpp
+++ b/src/mac/classic/cursor.cpp
@@ -23,9 +23,7 @@
 
 #include "wx/mac/private.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
-#endif
 
 const short kwxCursorBullseye = 10 ;
 const short kwxCursorBlank = 11 ;

diff --git a/src/mac/classic/data.cpp b/src/mac/classic/data.cpp
index 1f0bea00d2cd67fa4584383e4f860f7b88fb29e3..377b125d9a643e9d508a32ad2ad6a9531d7846e5 100644 (file)
--- a/src/mac/classic/data.cpp
+++ b/src/mac/classic/data.cpp
@@ -10,16 +10,3 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/event.h"
-
-#if wxUSE_SHARED_LIBRARY
-///// Event tables (also must be in one, statically-linked file for shared libraries)
-
-// This is the base, wxEvtHandler 'bootstrap' code which is expanded manually here
-const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; }
-
-const wxEventTable wxEvtHandler::sm_eventTable =
-    { NULL, &wxEvtHandler::sm_eventTableEntries[0] };
-
-const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, NULL } };
-#endif
-

diff --git a/src/mac/classic/dc.cpp b/src/mac/classic/dc.cpp
index ae7936dd6cce78827bfbc60a51c64b970d4a6b92..85f559f9774997783e84d9d687f5b301ab32075d 100644 (file)
--- a/src/mac/classic/dc.cpp
+++ b/src/mac/classic/dc.cpp
@@ -32,9 +32,8 @@ using namespace std ;
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>
 #include <FixMath.h>
-#if !USE_SHARED_LIBRARY
+
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-#endif
 
 //-----------------------------------------------------------------------------
 // constants

diff --git a/src/mac/classic/dcclient.cpp b/src/mac/classic/dcclient.cpp
index 2718f6ce9b5abfc78e41e6b9d0a3c9d7abd405c7..83d9e2219b6783175c1563ee679842e3d59e6047 100644 (file)
--- a/src/mac/classic/dcclient.cpp
+++ b/src/mac/classic/dcclient.cpp
@@ -31,11 +31,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/classic/dcprint.cpp b/src/mac/classic/dcprint.cpp
index 85bc4669700038a282ccf5bfd9ee1ba551e37722..f141bf4085e316d39da4ae57f4b86a60742cd9e9 100644 (file)
--- a/src/mac/classic/dcprint.cpp
+++ b/src/mac/classic/dcprint.cpp
@@ -29,9 +29,7 @@
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
-#endif
 
 class wxNativePrinterDC
 {

diff --git a/src/mac/classic/dcscreen.cpp b/src/mac/classic/dcscreen.cpp
index 03d769a05b41ddf5987b5ac71122aac8a4e4da83..934451ebad3ce64c764edefe5bb5f383ff926bbc 100644 (file)
--- a/src/mac/classic/dcscreen.cpp
+++ b/src/mac/classic/dcscreen.cpp
@@ -16,9 +16,7 @@
 #include "wx/dcscreen.h"
 #include "wx/mac/uma.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/classic/dialog.cpp b/src/mac/classic/dialog.cpp
index 6c9646751c84777aabcf33e350aaec93104f3b45..2275c0dd7d6c2229026c6c4de451f88b89bdfb68 100644 (file)
--- a/src/mac/classic/dialog.cpp
+++ b/src/mac/classic/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, wxTopLevelWindow)
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
@@ -42,8 +41,6 @@ BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
-#endif
-
 void wxDialog::Init()
 {
     m_isModalStyle = false;

diff --git a/src/mac/classic/dirdlg.cpp b/src/mac/classic/dirdlg.cpp
index 0b4c7df19566e52d9da444682f494bada976329b..aecb14a9dcb9e0d95fe1438b86b6482b91506b62 100644 (file)
--- a/src/mac/classic/dirdlg.cpp
+++ b/src/mac/classic/dirdlg.cpp
@@ -28,9 +28,7 @@
   #include <Navigation.h>
 #endif
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
-#endif
 
 wxDirDialog::wxDirDialog(wxWindow *parent,
                          const wxString& message,

diff --git a/src/mac/classic/filedlg.cpp b/src/mac/classic/filedlg.cpp
index 59807f398d9aba4bd8e2b450ee9bfee982ddf04d..95f2fa0c8128a7b36683f658355a5fd94c617cae 100644 (file)
--- a/src/mac/classic/filedlg.cpp
+++ b/src/mac/classic/filedlg.cpp
@@ -26,9 +26,7 @@
   #include "PLStringFuncs.h"
 #endif
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
-#endif
 
 // begin wxmac
 

diff --git a/src/mac/classic/font.cpp b/src/mac/classic/font.cpp
index 06e7fa1ca3ce55c6eb73c5af219dc15983210fa1..de09dd6ed878d65b35035f10c493b250662093d8 100644 (file)
--- a/src/mac/classic/font.cpp
+++ b/src/mac/classic/font.cpp
@@ -25,9 +25,7 @@
 #include "wx/mac/private.h"
 #include <ATSUnicode.h>
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-#endif
 
 class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {

diff --git a/src/mac/classic/fontdlg.cpp b/src/mac/classic/fontdlg.cpp
index 03c894c553ad13863823f1d986cb9ec31abe7957..946894667f4d2c48408e0fc1f9d5b76d17fdc696 100644 (file)
--- a/src/mac/classic/fontdlg.cpp
+++ b/src/mac/classic/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/classic/frame.cpp b/src/mac/classic/frame.cpp
index b56f24712bdeedad834b5613ae5e68793b9aa169..c1ae2462ada5b59d2ea0913ac23d3f842c7a7747 100644 (file)
--- a/src/mac/classic/frame.cpp
+++ b/src/mac/classic/frame.cpp
@@ -28,7 +28,6 @@
 extern wxWindowList wxModelessWindows;
 extern wxList wxPendingDelete;
 
-#if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)
  // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
@@ -38,7 +37,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-#endif
 
 #define WX_MAC_STATUSBAR_HEIGHT 15 
 // ----------------------------------------------------------------------------

diff --git a/src/mac/classic/gauge.cpp b/src/mac/classic/gauge.cpp
index 122577138944392923f948cfdfbe92742b9b2e1b..a9c5f876495f77a9e624276f45ec04d9663cd48f 100644 (file)
--- a/src/mac/classic/gauge.cpp
+++ b/src/mac/classic/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/classic/gdiobj.cpp b/src/mac/classic/gdiobj.cpp
index 528c5a7efe4467940b2f65a72bdbcec3b76aa440..8bd1de31ad28557f20c4cd410d96a608afc6e3c1 100644 (file)
--- a/src/mac/classic/gdiobj.cpp
+++ b/src/mac/classic/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/classic/helpxxxx.cpp b/src/mac/classic/helpxxxx.cpp
index 7d0e4d15314ef776d7949264d2adf578fb3d83ce..5013e8c241af92009f6233a6b9710ddae201f348 100644 (file)
--- a/src/mac/classic/helpxxxx.cpp
+++ b/src/mac/classic/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/classic/icon.cpp b/src/mac/classic/icon.cpp
index bd1937bc2a45dba54274849335887c399a7832f3..1c32358a38aa6e16cd08e56b70d7c94af91d4227 100644 (file)
--- a/src/mac/classic/icon.cpp
+++ b/src/mac/classic/icon.cpp
@@ -15,9 +15,7 @@
 
 #include "wx/icon.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-#endif
 
 #include "wx/mac/private.h"
 

diff --git a/src/mac/classic/listbox.cpp b/src/mac/classic/listbox.cpp
index e68a7f9b7291f01088f0b195fc4d61b241fe3713..0d1503df9f43d27948f4b59f8f9dfb49436d91cb 100644 (file)
--- a/src/mac/classic/listbox.cpp
+++ b/src/mac/classic/listbox.cpp
@@ -23,14 +23,12 @@
 
 #include "wx/utils.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
     EVT_SIZE( wxListBox::OnSize )
     EVT_CHAR( wxListBox::OnChar )
 END_EVENT_TABLE()
-#endif
 
 #include "wx/mac/uma.h"
 

diff --git a/src/mac/classic/mdi.cpp b/src/mac/classic/mdi.cpp
index bce41781f0885bd0d068ab91f56cec6411603e93..bcd6f85665288171d9e1d6dfd115047d8d56ef98 100644 (file)
--- a/src/mac/classic/mdi.cpp
+++ b/src/mac/classic/mdi.cpp
@@ -23,7 +23,6 @@
 
 extern wxWindowList wxModelessWindows;
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
@@ -37,8 +36,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
   EVT_SCROLL(wxMDIClientWindow::OnScroll)
 END_EVENT_TABLE()
 
-#endif
-
 static const int IDM_WINDOWTILE  = 4001;
 static const int IDM_WINDOWTILEHOR  = 4001;
 static const int IDM_WINDOWCASCADE = 4002;

diff --git a/src/mac/classic/menu.cpp b/src/mac/classic/menu.cpp
index 641183222bfb5d201c35d3447de9ddd914814a67..69bf7c24ac7a8de9a64ba02403a67eb0b9893470 100644 (file)
--- a/src/mac/classic/menu.cpp
+++ b/src/mac/classic/menu.cpp
@@ -35,10 +35,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/classic/menuitem.cpp b/src/mac/classic/menuitem.cpp
index 6cc3aa1a791aed31425708df2f036b244f611a1b..321023913d7eba7b1a2a8b827de72bf10dd3e8c2 100644 (file)
--- a/src/mac/classic/menuitem.cpp
+++ b/src/mac/classic/menuitem.cpp
@@ -26,9 +26,7 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
-  IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-#endif  //USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
 
 // ----------------------------------------------------------------------------
 // wxMenuItem

diff --git a/src/mac/classic/metafile.cpp b/src/mac/classic/metafile.cpp
index 594fe43af521d1ef1aa85c16369595d50d35ed88..7a2e5d18154d492d9dde6eba7370fa7b23c5ee20 100644 (file)
--- a/src/mac/classic/metafile.cpp
+++ b/src/mac/classic/metafile.cpp
@@ -41,10 +41,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/classic/minifram.cpp b/src/mac/classic/minifram.cpp
index 6b49b9bdc74542e9dc97c5b87d83b06901742a35..577354b142a5e83b9a6f8a36b9864727d17cb7da 100644 (file)
--- a/src/mac/classic/minifram.cpp
+++ b/src/mac/classic/minifram.cpp
@@ -15,8 +15,4 @@
 
 #include "wx/minifram.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
-#endif
-
-

diff --git a/src/mac/classic/msgdlg.cpp b/src/mac/classic/msgdlg.cpp
index bcf8f1a4991e77562355bde898fe3cbef842e828..7e48867ed2937e88fb2a76487b5bd7a66e7b698b 100644 (file)
--- a/src/mac/classic/msgdlg.cpp
+++ b/src/mac/classic/msgdlg.cpp
@@ -18,9 +18,7 @@
 #include "wx/intl.h"
 #include "wx/mac/uma.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/mac/classic/palette.cpp b/src/mac/classic/palette.cpp
index 60a0de6a8a57792b32270aa48ef3b1c3f21f9748..63540e9603ed0350627971675049ed48db43e9ec 100644 (file)
--- a/src/mac/classic/palette.cpp
+++ b/src/mac/classic/palette.cpp
@@ -19,9 +19,7 @@
 
 #include "wx/palette.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
-#endif
 
 /*
  * Palette

diff --git a/src/mac/classic/pen.cpp b/src/mac/classic/pen.cpp
index fea55ab34eb7394f3f30661355ad70238b4056af..e34afa6a26c675f0db716701531aac18f3a96ad0 100644 (file)
--- a/src/mac/classic/pen.cpp
+++ b/src/mac/classic/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/classic/printdlg.cpp b/src/mac/classic/printdlg.cpp
index 89f2789250c8d9f300fe459544eb2cb0f546a090..032a4af478e4f4663e0a4cc422a77639133bdbb6 100644 (file)
--- a/src/mac/classic/printdlg.cpp
+++ b/src/mac/classic/printdlg.cpp
@@ -21,10 +21,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/classic/printmac.cpp b/src/mac/classic/printmac.cpp
index 5befe63b86d1d56e78c353a701395f379eb385f2..71b1fd4b3f60186a040cbbde82bf25f84bd63028 100644 (file)
--- a/src/mac/classic/printmac.cpp
+++ b/src/mac/classic/printmac.cpp
@@ -42,10 +42,8 @@
 
 #include <stdlib.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase)
-#endif
 
 #if TARGET_CARBON
 

diff --git a/src/mac/classic/radiobox.cpp b/src/mac/classic/radiobox.cpp
index 134c08c10cc4153e82c43ef1d98d3b83b9a7d5ce..1c66185893d2e1f056e43d71d2e9998c5a697911 100644 (file)
--- a/src/mac/classic/radiobox.cpp
+++ b/src/mac/classic/radiobox.cpp
@@ -25,9 +25,7 @@
 #include "wx/radiobut.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
-#endif
 
 //-------------------------------------------------------------------------------------
 //         ¥ wxRadioBox()

diff --git a/src/mac/classic/radiobut.cpp b/src/mac/classic/radiobut.cpp
index 36f7358259ed7722316fc8c8fed55d968113b484..ab3068e02d08423438cd651df7580308eb7079c9 100644 (file)
--- a/src/mac/classic/radiobut.cpp
+++ b/src/mac/classic/radiobut.cpp
@@ -17,9 +17,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/classic/region.cpp b/src/mac/classic/region.cpp
index a3cf8cef7b84f3eb0ed2287cf5517d9f3694fb08..de2b062d0d67b0089d24dae0f8396fd7d1987961 100644 (file)
--- a/src/mac/classic/region.cpp
+++ b/src/mac/classic/region.cpp
@@ -16,10 +16,8 @@
 #include "wx/gdicmn.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
 
 //-----------------------------------------------------------------------------
 // wxRegionRefData implementation

diff --git a/src/mac/classic/scrolbar.cpp b/src/mac/classic/scrolbar.cpp
index 6947803c444fb3dda6ee46b7dc35bb32a93f37f2..7a08dbf7433217951f20c5ac96e71416e08049fa 100644 (file)
--- a/src/mac/classic/scrolbar.cpp
+++ b/src/mac/classic/scrolbar.cpp
@@ -23,14 +23,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 ;
 
 // Scrollbar

diff --git a/src/mac/classic/slider.cpp b/src/mac/classic/slider.cpp
index 45aeee3c8af5aa3f12c6c5abcace28cebfdbbf09..6e63a83476b104690c0cfd190c317943fd4b83da 100644 (file)
--- a/src/mac/classic/slider.cpp
+++ b/src/mac/classic/slider.cpp
@@ -20,12 +20,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
 
  // The dimensions of the different styles of sliders (From Aqua document)
 #define wxSLIDER_DIMENSIONACROSS 15

diff --git a/src/mac/classic/spinbutt.cpp b/src/mac/classic/spinbutt.cpp
index 22e5baa67daed227be7fe758b2451a59c69ca25d..08e6da47fa64cde7bfaa4ef141400b042bb46b8f 100644 (file)
--- a/src/mac/classic/spinbutt.cpp
+++ b/src/mac/classic/spinbutt.cpp
@@ -29,10 +29,8 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 
 wxSpinButton::wxSpinButton()
    : wxSpinButtonBase()

diff --git a/src/mac/classic/statbmp.cpp b/src/mac/classic/statbmp.cpp
index 9bd84f6aa8c280b023e91665fda6a390add5cb03..978281bf89865f99445c8399ad9aa2a461ab924e 100644 (file)
--- a/src/mac/classic/statbmp.cpp
+++ b/src/mac/classic/statbmp.cpp
@@ -18,9 +18,7 @@
 #include "wx/statbmp.h"
 #include "wx/dcclient.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-#endif
 
 /*
  * wxStaticBitmap

diff --git a/src/mac/classic/statbox.cpp b/src/mac/classic/statbox.cpp
index 3ab92b74e46309197d55e9383a117ca79b081907..8bbb53a6b6dc376dc068c48397acca51d19eb7da 100644 (file)
--- a/src/mac/classic/statbox.cpp
+++ b/src/mac/classic/statbox.cpp
@@ -18,15 +18,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/classic/stattext.cpp b/src/mac/classic/stattext.cpp
index 38c4b1041b61a11dd688129b59fe2f1e917e4981..50acd4a904e4ef489050708d51337ff4698f92cd 100644 (file)
--- a/src/mac/classic/stattext.cpp
+++ b/src/mac/classic/stattext.cpp
@@ -24,9 +24,7 @@
 
 #include <stdio.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
 
 #include "wx/mac/uma.h"
 

diff --git a/src/mac/classic/tabctrl.cpp b/src/mac/classic/tabctrl.cpp
index 4cec805ec2d2f7b13f8d484808c95e735dbb3fe0..692507ef0ca48ce097feac219994ebc073b183fe 100644 (file)
--- a/src/mac/classic/tabctrl.cpp
+++ b/src/mac/classic/tabctrl.cpp
@@ -19,12 +19,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/classic/textctrl.cpp b/src/mac/classic/textctrl.cpp
index 5713099316e1d21e0ac002665423cbe8f85ad89e..94e84828667881008fe94154aebea031cc8bc778 100644 (file)
--- a/src/mac/classic/textctrl.cpp
+++ b/src/mac/classic/textctrl.cpp
@@ -637,7 +637,6 @@ OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle )
 
 
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
@@ -655,7 +654,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 END_EVENT_TABLE()
-#endif
 
 static void SetTXNData( TXNObject txn , const wxString& st , TXNOffset start , TXNOffset end )
 {

diff --git a/src/mac/classic/timer.cpp b/src/mac/classic/timer.cpp
index 26cf3cc1502f8d79aa74108219c74d0e8297d182..f7eb84297f7f538df10627d53ad6800d72ab43e5 100644 (file)
--- a/src/mac/classic/timer.cpp
+++ b/src/mac/classic/timer.cpp
@@ -15,9 +15,7 @@
 
 #include "wx/timer.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-#endif
 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"

diff --git a/src/mac/classic/toolbar.cpp b/src/mac/classic/toolbar.cpp
index 15ecb363a9b7ca7ecfe0f4e6c6a514df73a9a081..66fa16cf89ded134c7b61ca01e3325fcd7c1a7b0 100644 (file)
--- a/src/mac/classic/toolbar.cpp
+++ b/src/mac/classic/toolbar.cpp
@@ -22,14 +22,12 @@
 #include "wx/tabctrl.h"
 #include "wx/bitmap.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 
     EVT_PAINT( wxToolBar::OnPaint ) 
 END_EVENT_TABLE()
-#endif
 
 #include "wx/mac/uma.h"
 #include "wx/geometry.h"

diff --git a/src/mac/classic/treectrl.cpp b/src/mac/classic/treectrl.cpp
index 7a548a743646328e7e24f73973c8ef446102337f..84f84a1b79390f6093c1f445d6e68ebfce11bfae 100644 (file)
--- a/src/mac/classic/treectrl.cpp
+++ b/src/mac/classic/treectrl.cpp
@@ -17,12 +17,9 @@
 #include "wx/treebase.h"
 #include "wx/stubs/treectrl.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject)
 
-#endif
-
 wxTreeCtrl::wxTreeCtrl()
 {
     m_imageListNormal = NULL;

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 351f692cdae41cbc59f24e6a433c999fdff54bc5..adc7372cee78c5949cc692dc0782c57cdd0d3dd8 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -68,8 +68,6 @@ wxWindowMac* gFocusWindow = NULL ;
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
 #endif // __WXUNIVERSAL__/__WXMAC__
 
-#if !USE_SHARED_LIBRARY
-
 BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
   EVT_NC_PAINT(wxWindowMac::OnNcPaint)
   EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
@@ -77,8 +75,6 @@ BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
   EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
 END_EVENT_TABLE()
 
-#endif
-
 #define wxMAC_DEBUG_REDRAW 0
 #ifndef wxMAC_DEBUG_REDRAW
 #define wxMAC_DEBUG_REDRAW 0

diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index ef6b1d6694157041d2a7ee282c6133092f04bc73..61640318f537370eb64c5bf0de86f7a1ff8f94a6 100644 (file)
--- a/src/motif/toolbar.cpp
+++ b/src/motif/toolbar.cpp
@@ -55,9 +55,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
-#endif
 
 // ----------------------------------------------------------------------------
 // private functions

diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index 99e9bc724c69a77179725f700b452a08a90be811..12022f2925225f304a3e095dc153cefdce3d5c3d 100644 (file)
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -219,12 +219,10 @@ private:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARIES
-    IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
-    IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
-    IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
 
 // ============================================================================
 // implementation