cleanup

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

diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm
index 913088dbcaa5071710fc4e9f5fc384e14180648b..b25b47c315100a95b22e2acd26658f28a7ba4975 100755 (executable)
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -41,9 +41,7 @@
 // macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxWebKitCtrl, wxControl)
-#endif
 
 BEGIN_EVENT_TABLE(wxWebKitCtrl, wxControl)
     EVT_SIZE(wxWebKitCtrl::OnSize)

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 2a536b339b5ee95e1c06d15784d5cfb408c3e7b7..e8fc85e903205e44b102a57f393096ad12ff7b66 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -90,14 +90,12 @@ static bool s_inYield = FALSE;
 static bool s_inReceiveEvent = FALSE ;
 static EventTime sleepTime = kEventDurationNoWait ;
 
-#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) ;

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index 727df6679cab0aa67e1d8b9782adbbb0ae0bd0bf..8162e4b6c00e3eaacaee86c320c7b1809ad884fe 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -20,9 +20,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/carbon/button.cpp b/src/mac/carbon/button.cpp
index 4402850171d85bad6e6470ed2530a38f4714c17c..66f2cfdeff2e9f46926f0b3f5c0b015be16941c9 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/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/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index 68577df5d259babd7cd0911b87262b1dc82ce444..380a5ff1a10424cb1826621702ec325fded6859c 100644 (file)
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -19,10 +19,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/choice.cpp b/src/mac/carbon/choice.cpp
index 6d42fc9d8d7182e1f0d3f6bb6988d8b770e50f05..852459a9ff2dbe130c28078fc7602fe68557266b 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/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/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index bea3f01b823cd7caf26898e6655668201d9e1d77..d3664a6d0fe537fb96468fd998397c1eb6c2490f 100644 (file)
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -22,9 +22,7 @@
 
 #if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
-#endif
 
 #include "wx/mac/private.h"
 #ifndef __DARWIN__

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 49cd199d3a21b84a17bde72aaf287635528b31ca..f0ba1ee902391f5e81dc884e828397c17628ee33 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -18,9 +18,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 40caccafc811508aa3f097b668bc2d71ea389a9b..bbc3110dbdb678b3afeabec89c9272cfb7e96275 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -22,9 +22,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/carbon/control.cpp b/src/mac/carbon/control.cpp
index 66c8c8f7c500a1dea40a97c8e25a1ce943c3ce7e..2fc1cfed14b0cf388ae378dee902aacd7eb0974b 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -31,9 +31,7 @@
 #include "wx/sizer.h"
 #include "wx/stattext.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
-#endif
 
 #include "wx/mac/uma.h"
 #include "wx/mac/private.h"

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 78b4e4d3ec46100089f9461a817cf35e1dd6efd3..e3439b8aec662bfeb53d58f646af522cb9c62b7c 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -35,9 +35,8 @@ using namespace std ;
 #include <ATSUnicode.h>
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>
-#if !USE_SHARED_LIBRARY
+
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-#endif
 
 //-----------------------------------------------------------------------------
 // constants

diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp
index cc980ed04e2b62f93e4155f91d8a910c7380e981..7253d6d835650118781eae1b0e896456a63239bf 100755 (executable)
--- a/src/mac/carbon/dccg.cpp
+++ b/src/mac/carbon/dccg.cpp
@@ -40,9 +40,7 @@ using namespace std ;
 #include <FixMath.h>
 #include <CGContext.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 4bb189458d514b85edb527ec142659e05e686e3c..501e99022689fa24fcf7395fda50d4a2acd01f69 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -35,11 +35,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 ba563f3f48d23c96887af357f411184979100ea5..3e23605ef79af14c07c187a3e1d64a84007f165b 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -31,9 +31,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/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 6f7d7142284f6137e1e26cb12accac7dafc64065..3ad0142409f29eff174d3bdd3d01dbe91307868c 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -18,9 +18,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/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 832ff9bc3990b400761c93e9270044542e3e1f7e..830ab7f87538839f4f4a2035ad217d14710bd5ab 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -29,7 +29,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)
@@ -44,8 +43,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/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index 96cbb64de2e8ce0ab35855c93b96427bbcde8ddf..6551422b92c7b9ff65ea80f9cf4c3478fbb6e7b7 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -31,9 +31,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/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index fc125d5921c6787771d420ac20a7d1cc1692b38c..60a898e95ad406d70c0a5abae1f7bcf5d0a71fca 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -27,9 +27,7 @@
   #include "PLStringFuncs.h"
 #endif
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
-#endif
 
 // begin wxmac
 

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index 23f99696b1088b52d9c622dfbac32c496d6da040..14f02f419044743d5dab354f8938c081bc8cca2e 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -41,9 +41,7 @@
 
 #include "wx/mac/fontdlg.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
