Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

removed USE_SHARED_LIBRARY(IES)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-12-14 23:57:30 +00:00
parent fed628b632
commit ad81651f00
444 changed files with 4 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/cmndata.cpp
View File

@@ -72,7 +72,6 @@
#endif #endif
#endif // MSW #endif // MSW
#if !USE_SHARED_LIBRARY
#if wxUSE_PRINTING_ARCHITECTURE #if wxUSE_PRINTING_ARCHITECTURE
IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
@@ -80,7 +79,6 @@
#endif // wxUSE_PRINTING_ARCHITECTURE #endif // wxUSE_PRINTING_ARCHITECTURE
IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
#endif
#ifdef __WXMAC__ #ifdef __WXMAC__
#define mm2pt 2.83464566929 #define mm2pt 2.83464566929

2
src/common/date.cpp
View File

@@ -54,9 +54,7 @@ static const wxChar *mname[] = {
static int GauDays[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; static int GauDays[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
#endif
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Constructors // Constructors

2
src/common/docview.cpp
View File

@@ -76,7 +76,6 @@
// wxWindows macros // wxWindows macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler) IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler) IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
@@ -91,7 +90,6 @@
IMPLEMENT_CLASS(wxCommand, wxObject) IMPLEMENT_CLASS(wxCommand, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// function prototypes // function prototypes

2
src/common/event.cpp
View File

@@ -50,7 +50,6 @@
// wxWin macros // wxWin macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
@@ -94,7 +93,6 @@
const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
{ { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } }; { { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } };
#endif // !USE_SHARED_LIBRARY
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// global variables // global variables

2
src/common/filefn.cpp
View File

@@ -122,9 +122,7 @@ extern wxChar *wxBuffer;
#include "fspcompa.h" #include "fspcompa.h"
#endif #endif
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// private globals // private globals

2
src/common/ftp.cpp
View File

@@ -48,10 +48,8 @@
#define FTP_BSIZE 1024 #define FTP_BSIZE 1024
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol) IMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol)
IMPLEMENT_PROTOCOL(wxFTP, wxT("ftp"), wxT("ftp"), TRUE) IMPLEMENT_PROTOCOL(wxFTP, wxT("ftp"), wxT("ftp"), TRUE)
#endif
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
////// wxFTP constructor and destructor //////////////////////// ////// wxFTP constructor and destructor ////////////////////////

2
src/common/gdicmn.cpp
View File

@@ -50,7 +50,6 @@
#endif #endif
#endif #endif
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxColourDatabase, wxList) IMPLEMENT_CLASS(wxColourDatabase, wxList)
IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList) IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList) IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
@@ -59,7 +58,6 @@
IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList) IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
#endif
wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight) wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
{ {

2
src/common/hash.cpp
View File

@@ -29,9 +29,7 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
#endif
wxHashTable::wxHashTable (int the_key_type, int size) wxHashTable::wxHashTable (int the_key_type, int size)
{ {

2
src/common/helpbase.cpp
View File

@@ -28,8 +28,6 @@
#if wxUSE_HELP #if wxUSE_HELP
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxHelpControllerBase, wxObject) IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)
#endif
#endif // wxUSE_HELP #endif // wxUSE_HELP

2
src/common/http.cpp
View File

@@ -32,10 +32,8 @@
#include "wx/protocol/http.h" #include "wx/protocol/http.h"
#include "wx/sckstrm.h" #include "wx/sckstrm.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol) IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE) IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE)
#endif
#define HTTP_BSIZE 2048 #define HTTP_BSIZE 2048

2
src/common/imagbmp.cpp
View File

@@ -46,9 +46,7 @@
// wxBMPHandler // wxBMPHandler
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler) IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
#endif
#if wxUSE_STREAMS #if wxUSE_STREAMS

4
src/common/image.cpp
View File

@@ -81,9 +81,7 @@ wxList wxImage::sm_handlers;
#define M_IMGDATA ((wxImageRefData *)m_refData) #define M_IMGDATA ((wxImageRefData *)m_refData)
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
#endif
wxImage::wxImage() wxImage::wxImage()
{ {
@@ -659,9 +657,7 @@ void wxImage::CleanUpHandlers()
// wxImageHandler // wxImageHandler
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARIES
IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject) IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
#endif
#if wxUSE_STREAMS #if wxUSE_STREAMS
bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) ) bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) )

2
src/common/imaggif.cpp
View File

@@ -31,9 +31,7 @@
#include "wx/log.h" #include "wx/log.h"
#include "wx/intl.h" #include "wx/intl.h"
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler) IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxGIFHandler // wxGIFHandler

2
src/common/imagjpeg.cpp
View File

