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

OGL fixes for wxMotif; added Set/GetClientData to wxMenu in wxMSW/wxMotif/wxStubs.

Browse Source 
Sorry, I may be overwriting changes Robert made due to a file copying error.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-11-08 22:35:18 +00:00
parent d18ed59a36
commit 3dd4e4e05c
36 changed files with 192 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/motif/window.cpp
View File

@@ -108,6 +108,8 @@ wxWindow::wxWindow()
#if wxUSE_DRAG_AND_DROP
m_pDropTarget = NULL;
#endif
m_clientObject = (wxClientData*) NULL;
m_clientData = NULL;
/// Motif-specific
m_mainWidget = (WXWidget) 0;
@@ -239,8 +241,8 @@ wxWindow::~wxWindow()
// dangling pointers.
wxPendingDelete.DeleteObject(this);
if ( m_windowValidator )
delete m_windowValidator;
if ( m_windowValidator ) delete m_windowValidator;
if (m_clientObject) delete m_clientObject;
}
// Destroy the window (delayed, if a managed window)
@@ -282,6 +284,8 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
m_maxSizeY = -1;
m_defaultItem = NULL;
m_windowParent = NULL;
m_clientObject = (wxClientData*) NULL;
m_clientData = NULL;
// Motif-specific
m_canAddEventHandler = FALSE;
@@ -1929,6 +1933,27 @@ void wxWindow::SetValidator(const wxValidator& validator)
m_windowValidator->SetWindow(this) ;
}
void wxWindow::SetClientObject( wxClientData *data )
{
if (m_clientObject) delete m_clientObject;
m_clientObject = data;
}
wxClientData *wxWindow::GetClientObject()
{
return m_clientObject;
}
void wxWindow::SetClientData( void *data )
{
m_clientData = data;
}
void *wxWindow::GetClientData()
{
return m_clientData;
}
// Find a window by id or name
wxWindow *wxWindow::FindWindow(long id)
{