removed USE_SHARED_LIBRARY(IES)

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

src/os2/accel.cpp

@@ -23,9 +23,7 @@
 #include "wx/os2/private.h"
 
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
-#endif
 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {

src/os2/app.cpp

@@ -107,7 +107,6 @@ MRESULT wxWndProc( HWND
 // wxApp
 // ---------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
     BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
@@ -115,7 +114,6 @@ MRESULT wxWndProc( HWND
         EVT_END_SESSION(wxApp::OnEndSession)
         EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
     END_EVENT_TABLE()
-#endif
 
 //// Initialize
 bool wxApp::Initialize(

src/os2/bitmap.cpp

@@ -34,12 +34,10 @@
 // macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
-#endif
 
 // ============================================================================
 // implementation

src/os2/bmpbuttn.cpp

@@ -19,9 +19,7 @@
 #include "wx/os2/private.h"
 
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-#endif
 
 #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 

src/os2/brush.cpp

@@ -25,9 +25,7 @@
 
 #include "assert.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
-#endif
 
 wxBrushRefData::wxBrushRefData()
 {

src/os2/button.cpp

@@ -23,9 +23,7 @@
 
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-#endif
 
 // Button
 

src/os2/checkbox.cpp

@@ -23,10 +23,8 @@
 // macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
-#endif
 
 // ============================================================================
 // implementation

src/os2/checklst.cpp

@@ -44,9 +44,7 @@
 // implementation
 // ============================================================================
 
-#if !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
-#endif
 
 // ----------------------------------------------------------------------------
 // declaration and implementation of wxCheckListBoxItem class

src/os2/choice.cpp

@@ -20,9 +20,7 @@
 
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-#endif
 
 bool wxChoice::Create(wxWindow *parent,
                       wxWindowID id,

src/os2/colour.cpp

@@ -17,9 +17,7 @@
 #define INCL_PM
 #include<os2.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-#endif
 
 // Colour
 

src/os2/combobox.cpp

@@ -24,9 +24,7 @@
 #include "wx/clipbrd.h"
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-#endif
 
 bool wxComboBox::OS2Command(WXUINT param, WXWORD WXUNUSED(id))
 {

src/os2/control.cpp

@@ -24,13 +24,11 @@
 #include "wx/os2/private.h"
 #include "wx/control.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
     EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
 END_EVENT_TABLE()
-#endif
 
 // Item members
 wxControl::wxControl()

src/os2/cursor.cpp

@@ -26,9 +26,7 @@
 
 #include "assert.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
-#endif
 
 wxCursorRefData::wxCursorRefData(void)
 {

src/os2/dc.cpp

@@ -31,9 +31,7 @@
 
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-#endif
 
 // ---------------------------------------------------------------------------
 // constants

src/os2/dcclient.cpp

@@ -54,11 +54,9 @@ WX_DEFINE_OBJARRAY(wxArrayDCInfo);
 // macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
     IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
     IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
-#endif
 
 // ----------------------------------------------------------------------------
 // global variables

src/os2/dcmemory.cpp

@@ -20,9 +20,7 @@
 
 #include "wx/dcmemory.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
-#endif
 
 /*
  * Memory DC

src/os2/dcprint.cpp

@@ -27,9 +27,7 @@
 #include "wx/dcprint.h"
 #include "math.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
-#endif
 
 
 // This form is deprecated

src/os2/dcscreen.cpp

@@ -26,9 +26,7 @@
 
 #include "wx/dcscreen.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
-#endif
 
 // Create a DC representing the whole screen
 wxScreenDC::wxScreenDC()

src/os2/dialog.cpp

@@ -34,7 +34,6 @@ wxWindowList wxModalDialogs;
 wxWindowList wxModelessWindows;  // Frames and modeless dialogs
 extern wxList WXDLLEXPORT wxPendingDelete;
 
-#if !USE_SHARED_LIBRARY
    IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
 
    BEGIN_EVENT_TABLE(wxDialog, wxPanel)
@@ -46,7 +45,6 @@ extern wxList WXDLLEXPORT wxPendingDelete;
       EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
       EVT_CLOSE(wxDialog::OnCloseWindow)
    END_EVENT_TABLE()
-#endif
 
 wxDialog::wxDialog()
 {

src/os2/dirdlg.cpp

@@ -30,9 +30,7 @@
 #define wxDIALOG_DEFAULT_X 300
 #define wxDIALOG_DEFAULT_Y 300
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
-#endif
 
 wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultPath,

src/os2/filedlg.cpp

@@ -36,9 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxFileDialog, wxDialog)
-#endif
 
 wxString wxFileSelector( const char* title
                         ,const char* defaultDir

src/os2/font.cpp

@@ -31,13 +31,11 @@
 
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARIES
     IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
     #if wxUSE_PORTABLE_FONTS_IN_MSW
         IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
     #endif
-#endif
 
 // ----------------------------------------------------------------------------
 // wxFontRefData - the internal description of the font

src/os2/fontdlg.cpp

@@ -35,9 +35,7 @@
 #define wxDIALOG_DEFAULT_X 300
 #define wxDIALOG_DEFAULT_Y 300
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
-#endif
 
 /*
  * wxFontDialog

src/os2/frame.cpp

@@ -49,14 +49,12 @@ extern wxMenu *wxCurrentPopupMenu;
 // event tables
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_ACTIVATE(wxFrame::OnActivate)
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-#endif
 
 // ============================================================================
 // implementation

src/os2/gauge.cpp

@@ -48,9 +48,7 @@
 /* public function prototypes */
 // BOOL _Optlink gaugeInit(HINSTANCE hInstance);
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-#endif
 
 bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            int range,

src/os2/gdiobj.cpp

@@ -13,8 +13,6 @@
 
 #include "wx/gdiobj.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
-#endif
 
 // TODO: Nothing to do, unless you want to.

src/os2/helpwin.cpp

@@ -28,9 +28,7 @@
 // MAX length of Help descriptor
 #define _MAX_HELP_LEN 500
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
-#endif
 
 wxWinHelpController::wxWinHelpController()
 {

src/os2/icon.cpp

@@ -29,9 +29,7 @@
 
 #include "wx/icon.h"
 
-#if !USE_SHARED_LIBRARIES
     IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
-#endif
 
 // ============================================================================
 // implementation

src/os2/listbox.cpp

@@ -34,9 +34,7 @@
     #include  "wx/ownerdrw.h"
 #endif
 
-#if !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
-#endif
 
 // ============================================================================
 // list box item declaration and implementation

src/os2/mdi.cpp

@@ -93,11 +93,9 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
 // wxWin macros
 // ---------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
     IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
     IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
-#endif // USE_SHARED_LIBRARY
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     EVT_SIZE(wxMDIParentFrame::OnSize)

src/os2/menu.cpp

@@ -46,10 +46,8 @@ static const int idMenuTitle = -2;
 // macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
     IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
-#endif
 
 // ============================================================================
 // implementation

src/os2/metafile.cpp

@@ -32,10 +32,8 @@
 
 extern bool wxClipboardIsOpen;
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
-#endif
 
 /*
  * Metafiles

src/os2/minifram.cpp

@@ -24,7 +24,5 @@
 
 #include "wx/minifram.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
-#endif
 

src/os2/msgdlg.cpp

@@ -29,9 +29,7 @@
 #define wxDIALOG_DEFAULT_X 300
 #define wxDIALOG_DEFAULT_Y 300
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
-#endif
 
 wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption,
         long style, const wxPoint& pos)

src/os2/notebook.cpp

@@ -56,7 +56,6 @@
 // event table
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARIES
   BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
     EVT_SIZE(wxNotebook::OnSize)
@@ -66,7 +65,6 @@
 
   IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
   IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
-#endif
 
 // ============================================================================
 // implementation

src/os2/palette.cpp

@@ -24,9 +24,7 @@
 
 #include "assert.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
-#endif
 
 /*
  * Palette

src/os2/pen.cpp

@@ -24,9 +24,7 @@
 #include "wx/os2/private.h"
 #include "assert.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
-#endif
 
 wxPenRefData::wxPenRefData()
 {

src/os2/print.cpp

@@ -23,10 +23,8 @@
 #include "wx/os2/print.h"
 #include "wx/generic/prntdlgg.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)
-#endif
 
 /*
  * Printer

src/os2/radiobox.cpp

@@ -22,9 +22,7 @@
 
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
-#endif
 
 // ---------------------------------------------------------------------------
 // private functions

src/os2/radiobut.cpp

@@ -25,10 +25,8 @@
 
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)
-#endif
 
 bool wxRadioButton::OS2Command(WXUINT param, WXWORD id)
 {

src/os2/region.cpp

@@ -18,10 +18,8 @@
 #include "wx/window.h"
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 	IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
 	IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
-#endif
 
 //-----------------------------------------------------------------------------
 // wxRegionRefData implementation

src/os2/scrolbar.cpp

@@ -20,7 +20,6 @@
 #include "wx/scrolbar.h"
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
@@ -29,7 +28,6 @@ BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 #endif
 END_EVENT_TABLE()
 
-#endif
 
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,

src/os2/slider.cpp

@@ -25,9 +25,7 @@
 #include "wx/slider.h"
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-#endif
 
 // Slider
 wxSlider::wxSlider()

src/os2/spinbutt.cpp

@@ -32,9 +32,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-#endif
 
 bool wxSpinButton::Create(
   wxWindow*                         parent

src/os2/spinctrl.cpp

@@ -33,9 +33,7 @@
 // macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
-#endif
 
 // ----------------------------------------------------------------------------
 // constants

src/os2/statbmp.cpp

@@ -26,9 +26,7 @@
 // macors
 // ---------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-#endif
 
 // ---------------------------------------------------------------------------
 //  wxStaticBitmap

src/os2/statbox.cpp

@@ -22,14 +22,12 @@
 
 #include "wx/statbox.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
     EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
 END_EVENT_TABLE()
 
-#endif
 
 /*
  * Group box

src/os2/stattext.cpp

@@ -22,9 +22,7 @@
 #include "wx/os2/private.h"
 #include <stdio.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
 
 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,

src/os2/tabctrl.cpp

@@ -27,12 +27,10 @@
 #include "wx/os2/private.h"
 #include "wx/generic/imaglist.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
 END_EVENT_TABLE()
-#endif
 
 wxTabCtrl::wxTabCtrl()
 {

src/os2/taskbar.cpp

@@ -36,7 +36,6 @@ bool   wxTaskBarIcon::sm_registeredClass = FALSE;
 UINT   wxTaskBarIcon::sm_taskbarMsg = 0;
 
 
-#if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
     EVT_TASKBAR_MOVE         (wxTaskBarIcon::_OnMouseMove)
     EVT_TASKBAR_LEFT_DOWN    (wxTaskBarIcon::_OnLButtonDown)
@@ -48,7 +47,6 @@ BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
-#endif
 
 
 wxTaskBarIcon::wxTaskBarIcon(void)

src/os2/textctrl.cpp

@@ -43,7 +43,6 @@
 #   include <fstream>
 #endif
 
-#if !USE_SHARED_LIBRARY
 
 // ----------------------------------------------------------------------------
 // event tables and other macros
@@ -68,7 +67,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 END_EVENT_TABLE()
 
-#endif // USE_SHARED_LIBRARY
 
 // ============================================================================
 // implementation

src/os2/timer.cpp

@@ -42,9 +42,7 @@ ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
 // macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
-#endif
 
 wxTimer::wxTimer()
 {

src/os2/toolbar.cpp

@@ -51,9 +51,7 @@ NM_CUSTOMDRAW message and do your custom drawing.
 #define DEFAULTBUTTONY   24
 #define DEFAULTBARHEIGHT 27
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
-#endif
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)

src/os2/window.cpp

@@ -109,9 +109,7 @@ wxWindow *wxFindWinFromHandle(WXHWND hWnd);
 // event tables
 // ---------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-#endif
 
 BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
     EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)