X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8208e181cb576ec6cda37624923f95a59af43072..642067e02a202feddc97255f1229e4e7378541d9:/src/mac/data.cpp?ds=sidebyside diff --git a/src/mac/data.cpp b/src/mac/data.cpp index fab57c49fe..6b56b896dc 100644 --- a/src/mac/data.cpp +++ b/src/mac/data.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: data.cpp // Purpose: Various data -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -21,9 +21,6 @@ #define _MAXPATHLEN 500 -// Useful buffer, initialized in CommonInit -char *wxBuffer = NULL; - // Windows List wxWindowList wxTopLevelWindows; @@ -92,6 +89,7 @@ wxFont wxNullFont; wxColour wxNullColour; // Default window names +const wxChar *wxControlNameStr = wxT("control"); const wxChar *wxButtonNameStr = wxT("button"); const wxChar *wxCanvasNameStr = wxT("canvas"); const wxChar *wxCheckBoxNameStr = wxT("check"); @@ -102,8 +100,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"); @@ -124,8 +122,6 @@ const wxChar *wxGetTextFromUserPromptStr = wxT("Input Text"); const wxChar *wxMessageBoxCaptionStr = wxT("Message"); const wxChar *wxFileSelectorPromptStr = wxT("Select a file"); const wxChar *wxFileSelectorDefaultWildcardStr = wxT("*.*"); -const wxChar *wxInternalErrorStr = wxT("wxWindows Internal Error"); -const wxChar *wxFatalErrorStr = wxT("wxWindows Fatal Error"); const wxChar *wxTreeCtrlNameStr = wxT("treeCtrl"); const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl"); const wxChar *wxDirDialogDefaultFolderStr = wxT("/"); @@ -134,5 +130,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);