X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8208e181cb576ec6cda37624923f95a59af43072..cd212ee42521a28c8947cf287940121cde7cde8f:/src/mac/data.cpp diff --git a/src/mac/data.cpp b/src/mac/data.cpp index fab57c49fe..cb3ff34b9c 100644 --- a/src/mac/data.cpp +++ b/src/mac/data.cpp @@ -102,8 +102,8 @@ const wxChar *wxFrameNameStr = wxT("frame"); const wxChar *wxGaugeNameStr = wxT("gauge"); const wxChar *wxStaticBoxNameStr = wxT("groupBox"); const wxChar *wxListBoxNameStr = wxT("listBox"); -const wxChar *wxStaticTextNameStr = wxT("message"); -const wxChar *wxStaticBitmapNameStr = wxT("message"); +const wxChar *wxStaticTextNameStr = wxT("statictext"); +const wxChar *wxStaticBitmapNameStr = wxT("staticbitmap"); const wxChar *wxMultiTextNameStr = wxT("multitext"); const wxChar *wxPanelNameStr = wxT("panel"); const wxChar *wxRadioBoxNameStr = wxT("radioBox"); @@ -134,5 +134,17 @@ const wxChar *wxDirDialogDefaultFolderStr = wxT("/"); const wxChar *wxFloatToStringStr = wxT("%.2f"); const wxChar *wxDoubleToStringStr = wxT("%.2f"); +#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 + const wxSize wxDefaultSize(-1, -1); const wxPoint wxDefaultPosition(-1, -1);