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

memory leak fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-01-05 16:39:22 +00:00
parent 9c152f8094
commit 12cd5f34e7
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mac/app.cpp
View File

@@ -56,9 +56,6 @@
#if wxUSE_SOCKETS
#ifdef __DARWIN__
#include <CoreServices/CoreServices.h>
#else
#include <OpenTransport.h>
#include <OpenTptInternet.h>
#endif
#endif
@@ -526,6 +523,7 @@ bool wxApp::Initialize()
void wxApp::CleanUp()
{
wxToolTip::RemoveToolTips() ;
#if wxUSE_LOG
// flush the logged messages if any and install a 'safer' log target: the
// default one (wxLogGui) can't be used after the resources are freed just
@@ -563,6 +561,9 @@ void wxApp::CleanUp()
if (wxWinMacWindowList)
delete wxWinMacWindowList ;
if (wxWinMacControlList)
delete wxWinMacControlList ;
delete wxPendingEvents;
#if wxUSE_THREADS
delete wxPendingEventsLocker;

7
src/mac/carbon/app.cpp
View File

@@ -56,9 +56,6 @@
#if wxUSE_SOCKETS
#ifdef __DARWIN__
#include <CoreServices/CoreServices.h>
#else
#include <OpenTransport.h>
#include <OpenTptInternet.h>
#endif
#endif
@@ -526,6 +523,7 @@ bool wxApp::Initialize()
void wxApp::CleanUp()
{
wxToolTip::RemoveToolTips() ;
#if wxUSE_LOG
// flush the logged messages if any and install a 'safer' log target: the
// default one (wxLogGui) can't be used after the resources are freed just
@@ -563,6 +561,9 @@ void wxApp::CleanUp()
if (wxWinMacWindowList)
delete wxWinMacWindowList ;
if (wxWinMacControlList)
delete wxWinMacControlList ;
delete wxPendingEvents;
#if wxUSE_THREADS
delete wxPendingEventsLocker;

11
src/mac/carbon/tooltip.cpp
View File

@@ -55,15 +55,15 @@ class wxMacToolTip
class wxMacToolTipTimer : wxTimer
{
public:
wxMacToolTipTimer() {} ;
wxMacToolTipTimer(wxMacToolTip* tip, int iMilliseconds) ;
virtual ~wxMacToolTipTimer() {} ;
void Notify()
{
if ( m_mark == m_tip->GetMark() )
m_tip->Draw() ;
}
protected:
wxMacToolTip* m_tip;
long m_mark ;
@@ -187,7 +187,7 @@ void wxMacToolTip::Setup( WindowRef window , wxString text , wxPoint localPosit
{
m_mark++ ;
Clear() ;
m_position = localPosition ;
m_position = localPosition ;
m_label = wxMacMakeMacStringFromPC( text ) ;
m_window = window ;
s_ToolTipWindowRef = window ;
@@ -323,6 +323,11 @@ void wxToolTip::NotifyWindowDelete( WXHWND win )
void wxMacToolTip::Clear()
{
m_mark++ ;
if ( m_timer )
{
delete m_timer ;
m_timer = NULL ;
}
if ( !m_shown )
return ;

11
src/mac/tooltip.cpp
View File

@@ -55,15 +55,15 @@ class wxMacToolTip
class wxMacToolTipTimer : wxTimer
{
public:
wxMacToolTipTimer() {} ;
wxMacToolTipTimer(wxMacToolTip* tip, int iMilliseconds) ;
virtual ~wxMacToolTipTimer() {} ;
void Notify()
{
if ( m_mark == m_tip->GetMark() )
m_tip->Draw() ;
}
protected:
wxMacToolTip* m_tip;
long m_mark ;
@@ -187,7 +187,7 @@ void wxMacToolTip::Setup( WindowRef window , wxString text , wxPoint localPosit
{
m_mark++ ;
Clear() ;
m_position = localPosition ;
m_position = localPosition ;
m_label = wxMacMakeMacStringFromPC( text ) ;
m_window = window ;
s_ToolTipWindowRef = window ;
@@ -323,6 +323,11 @@ void wxToolTip::NotifyWindowDelete( WXHWND win )
void wxMacToolTip::Clear()
{
m_mark++ ;
if ( m_timer )
{
delete m_timer ;
m_timer = NULL ;
}
if ( !m_shown )
return ;