cleanup

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-10 06:30:03 +00:00
parent fb19fbabbc
commit fd04970ab4
41 changed files with 6 additions and 92 deletions
--- 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)
--- 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) ;
--- 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"
--- 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
--- 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"

--- 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() ;

--- 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__
--- 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

--- 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

--- 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"
--- 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
--- 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
--- 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
--- 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
 {
--- 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()
--- 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;
--- 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,
--- 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

--- 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"

--- 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 
 // ----------------------------------------------------------------------------
--- 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"

--- 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;
--- 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;
--- 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

 // ----------------------------------------------------------------------------
 // wxMenuItem
--- 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
 {
--- 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


--- 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)
--- 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 
 {
--- 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

 //-------------------------------------------------------------------------------------
 //         <20> wxRadioBox()
--- 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"

--- 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

 //-----------------------------------------------------------------------------
 // wxRegionRefData implementation
--- 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,
--- 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
--- 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

 wxSpinButton::wxSpinButton()
   : wxSpinButtonBase()
--- 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
--- 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
--- 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"

--- 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()
--- 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"
--- 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"
--- 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