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

attemps to fix compilation after applying the last patch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-11-05 00:57:38 +00:00
parent bab7e01267
commit b905c12598
1 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/generic/listctrl.cpp
View File

@@ -47,17 +47,27 @@
#include "wx/textctrl.h"
#endif
// Include wx/listctrl.h (with wxListView declaration)
// only when wxGenericListCtrl is the only
// implementation, and therefore wxListView needs
// to be derived from the 'generic' version.
// under Win32 we always use the native version and also may use the generic
// one, however some things should be done only if we use only the generic
// version
#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
#include "wx/listctrl.h"
#else
#include "wx/generic/listctrl.h"
#define HAVE_NATIVE_LISTCTRL
#endif
// if we have the native control, wx/listctrl.h declares it and not this one
#ifdef HAVE_NATIVE_LISTCTRL
#include "wx/generic/listctrl.h"
#else // !HAVE_NATIVE_LISTCTRL
#include "wx/listctrl.h"
// if we have a native version, its implementation file does all this
IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
#endif // HAVE_NATIVE_LISTCTRL/!HAVE_NATIVE_LISTCTRL
#if defined(__WXGTK__)
#include <gtk/gtk.h>
#include "wx/gtk/win_gtk.h"
@@ -4571,42 +4581,17 @@ void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
*to = m_lineTo;
}
// -------------------------------------------------------------------------------------
// wxListItem
// -------------------------------------------------------------------------------------
#if !defined(__WIN32__) || defined(__WXUNIVERSAL__)
IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
#endif
// -------------------------------------------------------------------------------------
// wxGenericListCtrl
// -------------------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl)
#if !defined(__WIN32__)
IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
#endif
#if !defined(__WIN32__) || defined(__WXUNIVERSAL__)
IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
#endif
BEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl)
EVT_SIZE(wxGenericListCtrl::OnSize)
EVT_IDLE(wxGenericListCtrl::OnIdle)
END_EVENT_TABLE()
#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
/*
* wxListCtrl has to be a real class or we have problems with
* the run-time information.
*/
IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
#endif
wxGenericListCtrl::wxGenericListCtrl()
{
m_imageListNormal = (wxImageListType *) NULL;