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:
@@ -1,6 +1,6 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: common/ctrlsub.cpp
|
||||
// Purpose: wxControlWithItems implementation
|
||||
// Purpose: wxItemContainer implementation
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 22.10.99
|
||||
@@ -28,6 +28,8 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_CONTROLS
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/ctrlsub.h"
|
||||
#endif
|
||||
@@ -40,7 +42,7 @@
|
||||
// selection
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
wxString wxControlWithItems::GetStringSelection() const
|
||||
wxString wxItemContainer::GetStringSelection() const
|
||||
{
|
||||
wxString s;
|
||||
int sel = GetSelection();
|
||||
@@ -54,9 +56,9 @@ wxString wxControlWithItems::GetStringSelection() const
|
||||
// client data
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
void wxControlWithItems::SetClientObject(int n, wxClientData *data)
|
||||
void wxItemContainer::SetClientObject(int n, wxClientData *data)
|
||||
{
|
||||
wxASSERT_MSG( m_clientDataItemsType != ClientData_Void,
|
||||
wxASSERT_MSG( m_clientDataItemsType != wxClientData_Void,
|
||||
wxT("can't have both object and void client data") );
|
||||
|
||||
wxClientData *clientDataOld = DoGetItemClientObject(n);
|
||||
@@ -64,31 +66,32 @@ void wxControlWithItems::SetClientObject(int n, wxClientData *data)
|
||||
delete clientDataOld;
|
||||
|
||||
DoSetItemClientObject(n, data);
|
||||
m_clientDataItemsType = ClientData_Object;
|
||||
m_clientDataItemsType = wxClientData_Object;
|
||||
}
|
||||
|
||||
wxClientData *wxControlWithItems::GetClientObject(int n) const
|
||||
wxClientData *wxItemContainer::GetClientObject(int n) const
|
||||
{
|
||||
wxASSERT_MSG( m_clientDataItemsType == ClientData_Object,
|
||||
wxASSERT_MSG( m_clientDataItemsType == wxClientData_Object,
|
||||
wxT("this window doesn't have object client data") );
|
||||
|
||||
return DoGetItemClientObject(n);
|
||||
}
|
||||
|
||||
void wxControlWithItems::SetClientData(int n, void *data)
|
||||
void wxItemContainer::SetClientData(int n, void *data)
|
||||
{
|
||||
wxASSERT_MSG( m_clientDataItemsType != ClientData_Object,
|
||||
wxASSERT_MSG( m_clientDataItemsType != wxClientData_Object,
|
||||
wxT("can't have both object and void client data") );
|
||||
|
||||
DoSetItemClientData(n, data);
|
||||
m_clientDataItemsType = ClientData_Void;
|
||||
m_clientDataItemsType = wxClientData_Void;
|
||||
}
|
||||
|
||||
void *wxControlWithItems::GetClientData(int n) const
|
||||
void *wxItemContainer::GetClientData(int n) const
|
||||
{
|
||||
wxASSERT_MSG( m_clientDataItemsType == ClientData_Void,
|
||||
wxASSERT_MSG( m_clientDataItemsType == wxClientData_Void,
|
||||
wxT("this window doesn't have void client data") );
|
||||
|
||||
return DoGetItemClientData(n);
|
||||
}
|
||||
|
||||
#endif // wxUSE_CONTROLS
|
||||
|
Reference in New Issue
Block a user