@@ -56,9 +56,7 @@ extern "C"
// wxJPEGHandler // wxJPEGHandler
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler) IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler)
#endif
#if wxUSE_STREAMS #if wxUSE_STREAMS

2
src/common/imagpcx.cpp
View File

@@ -380,9 +380,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
// wxPCXHandler // wxPCXHandler
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler) IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
#endif
bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) ) bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
{ {

2
src/common/imagpng.cpp
View File

@@ -53,9 +53,7 @@
// wxPNGHandler // wxPNGHandler
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
#endif
#if wxUSE_LIBPNG #if wxUSE_LIBPNG

2
src/common/imagpnm.cpp
View File

@@ -34,9 +34,7 @@
// wxBMPHandler // wxBMPHandler
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler) IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
#endif
#if wxUSE_STREAMS #if wxUSE_STREAMS

2
src/common/imagtiff.cpp
View File

@@ -43,9 +43,7 @@ extern "C"
// wxTIFFHandler // wxTIFFHandler
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler) IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
#endif
static tsize_t static tsize_t
_tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size) _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)

2
src/common/ipcbase.cpp
View File

@@ -26,10 +26,8 @@
#include "wx/ipcbase.h" #include "wx/ipcbase.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxServerBase, wxObject) IMPLEMENT_CLASS(wxServerBase, wxObject)
IMPLEMENT_CLASS(wxClientBase, wxObject) IMPLEMENT_CLASS(wxClientBase, wxObject)
IMPLEMENT_CLASS(wxConnectionBase, wxObject) IMPLEMENT_CLASS(wxConnectionBase, wxObject)
#endif

2
src/common/layout.cpp
View File

@@ -44,10 +44,8 @@
#include "wx/layout.h" #include "wx/layout.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject)
#endif
wxIndividualLayoutConstraint::wxIndividualLayoutConstraint() wxIndividualLayoutConstraint::wxIndividualLayoutConstraint()

2
src/common/object.cpp
View File

