first pass of wxUniv merge - nothing works, most parts don't even compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-26 20:59:19 +00:00
parent aeb313f31c
commit 1e6feb95a7
409 changed files with 42065 additions and 6675 deletions

View File

@@ -50,7 +50,9 @@ protected:
// include the platform-dependent class implementation
// ----------------------------------------------------------------------------
#if defined(__WXMSW__) && defined(__WIN32__)
#if defined(__WXUNIVERSAL__)
#include "wx/generic/spinctlg.h"
#elif defined(__WXMSW__) && defined(__WIN32__)
#include "wx/msw/spinctrl.h"
#elif defined(__WXPM__)
#include "wx/os2/spinctrl.h"
@@ -60,7 +62,6 @@ protected:
#include "wx/generic/spinctlg.h"
#endif // platform
// Macro must be defined here, not event.h, since it must reference wxSpinEventFunction
#define EVT_SPINCTRL(id, fn) \
DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_SPINCTRL_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & fn, (wxObject *) NULL ),