merge with latest sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user