@@ -44,11 +44,9 @@
#include "wx/ioswrap.h" #include "wx/ioswrap.h"
#endif #endif
#if !USE_SHARED_LIBRARY
wxClassInfo wxObject::sm_classwxObject((wxChar *) wxT("wxObject"), (wxChar *) NULL, (wxChar *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL); wxClassInfo wxObject::sm_classwxObject((wxChar *) wxT("wxObject"), (wxChar *) NULL, (wxChar *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL; wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL;
wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL; wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
#endif
/* /*
* wxWindows root object. * wxWindows root object.

2
src/common/odbc.cpp
View File

@@ -51,12 +51,10 @@
HENV wxDatabase::hEnv = 0; HENV wxDatabase::hEnv = 0;
int wxDatabase::refCount = 0; int wxDatabase::refCount = 0;
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxDatabase, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxDatabase, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxQueryCol, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxQueryCol, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxQueryField, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxQueryField, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxRecordSet, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxRecordSet, wxObject)
#endif
wxDatabase::wxDatabase(void) wxDatabase::wxDatabase(void)
{ {

2
src/common/paper.cpp
View File

@@ -45,10 +45,8 @@
#endif #endif
// End __WXMSW__ // End __WXMSW__
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList) IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)
#endif
/* /*
* Paper size database for all platforms * Paper size database for all platforms

2
src/common/prntbase.cpp
View File

@@ -55,7 +55,6 @@
#endif #endif
#endif // __WXMSW__ #endif // __WXMSW__
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxPrinterBase, wxObject) IMPLEMENT_CLASS(wxPrinterBase, wxObject)
IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow) IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
@@ -71,7 +70,6 @@ BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
EVT_PAINT(wxPreviewCanvas::OnPaint) EVT_PAINT(wxPreviewCanvas::OnPaint)
EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged) EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
/* /*
* Printer * Printer

2
src/common/protocol.cpp
View File

@@ -128,9 +128,7 @@ public:
void OnExit(); void OnExit();
}; };
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule) IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule)
#endif
bool wxProtocolModule::OnInit() bool wxProtocolModule::OnInit()
{ {

2
src/common/resource.cpp
View File

@@ -119,10 +119,8 @@ void wxLogWarning(char *msg)
wxMessageBox(msg, _("Warning"), wxOK); wxMessageBox(msg, _("Warning"), wxOK);
} }
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable) IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
#endif
wxItemResource::wxItemResource() wxItemResource::wxItemResource()
{ {

2
src/common/sckaddr.cpp
View File

@@ -37,7 +37,6 @@
#include "wx/gsocket.h" #include "wx/gsocket.h"
#include "wx/sckaddr.h" #include "wx/sckaddr.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress) IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
@@ -46,7 +45,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
#ifdef __UNIX__ #ifdef __UNIX__
IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
#endif #endif
#endif
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// wxIPV4address // wxIPV4address

2
src/common/sckfile.cpp
View File

@@ -27,10 +27,8 @@
#include "wx/wfstream.h" #include "wx/wfstream.h"
#include "wx/protocol/file.h" #include "wx/protocol/file.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol) IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, FALSE) IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, FALSE)
#endif
wxFileProto::wxFileProto() wxFileProto::wxFileProto()
: wxProtocol() : wxProtocol()

2
src/common/sckipc.cpp
View File

@@ -35,11 +35,9 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase) IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase) IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)
IMPLEMENT_DYNAMIC_CLASS(wxTCPConnection, wxConnectionBase) IMPLEMENT_DYNAMIC_CLASS(wxTCPConnection, wxConnectionBase)
#endif
// It seems to be already defined somewhere in the Xt includes. // It seems to be already defined somewhere in the Xt includes.
#ifndef __XT__ #ifndef __XT__

2
src/common/serbase.cpp
View File

@@ -32,10 +32,8 @@
IMPLEMENT_DYNAMIC_CLASS(wxObject_Serialize,wxObject) IMPLEMENT_DYNAMIC_CLASS(wxObject_Serialize,wxObject)
#if !USE_SHARED_LIBRARY
IMPLEMENT_SERIAL_CLASS(wxList, wxObject) IMPLEMENT_SERIAL_CLASS(wxList, wxObject)
IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject) IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject)
#endif
void WXSERIAL(wxList)::StoreObject(wxObjectOutputStream& s) void WXSERIAL(wxList)::StoreObject(wxObjectOutputStream& s)
{ {

2
src/common/socket.cpp
View File

@@ -57,12 +57,10 @@
// -------------------------------------------------------------- // --------------------------------------------------------------
// ClassInfos // ClassInfos
// -------------------------------------------------------------- // --------------------------------------------------------------
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxSocketBase, wxObject) IMPLEMENT_CLASS(wxSocketBase, wxObject)
IMPLEMENT_CLASS(wxSocketServer, wxSocketBase) IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
IMPLEMENT_CLASS(wxSocketClient, wxSocketBase) IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
#endif
class wxSocketState : public wxObject class wxSocketState : public wxObject
{ {

2
src/common/tbarbase.cpp
View File

@@ -35,7 +35,6 @@
#include "wx/tbarbase.h" #include "wx/tbarbase.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxToolBarBase, wxControl) IMPLEMENT_ABSTRACT_CLASS(wxToolBarBase, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool, wxObject)
@@ -44,7 +43,6 @@ BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
EVT_SIZE(wxToolBarBase::OnSize) EVT_SIZE(wxToolBarBase::OnSize)
EVT_IDLE(wxToolBarBase::OnIdle) EVT_IDLE(wxToolBarBase::OnIdle)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
// Keep a list of all toolbars created, so you can tell whether a toolbar // Keep a list of all toolbars created, so you can tell whether a toolbar
// is still valid: a tool may have quit the toolbar. // is still valid: a tool may have quit the toolbar.

2
src/common/tbarsmpl.cpp
View File

@@ -31,7 +31,6 @@
#include "wx/tbarsmpl.h" #include "wx/tbarsmpl.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase) IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase) BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
@@ -40,7 +39,6 @@ BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
EVT_KILL_FOCUS(wxToolBarSimple::OnKillFocus) EVT_KILL_FOCUS(wxToolBarSimple::OnKillFocus)
EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent) EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
wxToolBarSimple::wxToolBarSimple(void) wxToolBarSimple::wxToolBarSimple(void)
{ {

2
src/common/time.cpp
View File

@@ -45,9 +45,7 @@ seconds since January 1, 1901, GMT.
#include <string.h> #include <string.h>
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
#endif
extern bool wxGetLocalTime(long *timeZone, int *dstObserved); extern bool wxGetLocalTime(long *timeZone, int *dstObserved);

2
src/common/url.cpp
View File

@@ -28,10 +28,8 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/url.h" #include "wx/url.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxProtoInfo, wxObject) IMPLEMENT_CLASS(wxProtoInfo, wxObject)
IMPLEMENT_CLASS(wxURL, wxObject) IMPLEMENT_CLASS(wxURL, wxObject)
#endif
// Protocols list // Protocols list
wxProtoInfo *wxURL::g_protocols = NULL; wxProtoInfo *wxURL::g_protocols = NULL;

2
src/common/validate.cpp
View File

@@ -34,9 +34,7 @@
const wxValidator wxDefaultValidator; const wxValidator wxDefaultValidator;
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
#endif
// VZ: personally, I think TRUE would be more appropriate - these bells are // VZ: personally, I think TRUE would be more appropriate - these bells are
// _annoying_ // _annoying_

2
src/common/valtext.cpp
View File

@@ -40,13 +40,11 @@
#include <clib.h> #include <clib.h>
#endif #endif
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator) IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
BEGIN_EVENT_TABLE(wxTextValidator, wxValidator) BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
EVT_CHAR(wxTextValidator::OnChar) EVT_CHAR(wxTextValidator::OnChar)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
static bool wxIsNumeric(const wxString& val); static bool wxIsNumeric(const wxString& val);

2
src/common/wxexpr.cpp
View File

@@ -800,9 +800,7 @@ void wxExpr::WriteExpr(FILE* stream) // Write as any other subexpression
* wxExpr 'database' (list of expressions) * wxExpr 'database' (list of expressions)
*/ */
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList) IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList)
#endif
wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler) wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler)
{ {

2
src/generic/choicdgg.cpp
View File

@@ -156,14 +156,12 @@ int wxGetMultipleChoice(const wxString& message, const wxString& caption,
// wxSingleChoiceDialog // wxSingleChoiceDialog
#if !USE_SHARED_LIBRARY
BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog) BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK) EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick) EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog) IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog)
#endif
#if defined(__WXMSW__) || defined(__WXMAC__) #if defined(__WXMSW__) || defined(__WXMAC__)
#define wxCHOICEDLG_DIALOG_STYLE (wxDEFAULT_DIALOG_STYLE | \ #define wxCHOICEDLG_DIALOG_STYLE (wxDEFAULT_DIALOG_STYLE | \

