build fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
#define _WX_MACCARBONDATAVIEWCTRL_H_
|
||||
|
||||
typedef void* DataBrowserItemDataRef;
|
||||
typedef void* WXDataBrowserPropertyType;
|
||||
typedef unsigned long WXDataBrowserPropertyType;
|
||||
typedef wxUint32 WXDataBrowserPropertyID;
|
||||
|
||||
// ---------------------------------------------------------
|
||||
|
@@ -9,32 +9,27 @@
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef wxUSE_GENERICDATAVIEWCTRL
|
||||
#if wxUSE_DATAVIEWCTRL
|
||||
|
||||
#include <limits>
|
||||
#ifdef __DARWIN__
|
||||
#include <Carbon/Carbon.h>
|
||||
#else
|
||||
#include <ATSUnicode.h>
|
||||
#include <TextCommon.h>
|
||||
#include <TextEncodingConverter.h>
|
||||
#endif
|
||||
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#if wxUSE_DATAVIEWCTRL
|
||||
#if !defined(wxUSE_GENERICDATAVIEWCTRL) || wxUSE_GENERICDATAVIEWCTRL == 0
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/app.h"
|
||||
#include "wx/toplevel.h"
|
||||
#include "wx/font.h"
|
||||
#include "wx/settings.h"
|
||||
#endif
|
||||
|
||||
#include "wx/dataview.h"
|
||||
#include "wx/utils.h"
|
||||
|
||||
#include "wx/mac/carbon/databrow.h"
|
||||
#include "wx/mac/private.h"
|
||||
#include "wx/mac/carbon/databrow.h"
|
||||
#include "wx/mac/uma.h"
|
||||
|
||||
#include <limits>
|
||||
|
||||
#if defined(__MWERKS__) && wxUSE_UNICODE
|
||||
#if __MWERKS__ < 0x4100 || !defined(__DARWIN__)
|
||||
#include <wtime.h>
|
||||
@@ -948,5 +943,5 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
|
||||
} /* wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(DataBrowserItemID, DataBrowserItemNotification, DataBrowserItemDataRef) */
|
||||
|
||||
|
||||
#endif // wxUSE_DATAVIEWCTRL
|
||||
#endif // wxUSE_GENERICDATAVIEWCTRL
|
||||
#endif // wxUSE_DATAVIEWCTRL
|
||||
|
@@ -415,7 +415,7 @@ void wxDataViewCustomRenderer::SetDC(wxDC* newDCPtr)
|
||||
|
||||
WXDataBrowserPropertyType wxDataViewCustomRenderer::GetPropertyType() const
|
||||
{
|
||||
return WXDataBrowserPropertyType(kDataBrowserCustomType);
|
||||
return kDataBrowserCustomType;
|
||||
}
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
|
||||
@@ -444,7 +444,7 @@ bool wxDataViewTextRenderer::Render(void)
|
||||
|
||||
WXDataBrowserPropertyType wxDataViewTextRenderer::GetPropertyType() const
|
||||
{
|
||||
return WXDataBrowserPropertyType(kDataBrowserTextType);
|
||||
return kDataBrowserTextType;
|
||||
}
|
||||
|
||||
IMPLEMENT_CLASS(wxDataViewTextRenderer,wxDataViewRenderer)
|
||||
@@ -476,7 +476,7 @@ bool wxDataViewBitmapRenderer::Render(void)
|
||||
|
||||
WXDataBrowserPropertyType wxDataViewBitmapRenderer::GetPropertyType() const
|
||||
{
|
||||
return WXDataBrowserPropertyType(kDataBrowserIconType);
|
||||
return kDataBrowserIconType;
|
||||
}
|
||||
|
||||
IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer)
|
||||
@@ -511,7 +511,7 @@ bool wxDataViewIconTextRenderer::Render(void)
|
||||
|
||||
WXDataBrowserPropertyType wxDataViewIconTextRenderer::GetPropertyType() const
|
||||
{
|
||||
return WXDataBrowserPropertyType(kDataBrowserIconAndTextType);
|
||||
return kDataBrowserIconAndTextType;
|
||||
}
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer)
|
||||
@@ -536,7 +536,7 @@ bool wxDataViewToggleRenderer::Render(void)
|
||||
|
||||
WXDataBrowserPropertyType wxDataViewToggleRenderer::GetPropertyType() const
|
||||
{
|
||||
return WXDataBrowserPropertyType(kDataBrowserCheckboxType);
|
||||
return kDataBrowserCheckboxType;
|
||||
}
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer,wxDataViewRenderer)
|
||||
@@ -562,7 +562,7 @@ bool wxDataViewProgressRenderer::Render(void)
|
||||
|
||||
WXDataBrowserPropertyType wxDataViewProgressRenderer::GetPropertyType() const
|
||||
{
|
||||
return WXDataBrowserPropertyType(kDataBrowserProgressBarType);
|
||||
return kDataBrowserProgressBarType;
|
||||
}
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer,wxDataViewRenderer)
|
||||
@@ -586,7 +586,7 @@ bool wxDataViewDateRenderer::Render(void)
|
||||
|
||||
WXDataBrowserPropertyType wxDataViewDateRenderer::GetPropertyType() const
|
||||
{
|
||||
return WXDataBrowserPropertyType(kDataBrowserDateTimeType);
|
||||
return kDataBrowserDateTimeType;
|
||||
}
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer,wxDataViewRenderer)
|
||||
|
Reference in New Issue
Block a user