From 62f864c32c53356b7228591c85b14abc491c46f0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 28 Jul 2005 22:08:31 +0000 Subject: [PATCH] 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 --- src/cocoa/cursor.mm | 2 -- src/cocoa/font.cpp | 2 -- src/cocoa/gdiobj.cpp | 2 -- src/mac/carbon/accel.cpp | 2 -- src/mac/carbon/brush.cpp | 2 -- src/mac/carbon/colordlgosx.mm | 2 -- src/mac/carbon/combobxc.cpp | 2 -- src/mac/carbon/cursor.cpp | 2 -- src/mac/carbon/data.cpp | 15 --------------- src/mac/carbon/font.cpp | 2 -- src/mac/carbon/fontdlgosx.mm | 2 -- src/mac/carbon/gdiobj.cpp | 2 -- src/mac/carbon/helpxxxx.cpp | 2 -- src/mac/carbon/icon.cpp | 2 -- src/mac/carbon/listbox.cpp | 2 -- src/mac/carbon/palette.cpp | 2 -- src/mac/carbon/pen.cpp | 2 -- src/mac/carbon/treectrl.cpp | 3 --- src/mac/classic/accel.cpp | 2 -- src/mac/classic/app.cpp | 3 --- src/mac/classic/bmpbuttn.cpp | 2 -- src/mac/classic/brush.cpp | 4 +--- src/mac/classic/button.cpp | 2 -- src/mac/classic/checkbox.cpp | 2 -- src/mac/classic/choice.cpp | 2 -- src/mac/classic/colordlg.cpp | 2 -- src/mac/classic/colour.cpp | 2 -- src/mac/classic/combobox.cpp | 2 -- src/mac/classic/control.cpp | 2 -- src/mac/classic/cursor.cpp | 2 -- src/mac/classic/data.cpp | 13 ------------- src/mac/classic/dc.cpp | 3 +-- src/mac/classic/dcclient.cpp | 2 -- src/mac/classic/dcprint.cpp | 2 -- src/mac/classic/dcscreen.cpp | 2 -- src/mac/classic/dialog.cpp | 3 --- src/mac/classic/dirdlg.cpp | 2 -- src/mac/classic/filedlg.cpp | 2 -- src/mac/classic/font.cpp | 2 -- src/mac/classic/fontdlg.cpp | 2 -- src/mac/classic/frame.cpp | 2 -- src/mac/classic/gauge.cpp | 2 -- src/mac/classic/gdiobj.cpp | 2 -- src/mac/classic/helpxxxx.cpp | 2 -- src/mac/classic/icon.cpp | 2 -- src/mac/classic/listbox.cpp | 2 -- src/mac/classic/mdi.cpp | 3 --- src/mac/classic/menu.cpp | 2 -- src/mac/classic/menuitem.cpp | 4 +--- src/mac/classic/metafile.cpp | 2 -- src/mac/classic/minifram.cpp | 4 ---- src/mac/classic/msgdlg.cpp | 2 -- src/mac/classic/palette.cpp | 2 -- src/mac/classic/pen.cpp | 2 -- src/mac/classic/printdlg.cpp | 2 -- src/mac/classic/printmac.cpp | 2 -- src/mac/classic/radiobox.cpp | 2 -- src/mac/classic/radiobut.cpp | 2 -- src/mac/classic/region.cpp | 6 ++---- src/mac/classic/scrolbar.cpp | 3 --- src/mac/classic/slider.cpp | 2 -- src/mac/classic/spinbutt.cpp | 6 ++---- src/mac/classic/statbmp.cpp | 2 -- src/mac/classic/statbox.cpp | 3 --- src/mac/classic/stattext.cpp | 2 -- src/mac/classic/tabctrl.cpp | 2 -- src/mac/classic/textctrl.cpp | 2 -- src/mac/classic/timer.cpp | 2 -- src/mac/classic/toolbar.cpp | 2 -- src/mac/classic/treectrl.cpp | 3 --- src/mac/classic/window.cpp | 4 ---- src/motif/toolbar.cpp | 2 -- src/os2/gdiimage.cpp | 10 ++++------ 73 files changed, 11 insertions(+), 191 deletions(-) diff --git a/src/cocoa/cursor.mm b/src/cocoa/cursor.mm index b8eee50500..2489ea7b06 100644 --- a/src/cocoa/cursor.mm +++ b/src/cocoa/cursor.mm @@ -23,9 +23,7 @@ #import #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 7133060f8f..dbfd161899 100644 --- 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 63697c8354..46b1aa871f 100644 --- 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 69ad642818..a0369c0c48 100644 --- 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 789be90f00..72413a992f 100644 --- 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 13a59e4168..c792d21bff 100644 --- 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 21eb3135c1..a0fad78acd 100644 --- 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 6bb1ff40bc..90e9489def 100644 --- 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 844ac0a4b9..a99992c6aa 100644 --- 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 0a3f6497c2..23d4dfd55f 100644 --- a/src/mac/carbon/font.cpp +++ b/src/mac/carbon/font.cpp @@ -28,9 +28,7 @@ #include #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 d1b741372e..968d740727 100644 --- 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 f0c7133298..ec91782eda 100644 --- 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 e330ce2d79..a20dae3dcf 100644 --- a/src/mac/carbon/helpxxxx.cpp +++ b/src/mac/carbon/helpxxxx.cpp @@ -19,9 +19,7 @@ #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxXXXXHelpController, wxHelpControllerBase) -#endif wxXXXXHelpController::wxXXXXHelpController() { diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp index a3bd7817c1..956d8f72c3 100644 --- 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 38bdecfd01..047c5fd7de 100644 --- 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 adcbb30eba..d6295de46a 100644 --- 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 56130732a9..8edb25bd5b 100644 --- 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 0fa15e39ef..203bef6175 100644 --- 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 14aa88e53a..f2f6863596 100644 --- 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 38d66723aa..f3f0e91e88 100644 --- 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 b1bd49dff0..9039004fff 100644 --- 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 d484314a2c..9313ad10d9 100644 --- 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 912de02fb6..463cec6441 100644 --- 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 ba85d2fe53..aff53815ba 100644 --- 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 f08d6b8a0d..ecd459ed61 100644 --- 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 3c8411319b..bf8c90d0fc 100644 --- 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 86487f7a35..195914413f 100644 --- 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 8562e17e72..1a52315844 100644 --- 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 e63e29d691..af8c5e03a8 100644 --- 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 475c473b91..a5f0b6618c 100644 --- 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 1f0bea00d2..377b125d9a 100644 --- 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 ae7936dd6c..85f559f977 100644 --- a/src/mac/classic/dc.cpp +++ b/src/mac/classic/dc.cpp @@ -32,9 +32,8 @@ using namespace std ; #include #include #include -#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 2718f6ce9b..83d9e2219b 100644 --- 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 85bc466970..f141bf4085 100644 --- 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 03d769a05b..934451ebad 100644 --- 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 6c9646751c..2275c0dd7d 100644 --- 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 0b4c7df195..aecb14a9dc 100644 --- a/src/mac/classic/dirdlg.cpp +++ b/src/mac/classic/dirdlg.cpp @@ -28,9 +28,7 @@ #include #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 59807f398d..95f2fa0c81 100644 --- 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 06e7fa1ca3..de09dd6ed8 100644 --- a/src/mac/classic/font.cpp +++ b/src/mac/classic/font.cpp @@ -25,9 +25,7 @@ #include "wx/mac/private.h" #include -#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 03c894c553..946894667f 100644 --- 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 b56f24712b..c1ae2462ad 100644 --- 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 1225771389..a9c5f87649 100644 --- 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 528c5a7efe..8bd1de31ad 100644 --- 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 7d0e4d1531..5013e8c241 100644 --- a/src/mac/classic/helpxxxx.cpp +++ b/src/mac/classic/helpxxxx.cpp @@ -17,9 +17,7 @@ #include -#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 bd1937bc2a..1c32358a38 100644 --- 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 e68a7f9b72..0d1503df9f 100644 --- 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 bce41781f0..bcd6f85665 100644 --- 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 641183222b..69bf7c24ac 100644 --- a/src/mac/classic/menu.cpp +++ b/src/mac/classic/menu.cpp @@ -35,10 +35,8 @@ // ---------------------- #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif // the (popup) menu title has this special id static const int idMenuTitle = -2; diff --git a/src/mac/classic/menuitem.cpp b/src/mac/classic/menuitem.cpp index 6cc3aa1a79..321023913d 100644 --- 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 594fe43af5..7a2e5d1815 100644 --- 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 6b49b9bdc7..577354b142 100644 --- 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 bcf8f1a499..7e48867ed2 100644 --- 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 60a0de6a8a..63540e9603 100644 --- 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 fea55ab34e..e34afa6a26 100644 --- 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 89f2789250..032a4af478 100644 --- 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 5befe63b86..71b1fd4b3f 100644 --- a/src/mac/classic/printmac.cpp +++ b/src/mac/classic/printmac.cpp @@ -42,10 +42,8 @@ #include -#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 134c08c10c..1c66185893 100644 --- 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 36f7358259..ab3068e02d 100644 --- 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 a3cf8cef7b..de2b062d0d 100644 --- 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 6947803c44..7a08dbf743 100644 --- 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 45aeee3c8a..6e63a83476 100644 --- 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 22e5baa67d..08e6da47fa 100644 --- 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 9bd84f6aa8..978281bf89 100644 --- 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 3ab92b74e4..8bbb53a6b6 100644 --- 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 38c4b1041b..50acd4a904 100644 --- a/src/mac/classic/stattext.cpp +++ b/src/mac/classic/stattext.cpp @@ -24,9 +24,7 @@ #include -#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 4cec805ec2..692507ef0c 100644 --- 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 5713099316..94e8482866 100644 --- 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 26cf3cc150..f7eb84297f 100644 --- 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 15ecb363a9..66fa16cf89 100644 --- 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 7a548a7436..84f84a1b79 100644 --- 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 351f692cda..adc7372cee 100644 --- 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 ef6b1d6694..61640318f5 100644 --- 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 99e9bc724c..12022f2925 100644 --- 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 -- 2.47.2