2
src/generic/colrdlgg.cpp
View File

@@ -41,7 +41,6 @@
#include "wx/generic/colrdlgg.h" #include "wx/generic/colrdlgg.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog) IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog) BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
@@ -54,7 +53,6 @@ BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
EVT_CLOSE(wxGenericColourDialog::OnCloseWindow) EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
/* /*
* Generic wxColourDialog * Generic wxColourDialog

2
src/generic/dcpsg.cpp
View File

@@ -2156,10 +2156,8 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
wxPrintSetupData *wxThePrintSetupData = (wxPrintSetupData *) NULL; wxPrintSetupData *wxThePrintSetupData = (wxPrintSetupData *) NULL;
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject)
#endif
// Redundant now I think // Redundant now I think
#if 1 #if 1

4
src/generic/dirdlgg.cpp
View File

@@ -359,11 +359,7 @@ void wxDirCtrl::OnCollapseItem(wxTreeEvent &event )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxDirDialog, wxDialog)
#else
IMPLEMENT_DYNAMIC_CLASS( wxDirDialog, wxDialog ) IMPLEMENT_DYNAMIC_CLASS( wxDirDialog, wxDialog )
#endif
BEGIN_EVENT_TABLE( wxDirDialog, wxDialog ) BEGIN_EVENT_TABLE( wxDirDialog, wxDialog )
EVT_TREE_KEY_DOWN (ID_DIRCTRL, wxDirDialog::OnTreeKeyDown) EVT_TREE_KEY_DOWN (ID_DIRCTRL, wxDirDialog::OnTreeKeyDown)

2
src/generic/fontdlgg.cpp
View File

@@ -40,7 +40,6 @@
#include "wx/cmndata.h" #include "wx/cmndata.h"
#include "wx/generic/fontdlgg.h" #include "wx/generic/fontdlgg.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog) IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog)
BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog) BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
@@ -54,7 +53,6 @@ BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
EVT_CLOSE(wxGenericFontDialog::OnCloseWindow) EVT_CLOSE(wxGenericFontDialog::OnCloseWindow)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
#define NUM_COLS 48 #define NUM_COLS 48
static wxString wxColourDialogNames[NUM_COLS]={wxT("ORANGE"), static wxString wxColourDialogNames[NUM_COLS]={wxT("ORANGE"),

2
src/generic/helpxlp.cpp
View File

@@ -53,7 +53,6 @@
#include "wx/generic/helpxlp.h" #include "wx/generic/helpxlp.h"
#if !USE_SHARED_LIBRARY
#ifdef __WXMSW__ #ifdef __WXMSW__
IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient) IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)
@@ -64,7 +63,6 @@ IMPLEMENT_CLASS(wxXLPHelpConnection, wxTCPConnection)
#endif #endif
IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase) IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase)
#endif
// suppress annoying warning "'this' used in base member init list" (so what?) // suppress annoying warning "'this' used in base member init list" (so what?)
#ifdef __VISUALC__ #ifdef __VISUALC__

2
src/generic/msgdlgg.cpp
View File

@@ -46,7 +46,6 @@
// icons // icons
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog) BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes) EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo) EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
@@ -54,7 +53,6 @@ BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog) IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
#endif
wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
const wxString& message, const wxString& message,

2
src/generic/notebook.cpp
View File

@@ -45,7 +45,6 @@
// event table // event table
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARIES
BEGIN_EVENT_TABLE(wxNotebook, wxControl) BEGIN_EVENT_TABLE(wxNotebook, wxControl)
EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
EVT_SIZE(wxNotebook::OnSize) EVT_SIZE(wxNotebook::OnSize)
@@ -58,7 +57,6 @@ END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
#endif
// ============================================================================ // ============================================================================
// implementation // implementation

2
src/generic/panelg.cpp
View File

@@ -29,7 +29,6 @@
#include "wx/generic/panelg.h" #include "wx/generic/panelg.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
BEGIN_EVENT_TABLE(wxPanel, wxWindow) BEGIN_EVENT_TABLE(wxPanel, wxWindow)
@@ -39,7 +38,6 @@ BEGIN_EVENT_TABLE(wxPanel, wxWindow)
EVT_SIZE(wxPanel::OnSize) EVT_SIZE(wxPanel::OnSize)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
void wxPanel::Init() void wxPanel::Init()
{ {

2
src/generic/printps.cpp
View File

@@ -54,10 +54,8 @@
// wxWin macros // wxWin macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase) IMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase)
IMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase) IMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase)
#endif
// ============================================================================ // ============================================================================
// implementation // implementation

2
src/generic/prntdlgg.cpp
View File

@@ -73,7 +73,6 @@
// wxWin macros // wxWin macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
#if wxUSE_POSTSCRIPT #if wxUSE_POSTSCRIPT
@@ -92,7 +91,6 @@
BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog) BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxDialog)
EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter) EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif // USE_SHARED_LIBRARY
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// global vars // global vars

2
src/generic/progdlgg.cpp
View File

@@ -64,14 +64,12 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label);
// event tables // event tables
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog) BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel) EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
EVT_CLOSE(wxProgressDialog::OnClose) EVT_CLOSE(wxProgressDialog::OnClose)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_CLASS(wxProgressDialog, wxDialog) IMPLEMENT_CLASS(wxProgressDialog, wxDialog)
#endif
// ============================================================================ // ============================================================================
// implementation // implementation

2
src/generic/sashwin.cpp
View File

@@ -36,7 +36,6 @@
#include "wx/sashwin.h" #include "wx/sashwin.h"
#include "wx/laywin.h" #include "wx/laywin.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow)
IMPLEMENT_DYNAMIC_CLASS(wxSashEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxSashEvent, wxCommandEvent)
@@ -45,7 +44,6 @@ BEGIN_EVENT_TABLE(wxSashWindow, wxWindow)
EVT_SIZE(wxSashWindow::OnSize) EVT_SIZE(wxSashWindow::OnSize)
EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent) EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
wxSashWindow::wxSashWindow() wxSashWindow::wxSashWindow()
{ {

2
src/generic/scrolwin.cpp
View File

@@ -27,7 +27,6 @@
#include "wx/generic/scrolwin.h" #include "wx/generic/scrolwin.h"
#include "wx/panel.h" #include "wx/panel.h"
#if !USE_SHARED_LIBRARY
BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel) BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel)
EVT_SCROLLWIN(wxScrolledWindow::OnScroll) EVT_SCROLLWIN(wxScrolledWindow::OnScroll)
EVT_SIZE(wxScrolledWindow::OnSize) EVT_SIZE(wxScrolledWindow::OnSize)
@@ -35,7 +34,6 @@ BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel) IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
#endif
#ifdef __WXMSW__ #ifdef __WXMSW__
#include "windows.h" #include "windows.h"

2
src/generic/splitter.cpp
View File

@@ -33,7 +33,6 @@
#include "wx/dcscreen.h" #include "wx/dcscreen.h"
#include "wx/settings.h" #include "wx/settings.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent)
@@ -50,7 +49,6 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
EVT_SPLITTER_DCLICK(-1, wxSplitterWindow::OnDoubleClick) EVT_SPLITTER_DCLICK(-1, wxSplitterWindow::OnDoubleClick)
EVT_SPLITTER_UNSPLIT(-1, wxSplitterWindow::OnUnsplitEvent) EVT_SPLITTER_UNSPLIT(-1, wxSplitterWindow::OnUnsplitEvent)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
wxSplitterWindow::wxSplitterWindow() wxSplitterWindow::wxSplitterWindow()
{ {

2
src/generic/statusbr.cpp
View File

@@ -34,14 +34,12 @@
#include "wx/msw/winundef.h" #include "wx/msw/winundef.h"
#endif #endif
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
BEGIN_EVENT_TABLE(wxStatusBar, wxWindow) BEGIN_EVENT_TABLE(wxStatusBar, wxWindow)
EVT_PAINT(wxStatusBar::OnPaint) EVT_PAINT(wxStatusBar::OnPaint)
EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged) EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
// Default status border dimensions // Default status border dimensions
#define wxTHICK_LINE_BORDER 2 #define wxTHICK_LINE_BORDER 2

2
src/generic/textdlgg.cpp
View File

@@ -60,13 +60,11 @@ static const int wxID_TEXT = 3000;
// wxTextEntryDialog // wxTextEntryDialog
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog) BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK) EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog) IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
#endif
wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
const wxString& message, const wxString& message,

2
src/gtk/gdiobj.cpp
View File

@@ -13,7 +13,5 @@
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
#endif

2
src/gtk/treegtk.cpp
View File

@@ -75,10 +75,8 @@ static void gtk_treeitem_select_callback(GtkWidget *widget, wxTreeItemId *treeit
owner->SendSelChanged(GTK_TREE_ITEM(widget)); owner->SendSelChanged(GTK_TREE_ITEM(widget));
} }
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
#endif
void wxTreeCtrl::Init() { void wxTreeCtrl::Init() {
m_imageListNormal = NULL; m_imageListNormal = NULL;

2
src/gtk1/gdiobj.cpp
View File

@@ -13,7 +13,5 @@
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
#endif

2
src/gtk1/treegtk.cpp
View File

@@ -75,10 +75,8 @@ static void gtk_treeitem_select_callback(GtkWidget *widget, wxTreeItemId *treeit
owner->SendSelChanged(GTK_TREE_ITEM(widget)); owner->SendSelChanged(GTK_TREE_ITEM(widget));
} }
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
#endif
void wxTreeCtrl::Init() { void wxTreeCtrl::Init() {
m_imageListNormal = NULL; m_imageListNormal = NULL;

2
src/mac/accel.cpp
View File

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

2
src/mac/app.cpp
View File

@@ -52,12 +52,10 @@ extern wxList *wxWinMacControlList;
wxApp *wxTheApp = NULL; wxApp *wxTheApp = NULL;
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
EVT_IDLE(wxApp::OnIdle) EVT_IDLE(wxApp::OnIdle)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
const short kMacMinHeap = (29 * 1024) ; const short kMacMinHeap = (29 * 1024) ;

2
src/mac/bitmap.cpp
View File

@@ -25,10 +25,8 @@ extern "C"
#include "xpm.h" #include "xpm.h"
} ; } ;
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
#endif
#include <PictUtils.h> #include <PictUtils.h>

2
src/mac/bmpbuttn.cpp
View File

@@ -15,9 +15,7 @@
#include "wx/bmpbuttn.h" #include "wx/bmpbuttn.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
#endif
#include <wx/mac/uma.h> #include <wx/mac/uma.h>

2
src/mac/brush.cpp
View File

@@ -17,9 +17,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/brush.h" #include "wx/brush.h"
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
#endif
wxBrushRefData::wxBrushRefData() wxBrushRefData::wxBrushRefData()
{ {

2
src/mac/button.cpp
View File

@@ -15,9 +15,7 @@
#include "wx/button.h" #include "wx/button.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
#endif
#include <wx/mac/uma.h> #include <wx/mac/uma.h>
// Button // Button

2
src/mac/carbon/accel.cpp
View File

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

2
src/mac/carbon/app.cpp
View File

@@ -52,12 +52,10 @@ extern wxList *wxWinMacControlList;
wxApp *wxTheApp = NULL; wxApp *wxTheApp = NULL;
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
EVT_IDLE(wxApp::OnIdle) EVT_IDLE(wxApp::OnIdle)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
const short kMacMinHeap = (29 * 1024) ; const short kMacMinHeap = (29 * 1024) ;

2
src/mac/carbon/bitmap.cpp
View File

@@ -25,10 +25,8 @@ extern "C"
#include "xpm.h" #include "xpm.h"
} ; } ;
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
#endif
#include <PictUtils.h> #include <PictUtils.h>

2
src/mac/carbon/bmpbuttn.cpp
View File

@@ -15,9 +15,7 @@
#include "wx/bmpbuttn.h" #include "wx/bmpbuttn.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
#endif
#include <wx/mac/uma.h> #include <wx/mac/uma.h>

2
src/mac/carbon/brush.cpp
View File

@@ -17,9 +17,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/brush.h" #include "wx/brush.h"
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
#endif
wxBrushRefData::wxBrushRefData() wxBrushRefData::wxBrushRefData()
{ {

2
src/mac/carbon/button.cpp
View File

@@ -15,9 +15,7 @@
#include "wx/button.h" #include "wx/button.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
#endif
#include <wx/mac/uma.h> #include <wx/mac/uma.h>
// Button // Button

2
src/mac/carbon/checkbox.cpp
View File

@@ -15,10 +15,8 @@
#include "wx/checkbox.h" #include "wx/checkbox.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
#endif
#include <wx/mac/uma.h> #include <wx/mac/uma.h>

2
src/mac/carbon/checklst.cpp
View File

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

2
src/mac/carbon/choice.cpp
View File

@@ -17,9 +17,7 @@
#include "wx/choice.h" #include "wx/choice.h"
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
#endif
bool wxChoice::Create(wxWindow *parent, wxWindowID id, bool wxChoice::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,

2
src/mac/carbon/colordlg.cpp
View File

@@ -16,9 +16,7 @@
#include "wx/mac/colordlg.h" #include "wx/mac/colordlg.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
#endif
/* /*
* wxColourDialog * wxColourDialog

2
src/mac/carbon/colour.cpp
View File

@@ -16,9 +16,7 @@
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/colour.h" #include "wx/colour.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
#endif
// Colour // Colour

2
src/mac/carbon/combobox.cpp
View File

@@ -16,9 +16,7 @@
#include "wx/combobox.h" #include "wx/combobox.h"
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
#endif
// right now we don't support editable comboboxes // right now we don't support editable comboboxes

2
src/mac/carbon/control.cpp
View File

@@ -18,7 +18,6 @@
#include "wx/tabctrl.h" #include "wx/tabctrl.h"
#include "wx/spinbutt.h" #include "wx/spinbutt.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
BEGIN_EVENT_TABLE(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow)
@@ -26,7 +25,6 @@ BEGIN_EVENT_TABLE(wxControl, wxWindow)
EVT_CHAR( wxControl::OnKeyDown ) EVT_CHAR( wxControl::OnKeyDown )
EVT_PAINT( wxControl::OnPaint ) EVT_PAINT( wxControl::OnPaint )
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
#include <wx/mac/uma.h> #include <wx/mac/uma.h>

2
src/mac/carbon/cursor.cpp
View File

@@ -16,9 +16,7 @@
#include "wx/cursor.h" #include "wx/cursor.h"
#include "wx/icon.h" #include "wx/icon.h"
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap) IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
#endif
const short kwxCursorHandId = 9 ; const short kwxCursorHandId = 9 ;
const short kwxCursorSizeWEId = 10 ; const short kwxCursorSizeWEId = 10 ;

2
src/mac/carbon/dc.cpp
View File

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

2
src/mac/carbon/dcclient.cpp
View File

@@ -28,11 +28,9 @@
// wxPaintDC // wxPaintDC
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
#endif
/* /*
* wxWindowDC * wxWindowDC

2
src/mac/carbon/dcprint.cpp
View File

@@ -27,9 +27,7 @@
#include "math.h" #include "math.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxPrinterDC, wxDC) IMPLEMENT_CLASS(wxPrinterDC, wxDC)
#endif
GrafPtr macPrintFormerPort = NULL ; GrafPtr macPrintFormerPort = NULL ;

2
src/mac/carbon/dcscreen.cpp
View File

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

2
src/mac/carbon/dialog.cpp
View File

@@ -27,7 +27,6 @@ wxList wxModalDialogs;
wxList wxModelessWindows; // Frames and modeless dialogs wxList wxModelessWindows; // Frames and modeless dialogs
extern wxList wxPendingDelete; extern wxList wxPendingDelete;
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
BEGIN_EVENT_TABLE(wxDialog, wxPanel) BEGIN_EVENT_TABLE(wxDialog, wxPanel)
@@ -40,7 +39,6 @@ BEGIN_EVENT_TABLE(wxDialog, wxPanel)
EVT_CLOSE(wxDialog::OnCloseWindow) EVT_CLOSE(wxDialog::OnCloseWindow)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
wxDialog::wxDialog() wxDialog::wxDialog()
{ {

2
src/mac/carbon/dirdlg.cpp
View File

@@ -20,9 +20,7 @@
#include "wx/cmndata.h" #include "wx/cmndata.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxDirDialog, wxDialog) IMPLEMENT_CLASS(wxDirDialog, wxDialog)
#endif
enum { enum {
kSelectItem = 10, // select button item number kSelectItem = 10, // select button item number

2
src/mac/carbon/filedlg.cpp
View File

@@ -19,9 +19,7 @@
#include "wx/filedlg.h" #include "wx/filedlg.h"
#include "wx/intl.h" #include "wx/intl.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxFileDialog, wxDialog) IMPLEMENT_CLASS(wxFileDialog, wxDialog)
#endif
// begin wxmac // begin wxmac

2
src/mac/carbon/font.cpp
View File

@@ -18,9 +18,7 @@
#include "wx/font.h" #include "wx/font.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
#endif

2
src/mac/carbon/fontdlg.cpp
View File

@@ -17,9 +17,7 @@
#include "wx/mac/fontdlg.h" #include "wx/mac/fontdlg.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
#endif
/* /*
* wxFontDialog * wxFontDialog

2
src/mac/carbon/frame.cpp
View File

@@ -28,7 +28,6 @@
extern wxList wxModelessWindows; extern wxList wxModelessWindows;
extern wxList wxPendingDelete; extern wxList wxPendingDelete;
#if !USE_SHARED_LIBRARY
BEGIN_EVENT_TABLE(wxFrame, wxWindow) BEGIN_EVENT_TABLE(wxFrame, wxWindow)
EVT_SIZE(wxFrame::OnSize) EVT_SIZE(wxFrame::OnSize)
EVT_ACTIVATE(wxFrame::OnActivate) EVT_ACTIVATE(wxFrame::OnActivate)
@@ -39,7 +38,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxWindow)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
#endif
#if wxUSE_NATIVE_STATUSBAR #if wxUSE_NATIVE_STATUSBAR
bool wxFrame::m_useNativeStatusBar = TRUE; bool wxFrame::m_useNativeStatusBar = TRUE;

2
src/mac/carbon/gauge.cpp
View File

@@ -15,9 +15,7 @@
#include "wx/gauge.h" #include "wx/gauge.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
#endif
#include <wx/mac/uma.h> #include <wx/mac/uma.h>

2
src/mac/carbon/gdiobj.cpp
View File

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

2
src/mac/carbon/helpxxxx.cpp
View File

@@ -17,9 +17,7 @@
#include <string.h> #include <string.h>
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxXXXXHelpController, wxHelpControllerBase) IMPLEMENT_DYNAMIC_CLASS(wxXXXXHelpController, wxHelpControllerBase)
#endif
wxXXXXHelpController::wxXXXXHelpController() wxXXXXHelpController::wxXXXXHelpController()
{ {

2
src/mac/carbon/icon.cpp
View File

@@ -15,9 +15,7 @@
#include "wx/icon.h" #include "wx/icon.h"
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
#endif
/* /*
* Icons * Icons

2
src/mac/carbon/imaglist.cpp
View File

@@ -15,9 +15,7 @@
#include "wx/stubs/imaglist.h" #include "wx/stubs/imaglist.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
#endif
wxImageList::wxImageList() wxImageList::wxImageList()
{ {

2
src/mac/carbon/listbox.cpp
View File

@@ -21,13 +21,11 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "extldef.h" #include "extldef.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
BEGIN_EVENT_TABLE(wxListBox, wxControl) BEGIN_EVENT_TABLE(wxListBox, wxControl)
EVT_SIZE( wxListBox::OnSize ) EVT_SIZE( wxListBox::OnSize )
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
#include <wx/mac/uma.h> #include <wx/mac/uma.h>

2
src/mac/carbon/listctrl.cpp
View File

@@ -16,11 +16,9 @@
#include "wx/stubs/textctrl.h" #include "wx/stubs/textctrl.h"
#include "wx/stubs/listctrl.h" #include "wx/stubs/listctrl.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
#endif
wxListCtrl::wxListCtrl() wxListCtrl::wxListCtrl()
{ {

2
src/mac/carbon/mdi.cpp
View File

@@ -19,7 +19,6 @@
extern wxList wxModelessWindows; extern wxList wxModelessWindows;
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
@@ -34,7 +33,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
EVT_SCROLL(wxMDIClientWindow::OnScroll) EVT_SCROLL(wxMDIClientWindow::OnScroll)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif
// Parent frame // Parent frame

2
src/mac/carbon/menu.cpp
View File

@@ -33,10 +33,8 @@
// ---------------------- // ----------------------
#include <string.h> #include <string.h>
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
#endif
// the (popup) menu title has this special id // the (popup) menu title has this special id
static const int idMenuTitle = -2; static const int idMenuTitle = -2;

2
src/mac/carbon/menuitem.cpp
View File

@@ -25,9 +25,7 @@
// dynamic classes implementation // dynamic classes implementation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
#endif //USE_SHARED_LIBRARY
void wxMacBuildMenuString(StringPtr outMacItemText, char *outMacShortcutChar , short *outMacModifiers , const char *inItemName , bool useShortcuts ) ; void wxMacBuildMenuString(StringPtr outMacItemText, char *outMacShortcutChar , short *outMacModifiers , const char *inItemName , bool useShortcuts ) ;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
src/mac/carbon/metafile.cpp
View File

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

Some files were not shown because too many files have changed in this diff Show More