-#endif
 
 #include "wx/mac/private.h"
 

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 5e1cc74cd934a2444e0d0e3448af4a726e8921cb..749f91198b8a2c8bbbcfa8f9c3c40387cd7fe99f 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -30,7 +30,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)
@@ -40,7 +39,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-#endif
 
 #define WX_MAC_STATUSBAR_HEIGHT 18 
 // ----------------------------------------------------------------------------

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index c10665e40242a286ed494e5b1b31ed83f45218c0..3bfb3e2439460e9d47cc920fcb4014361270a0c1 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -19,9 +19,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/mdi.cpp b/src/mac/carbon/mdi.cpp
index 7ee87f7acda0d67ad69e5320b74300575e616186..dbdc6da93b791b2dae7bb6534aba2033571f20e4 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -27,7 +27,6 @@
 
 extern wxWindowList wxModelessWindows;
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
@@ -41,8 +40,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
   EVT_SCROLL(wxMDIClientWindow::OnScroll)
 END_EVENT_TABLE()
 
-#endif
-
 static const wxChar *TRACE_MDI = _T("mdi");
 
 static const int IDM_WINDOWTILE  = 4001;

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 328ce5605cb346876d65b6e543755893ebe1befd..8cb501104269467e4e2bc2b2eb0e333b876c9c12 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -37,10 +37,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 = -3;

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index 5188955ad40e091e2a1ffbdb049dd66eec554a04..0ee572afc2af99c5e3dc6a82e93d2dc01f36f448 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -28,9 +28,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/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index 04c45ae760ccc944be706035c5598dc638357654..17c04ad0b9b9976f89395c32f56aa1e99bda25d2 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -37,10 +37,8 @@
 
 extern bool wxClipboardIsOpen;
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
-#endif
 
 class wxMetafileRefData: public wxGDIRefData
 {

diff --git a/src/mac/carbon/minifram.cpp b/src/mac/carbon/minifram.cpp
index 5b2561f52b517a382d5e9a6517bb6fdf5288287e..ab9fd1a72957b2f3a7d9ca18c92fd52f2bd676f6 100644 (file)
--- a/src/mac/carbon/minifram.cpp
+++ b/src/mac/carbon/minifram.cpp
@@ -17,8 +17,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 eab75aa85914df3b979f9ad4cb62ac6a92d20c9b..8e89a568090eba59506b4fc1c8c50d85f84d5b60 100644 (file)
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -20,9 +20,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/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index e2c5e5bcf8ec525eccd041b83443ea655357afac..bfccc761a58385483eab41db4a487109df2e8a4a 100644 (file)
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -41,11 +41,9 @@
 
 #include <stdlib.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMacCarbonPrintData, wxPrintNativeDataBase)
 IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase)
-#endif
 
 bool wxMacCarbonPrintData::Ok() const 
 {

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index 07210463af8ebfb808090a9c3f8bae1dccf659e3..e2799918b45a3d004ac7cd82fb81aee5d311ea05 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -28,9 +28,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/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index a370f1aa6de3a3dab7e6843cf56743ce376bddaf..f67e7c68b2be0c7d609b7449689fc6beae2bb1dc 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -19,9 +19,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 a818ee170ab735e9685da2fc801423be9f1698f5..3fb09a1ad27f2c20dae9ec455e599cf55049fe8b 100644 (file)
--- a/src/mac/carbon/region.cpp
+++ b/src/mac/carbon/region.cpp
@@ -18,10 +18,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/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index d1fc32542202514f2617b2a95e108665efdfb491..d2422dd7dcb2804b90cb8fa598401e7d0fe8c4f1 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/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
-
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index a842ded66dc8cc903e1c96b8dbf28ce1aad533d5..b2a8e04737505cd97a893c2f0eb871b3105da2e9 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/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/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index c50ab73d6f5849de0252d347b1bdb784b2284b3a..a4645d88f3f2553bc08d4c8677caa9f03cc991d8 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/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/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 1ebe5ec7658216c81a06f34d59fc288783b6ed1b..9a13660d97dfaa731fe787c786103706f76506f3 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -20,9 +20,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/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index d0e09ff22730205f01fd0cae6ce05fe605acc99b..f4bd92905d414b4dd953973566bba31656dede0d 100644 (file)
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -20,9 +20,7 @@
 #include "wx/statbox.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-#endif
 
 /*
  * Static box

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 6f22db270cb3714cbc107bf980e638242e8bf04f..1feace51808572886519aa0dbb7bb8088570daee 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -28,9 +28,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/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index baa26ddc54c026003b2359a80102fec8d57849ef..a7ef104c04635ac6685da14dd159c1701ffb0efe 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -361,7 +361,6 @@ private :
 
 #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
@@ -380,7 +379,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
 void wxTextCtrl::Init()

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index 5fe0c8428e3488adf4b7db569782728387848192..f7a1a01fd847063bb1d7ad221963fcce229ea505 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -17,9 +17,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/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 9806009b293964f8215c8a915d92e5940592138a..2f4ac0c6a30a49fbdfa63011a7f882241dff1b5c 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -23,13 +23,11 @@
 #include "wx/tabctrl.h"
 #include "wx/bitmap.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_PAINT( wxToolBar::OnPaint ) 
 END_EVENT_TABLE()
-#endif
 
 #include "wx/mac/uma.h"
 #include "wx/geometry.h"

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index ea45c04b31060f794a22ee78ff08d9e66b106b6c..b96fabfdcbb666d076ad8ce47b9ba7a629d94fc9 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -76,8 +76,6 @@ extern wxList wxPendingDelete;
     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)
@@ -89,8 +87,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