{
if ( m_dlgReplace )
{
- delete m_dlgReplace;
- m_dlgReplace = NULL;
+ wxDELETE(m_dlgReplace);
}
else
{
{
if ( m_dlgFind )
{
- delete m_dlgFind;
- m_dlgFind = NULL;
+ wxDELETE(m_dlgFind);
}
else
{
{
if ( event.GetEventObject() == m_btnDelete )
{
- delete m_btnModal;
- m_btnModal = NULL;
-
+ wxDELETE(m_btnModal);
m_btnDelete->Disable();
}
else if ( event.GetEventObject() == m_btnModal )
doc->Modify(true);
}
- delete m_currentSegment;
- m_currentSegment = NULL;
+ wxDELETE(m_currentSegment);
}
// is this the start of a new segment?
m_dragImage->Hide();
m_dragImage->EndDrag();
- delete m_dragImage;
- m_dragImage = NULL;
+ wxDELETE(m_dragImage);
m_draggedShape->SetShow(true);
if (!m_dragImage->BeginDrag(beginDragHotSpot, this, fullScreen))
{
- delete m_dragImage;
- m_dragImage = (wxDragImage*) NULL;
+ wxDELETE(m_dragImage);
m_dragMode = TEST_DRAG_NONE;
} else
void MyApp::DeleteBitmaps()
{
- delete gs_bmpNoMask;
- delete gs_bmpWithColMask;
- delete gs_bmpMask;
- delete gs_bmpWithMask;
- delete gs_bmp4;
- delete gs_bmp4_mono;
- delete gs_bmp36;
-
- gs_bmpNoMask = NULL;
- gs_bmpWithColMask = NULL;
- gs_bmpMask = NULL;
- gs_bmpWithMask = NULL;
- gs_bmp4 = NULL;
- gs_bmp4_mono = NULL;
- gs_bmp36 = NULL;
+ wxDELETE(gs_bmpNoMask);
+ wxDELETE(gs_bmpWithColMask);
+ wxDELETE(gs_bmpMask);
+ wxDELETE(gs_bmpWithMask);
+ wxDELETE(gs_bmp4);
+ wxDELETE(gs_bmp4_mono);
+ wxDELETE(gs_bmp36);
}
// ----------------------------------------------------------------------------
{
DoGet();
- delete m_process;
- m_process = NULL;
+ wxDELETE(m_process);
wxLogWarning(wxT("The other process has terminated, closing"));
{
wxCHECK_RET(m_watcher, "Watcher not initialized");
m_filesList->DeleteAllItems();
- delete m_watcher;
- m_watcher = NULL;
+ wxDELETE(m_watcher);
}
}
// frame destructor
MyFrame::~MyFrame()
{
- delete m_Prn;
- m_Prn = (wxHtmlEasyPrinting *) NULL;
+ wxDELETE(m_Prn);
}
if (m_connection)
{
m_connection->Disconnect();
- delete m_connection;
- m_connection = NULL;
+ wxDELETE(m_connection);
wxLogMessage("Client disconnected from server");
}
wxGetApp().ExitMainLoop();
if ( m_connection )
{
m_connection->Disconnect();
- delete m_connection;
- m_connection = NULL;
+ wxDELETE(m_connection);
wxLogMessage("Disconnected client");
}
}
{
if (m_client)
{
- delete m_client;
- m_client = NULL;
+ wxDELETE(m_client);
}
event.Skip();
}
if (!retval)
{
- delete m_client;
- m_client = NULL;
+ wxDELETE(m_client);
}
EnableControls();
}
void MyFrame::Disconnect()
{
- delete m_client;
- m_client = NULL;
+ wxDELETE(m_client);
EnableControls();
}
if (m_connection)
{
m_connection->Disconnect();
- delete m_connection;
- m_connection = NULL;
+ wxDELETE(m_connection);
wxGetApp().GetFrame()->EnableControls();
wxLogMessage(wxT("Client disconnected from server"));
}
void MyFrame::OnClose(wxCloseEvent& event)
{
- if (m_server)
- {
- delete m_server;
- m_server = NULL;
- }
+ wxDELETE(m_server);
event.Skip();
}
else
{
wxLogMessage("Server %s failed to start", servername);
- delete m_server;
- m_server = NULL;
+ wxDELETE(m_server);
}
UpdateUI();
}
{
if ( m_connection )
{
- delete m_connection;
- m_connection = NULL;
+ wxDELETE(m_connection);
wxGetApp().GetFrame()->UpdateUI();
wxLogMessage("Disconnected client");
}
wxAdvImageFileProperty::~wxAdvImageFileProperty ()
{
// Delete old image
- if ( m_pImage )
- {
- delete m_pImage;
- m_pImage = (wxImage*) NULL;
- }
+ wxDELETE(m_pImage);
}
void wxAdvImageFileProperty::OnSetValue()
wxFileProperty::OnSetValue();
// Delete old image
- if ( m_pImage )
- {
- delete m_pImage;
- m_pImage = (wxImage*) NULL;
- }
+ wxDELETE(m_pImage);
wxString imagename = GetValueAsString(0);
}
- if ( m_pImage )
- {
- delete m_pImage;
- m_pImage = (wxImage*) NULL;
- }
+ wxDELETE(m_pImage);
}
}
{
DestroyChildren();
- delete m_pKey;
- m_pKey = NULL;
+ wxDELETE(m_pKey);
}
void RegTreeCtrl::TreeNode::Refresh()
if (m_size == m_infill)
{
m_signature[0] = m_signature[1] = 0x0;
- delete [] m_inbuf;
- m_inbuf = NULL;
+ wxDELETEA(m_inbuf);
m_infill = 0;
return;
}
{
if (m_written == m_size)
{
- delete [] m_outbuf;
- m_outbuf = NULL;
+ wxDELETEA(m_outbuf);
m_outfill = 0;
LogWorker( "All data written");
return;
#endif // __WXMSW__
m_useMemory = false;
- delete m_sound;
- m_sound = NULL;
+ wxDELETE(m_sound);
NotifyUsingFile(m_soundFile);
}
#endif // wxUSE_FILEDLG
m_soundFile.clear();
m_useMemory = false;
- delete m_sound;
- m_sound = NULL;
+ wxDELETE(m_sound);
NotifyUsingFile(wxT("Windows WAV resource"));
}
}
AppAbout::~AppAbout () {
- if (m_timer) {
- delete m_timer;
- m_timer = NULL;
- }
+ wxDELETE(m_timer);
}
//----------------------------------------------------------------------------
// event handlers
void AppAbout::OnTimerEvent (wxTimerEvent &WXUNUSED(event)) {
- if (m_timer) delete m_timer;
- m_timer = NULL;
+ wxDELETE(m_timer);
EndModal (wxID_OK);
}
{
if ( m_tbar )
{
- delete m_tbar;
- m_tbar = NULL;
+ wxDELETE(m_tbar);
}
else
{
wxCHECK_RET( m_timer, wxT("shouldn't be called") );
m_timer->Stop();
- delete m_timer;
- m_timer = NULL;
+ wxDELETE(m_timer);
if (clicked->GetId() == GaugePage_Progress)
{
}
else // no images
{
- if ( m_imageList )
- {
- delete m_imageList;
- m_imageList = NULL;
- }
+ wxDELETE(m_imageList);
}
// because of the bug in wxMSW we can't use SetImageList(NULL) - although
void StatBmpWidgetsPage::RecreateWidget()
{
- delete m_statbmp;
- m_statbmp = NULL;
+ wxDELETE(m_statbmp);
wxString filepath = m_filepicker->GetPath();
if ( filepath.empty() )
void wxFontModule::OnExit()
{
- delete g_fontHash;
-
- g_fontHash = NULL;
+ wxDELETE(g_fontHash);
}
#endif
}
virtual void OnExit()
{
- delete g_wxAnyValueTypeGlobals;
- g_wxAnyValueTypeGlobals = NULL;
+ wxDELETE(g_wxAnyValueTypeGlobals);
}
private:
};
// In unicode mode the SetTraceMasks call can cause an apptraits to be
// created, but since we are still in the constructor the wrong kind will
// be created for GUI apps. Destroy it so it can be created again later.
- delete m_traits;
- m_traits = NULL;
+ wxDELETE(m_traits);
#endif
#endif
}
void wxAppConsoleBase::CleanUp()
{
- if ( m_mainLoop )
- {
- delete m_mainLoop;
- m_mainLoop = NULL;
- }
+ wxDELETE(m_mainLoop);
}
// ----------------------------------------------------------------------------
wxDeleteStockLists();
- delete wxTheColourDatabase;
- wxTheColourDatabase = NULL;
+ wxDELETE(wxTheColourDatabase);
wxAppConsole::CleanUp();
}
while ( !sm_providers->empty() )
delete *sm_providers->begin();
- delete sm_providers;
- sm_providers = NULL;
-
- delete sm_cache;
- sm_cache = NULL;
+ wxDELETE(sm_providers);
+ wxDELETE(sm_cache);
}
}
void wxPrintData::SetPrivData( char *privData, int len )
{
- if (m_privData)
- {
- delete [] m_privData;
- m_privData = NULL;
- }
+ wxDELETEA(m_privData);
m_privDataLen = len;
if (m_privDataLen > 0)
{
m_nativeData = data.GetNativeData();
m_nativeData->m_ref++;
- if (m_privData)
- {
- delete [] m_privData;
- m_privData = NULL;
- }
+ wxDELETEA(m_privData);
m_privDataLen = data.GetPrivDataLen();
if (m_privDataLen > 0)
{
if ( m_popup )
m_popup->RemoveEventHandler(m_popupEvtHandler);
- delete m_popupEvtHandler;
+ wxDELETE(m_popupEvtHandler);
- delete m_popupInterface;
+ wxDELETE(m_popupInterface);
if ( m_winPopup )
{
m_winPopup->RemoveEventHandler(m_popupWinEvtHandler);
- delete m_popupWinEvtHandler;
- m_popupWinEvtHandler = NULL;
+ wxDELETE(m_popupWinEvtHandler);
m_winPopup->Destroy();
+ m_winPopup = NULL;
}
- m_popupEvtHandler = NULL;
- m_popupInterface = NULL;
- m_winPopup = NULL;
m_popup = NULL;
}
stdButtonSizer->Realize();
else
{
- delete buttonSizer;
- buttonSizer = NULL;
+ wxDELETE(buttonSizer);
}
}
// deleted directly not by us as indicated by its doc child frame
// pointer still being set
m_childView->SetDocChildFrame(NULL);
- delete m_childView;
- m_childView = NULL;
+ wxDELETE(m_childView);
}
m_childDocument = NULL;
virtual bool OnInit() { return true; }
virtual void OnExit()
{
- if ( gs_factory )
- {
- delete gs_factory;
- gs_factory = NULL;
- }
+ wxDELETE(gs_factory);
}
DECLARE_DYNAMIC_CLASS(wxDisplayModule)
virtual void OnExit()
{
- delete wxPluginLibrary::ms_classes;
- wxPluginLibrary::ms_classes = NULL;
+ wxDELETE(wxPluginLibrary::ms_classes);
wxPluginManager::ClearManifest();
}
const wxUint16 *in_tbl;
const wxUint16 *out_tbl = NULL;
- if (m_Table) {delete[] m_Table; m_Table = NULL;}
+ wxDELETEA(m_Table);
if (input_enc == output_enc) {m_JustCopy = true; return true;}
delete eTTnode;
}
- delete[] m_eventTypeTable;
- m_eventTypeTable = NULL;
+ wxDELETEA(m_eventTypeTable);
m_size = 0;
}
m_filelen += count;
if (count < m_buflen) {
- delete m_stream;
- m_stream = NULL;
+ wxDELETE(m_stream);
if (count > 0) {
- delete[] m_buf;
- m_buf = NULL;
+ wxDELETEA(m_buf);
m_buflen = 0;
}
m_parenterror = wxSTREAM_READ_ERROR;
m_buflen = 0;
if (!m_stream) {
- delete[] m_buf;
- m_buf = NULL;
+ wxDELETEA(m_buf);
}
}
m_parenterror = m_stream->GetLastError();
if (m_parenterror == wxSTREAM_NO_ERROR)
m_parenterror = wxSTREAM_EOF;
- delete m_stream;
- m_stream = NULL;
+ wxDELETE(m_stream);
}
}
void wxFrameBase::DeleteAllBars()
{
#if wxUSE_MENUS
- if ( m_frameMenuBar )
- {
- delete m_frameMenuBar;
- m_frameMenuBar = NULL;
- }
+ wxDELETE(m_frameMenuBar);
#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR
- if ( m_frameStatusBar )
- {
- delete m_frameStatusBar;
- m_frameStatusBar = NULL;
- }
+ wxDELETE(m_frameStatusBar);
#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
- if ( m_frameToolBar )
- {
- delete m_frameToolBar;
- m_frameToolBar = NULL;
- }
+ wxDELETE(m_frameToolBar);
#endif // wxUSE_TOOLBAR
}
void wxArchiveFSCacheDataImpl::CloseStreams()
{
- delete m_archive;
- m_archive = NULL;
- delete m_stream;
- m_stream = NULL;
+ wxDELETE(m_archive);
+ wxDELETE(m_stream);
}
wxArchiveEntry *wxArchiveFSCacheDataImpl::Get(const wxString& name)
{
m_lastError = wxPROTO_CONNERR;
wxLogError(_("Timeout while waiting for FTP server to connect, try passive mode."));
- delete sock;
- sock = NULL;
+ wxDELETE(sock);
}
else
{
{
for (unsigned i = 0; i < ITEMCOUNT; i++)
{
- delete ms_stockObject[i];
- ms_stockObject[i] = NULL;
+ wxDELETE(ms_stockObject[i]);
}
}
{
Clear();
- delete[] m_table;
-
- m_table = NULL;
+ wxDELETEA(m_table);
m_size = 0;
}
wxIPV4address *addr;
if (m_addr) {
- delete m_addr;
- m_addr = NULL;
+ wxDELETE(m_addr);
Close();
}
m_addr = addr = new wxIPV4address();
if (!addr->Hostname(host)) {
- delete m_addr;
- m_addr = NULL;
+ wxDELETE(m_addr);
m_lastError = wxPROTO_NETERR;
return false;
}
void wxIFFDecoder::Destroy()
{
- delete m_image;
- m_image = 0;
- delete [] databuf;
- databuf = 0;
- delete [] decomp_mem;
- decomp_mem = 0;
+ wxDELETE(m_image);
+ wxDELETEA(databuf);
+ wxDELETEA(decomp_mem);
}
//---------------------------------------------------------------------------
const byte *cmapptr = dataptr + 8;
colors = chunkLen / 3; // calc no of colors
- delete m_image->pal;
- m_image->pal = 0;
+ wxDELETE(m_image->pal);
m_image->colors = colors;
if (colors > 0) {
m_image->pal = new byte[3*colors];
decomprle(bodyptr, decomp_mem, chunkLen, decomp_bufsize);
bodyptr = decomp_mem; // -> uncompressed BODY
chunkLen = decomp_bufsize;
- delete [] databuf;
- databuf = 0;
+ wxDELETEA(databuf);
}
// the following determines the type of the ILBM file.
free(gs_initData.argv[i]);
}
- delete [] gs_initData.argv;
- gs_initData.argv = NULL;
+ wxDELETEA(gs_initData.argv);
gs_initData.argc = 0;
}
}
/*static*/ void wxLocale::DestroyLanguagesDB()
{
- delete ms_languagesDB;
- ms_languagesDB = NULL;
+ wxDELETE(ms_languagesDB);
}
{
if (!Load(fileName))
{
- delete m_imp;
- m_imp = NULL;
+ wxDELETE(m_imp);
return false;
}
}
if (!Load(location))
{
- delete m_imp;
- m_imp = NULL;
+ wxDELETE(m_imp);
return false;
}
if ( gs_mimeTypesManager.m_impl != NULL )
{
- delete gs_mimeTypesManager.m_impl;
- gs_mimeTypesManager.m_impl = NULL;
+ wxDELETE(gs_mimeTypesManager.m_impl);
gs_mimeTypesManager.m_fallbacks.Clear();
}
}
sm_classTable->Delete(m_className);
if ( sm_classTable->GetCount() == 0 )
{
- delete sm_classTable;
- sm_classTable = NULL;
+ wxDELETE(sm_classTable);
}
}
}
void wxPrintPaperModule::OnExit()
{
- delete wxThePrintPaperDatabase;
- wxThePrintPaperDatabase = NULL;
+ wxDELETE(wxThePrintPaperDatabase);
}
#endif // wxUSE_PRINTING_ARCHITECTURE
if ( tooltip )
{
// delete the tooltip
- delete tooltip;
- tooltip = NULL;
+ wxDELETE(tooltip);
}
else // nothing to do
{
if ( !m_impl->Compile(expr, flags) )
{
// error message already given in wxRegExImpl::Compile
- delete m_impl;
- m_impl = NULL;
+ wxDELETE(m_impl);
return false;
}
if (m_impl->CreateServer() != wxSOCKET_NOERROR)
{
- delete m_impl;
- m_impl = NULL;
+ wxDELETE(m_impl);
wxLogTrace( wxTRACE_Socket, wxT("*** CreateServer() failed") );
return;
if ( m_impl->CreateUDP() != wxSOCKET_NOERROR )
{
- delete m_impl;
- m_impl = NULL;
+ wxDELETE(m_impl);
return;
}
void wxCSConv::Clear()
{
free(m_name);
- delete m_convReal;
+ wxDELETE(m_convReal);
m_name = NULL;
- m_convReal = NULL;
}
void wxCSConv::SetName(const char *charset)
if ( ms_proxyDefault )
{
ms_proxyDefault->Close();
- delete ms_proxyDefault;
- ms_proxyDefault = NULL;
+ wxDELETE(ms_proxyDefault);
}
}
else
void wxURLModule::OnExit()
{
#if wxUSE_PROTOCOL_HTTP
- delete wxURL::ms_proxyDefault;
- wxURL::ms_proxyDefault = NULL;
+ wxDELETE(wxURL::ms_proxyDefault);
#endif // wxUSE_PROTOCOL_HTTP
}
void wxPlatform::ClearPlatforms()
{
- delete sm_customPlatforms;
- sm_customPlatforms = NULL;
+ wxDELETE(sm_customPlatforms);
}
/// Function for testing current platform
// This removes any dangling pointers to this window in other windows'
// constraintsInvolvedIn lists.
UnsetConstraints(m_constraints);
- delete m_constraints;
- m_constraints = NULL;
+ wxDELETE(m_constraints);
}
#endif // wxUSE_CONSTRAINTS
if ( deleteHandler )
{
- delete firstHandler;
- firstHandler = NULL;
+ wxDELETE(firstHandler);
}
return firstHandler;
node = next;
}
- delete m_constraintsInvolvedIn;
- m_constraintsInvolvedIn = NULL;
+ wxDELETE(m_constraintsInvolvedIn);
}
}
{
DoFlush(true);
deflateEnd(m_deflate);
- delete m_deflate;
-
- m_deflate = NULL;
- delete[] m_z_buffer;
- m_z_buffer = NULL;
+ wxDELETE(m_deflate);
+ wxDELETEA(m_z_buffer);
return wxFilterOutputStream::Close() && IsOk();
}
wxCHECK_RET( GetDepth() > 1 && GetDepth() <= 8, wxT("cannot set palette for bitmap of this depth") );
AllocExclusive();
- delete M_BITMAP->m_palette;
- M_BITMAP->m_palette = NULL;
+ wxDELETE(M_BITMAP->m_palette);
if ( !palette.Ok() ) return;
bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return true; }
void OnExit()
{
- if (wxTheFileIconsTable)
- {
- delete wxTheFileIconsTable;
- wxTheFileIconsTable = NULL;
- }
+ wxDELETE(wxTheFileIconsTable);
}
};
#else
m_windowDC->DestroyClippingRegion();
#endif
- delete m_windowDC;
- m_windowDC = NULL;
+ wxDELETE(m_windowDC);
}
#ifndef wxHAS_NATIVE_OVERLAY
m_table = NULL;
}
- delete m_selection;
- m_selection = NULL;
+ wxDELETE(m_selection);
m_ownTable = false;
m_numRows = 0;
node = m_MapList->GetFirst();
}
- delete m_MapList;
- m_MapList = NULL;
+ wxDELETE(m_MapList);
}
}
void InvalidateItem(size_t n)
{
m_items[n] = (size_t)-1;
- delete m_cells[n];
- m_cells[n] = NULL;
+ wxDELETE(m_cells[n]);
}
public:
{
GetSizer()->Detach( m_headerWin );
- delete m_headerWin;
-
- m_headerWin = NULL;
+ wxDELETE(m_headerWin);
}
}
wxDELETE(m_clientWindow);
#if wxUSE_MENUS
- if (m_pMyMenuBar)
- {
- delete m_pMyMenuBar;
- m_pMyMenuBar = NULL;
- }
+ wxDELETE(m_pMyMenuBar);
RemoveWindowMenu(GetMenuBar());
#endif // wxUSE_MENUS
{
if ( HasFlag(wxPD_APP_MODAL) )
{
- delete m_winDisabler;
- m_winDisabler = NULL;
+ wxDELETE(m_winDisabler);
}
else
{
void wxRendererGeneric::Cleanup()
{
- if (sm_rendererGeneric)
- delete sm_rendererGeneric;
-
- sm_rendererGeneric = NULL;
+ wxDELETE(sm_rendererGeneric);
}
wxRendererGeneric* wxRendererGeneric::sm_rendererGeneric = NULL;
void wxScrollHelperBase::StopAutoScrolling()
{
#if wxUSE_TIMER
- if ( m_timerAutoScroll )
- {
- delete m_timerAutoScroll;
- m_timerAutoScroll = NULL;
- }
+ wxDELETE(m_timerAutoScroll);
#endif
}
delete text;
}
- delete m_spinButton;
- m_spinButton = NULL;
+ wxDELETE(m_spinButton);
}
// ----------------------------------------------------------------------------
public:
wxTimerModule() {}
bool OnInit() { return true; }
- void OnExit() { delete gs_scheduler; gs_scheduler = NULL; }
+ void OnExit() { wxDELETE(gs_scheduler); }
};
IMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule)
void wxClipboard::GTKClearData(Kind kind)
{
wxDataObject *&data = Data(kind);
- if ( data )
- {
- delete data;
- data = NULL;
- }
+ wxDELETE(data);
}
bool wxClipboard::SetSelectionOwner(bool set)
bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
{
- if ( m_internal )
- {
- delete m_internal;
- m_internal = NULL;
- }
+ wxDELETE(m_internal);
if (!wxDataViewCtrlBase::AssociateModel( model ))
return false;
void wxGnomePrintModule::OnExit()
{
- delete gs_libGnomePrint;
- gs_libGnomePrint = NULL;
+ wxDELETE(gs_libGnomePrint);
}
IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
{
wxLogTrace(TRACE_CLIPBOARD, wxT("wxClipboard will get cleared" ));
- delete wxTheClipboard->m_data;
- wxTheClipboard->m_data = NULL;
+ wxDELETE(wxTheClipboard->m_data);
}
}
while (m_waiting) gtk_main_iteration();
}
- if (m_data)
- {
- delete m_data;
- m_data = NULL;
- }
+ wxDELETE(m_data);
#if wxUSE_THREADS
/* re-enable GUI threads */
OnExit();
int exitcode = m_impl->GetExitCode();
- delete m_impl;
- m_impl = NULL;
+ wxDELETE(m_impl);
return exitcode;
}
void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link)
{
- if (m_Link) delete m_Link;
- m_Link = NULL;
+ wxDELETE(m_Link);
if (link.GetHref() != wxEmptyString)
m_Link = new wxHtmlLinkInfo(link);
}
}
m_Tags = m_CurTag = NULL;
- delete m_TextPieces;
- m_TextPieces = NULL;
+ wxDELETE(m_TextPieces);
}
void wxHtmlParser::DoParsing()
for ( wxHtmlTagsCacheData::iterator i = Cache().begin();
i != Cache().end(); ++i )
{
- delete[] i->Name;
- i->Name = NULL;
+ wxDELETEA(i->Name);
}
}
SetBackgroundImage(wxNullBitmap);
m_Parser->SetDC(dc);
- if (m_Cell)
- {
- delete m_Cell;
- // notice that it's important to set m_Cell to NULL here before calling
- // Parse() below, even if it will be overwritten by its return value:
- // without this we may crash if it's used from inside Parse()
- m_Cell = NULL;
- }
+
+ // notice that it's important to set m_Cell to NULL here before calling
+ // Parse() below, even if it will be overwritten by its return value as
+ // without this we may crash if it's used from inside Parse(), so use
+ // wxDELETE() and not just delete here
+ wxDELETE(m_Cell);
+
m_Cell = (wxHtmlContainerCell*) m_Parser->Parse(newsrc);
delete dc;
m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
#endif
))
{
- delete *fontptr;
- *fontptr = NULL;
+ wxDELETE(*fontptr);
}
if (*fontptr == NULL)
m_nbsp = 0;
m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
- if (m_EncConv)
- {
- delete m_EncConv;
- m_EncConv = NULL;
- }
+ wxDELETE(m_EncConv);
if (enc == wxFONTENCODING_DEFAULT)
return;
wxLogError(_("Failed to display HTML document in %s encoding"),
wxFontMapper::GetEncodingName(enc).c_str());
m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
- delete m_EncConv;
- m_EncConv = NULL;
+ wxDELETE(m_EncConv);
}
}
#endif
g_displayDC = new MGLDisplayDC(mode, 1, refresh);
if ( !g_displayDC->isValid() )
{
- delete g_displayDC;
- g_displayDC = NULL;
+ wxDELETE(g_displayDC);
return false;
}
MGL_wmDestroy(g_winMng);
g_winMng = NULL;
}
- if ( g_displayDC )
- {
- delete g_displayDC;
- g_displayDC = NULL;
- }
+ wxDELETE(g_displayDC);
}
//-----------------------------------------------------------------------------
wxCHECK_RET( GetDepth() > 1 && GetDepth() <= 8, wxT("cannot set palette for bitmap of this depth") );
AllocExclusive();
- delete M_BMPDATA->m_palette;
- M_BMPDATA->m_palette = NULL;
+ wxDELETE(M_BMPDATA->m_palette);
if ( !palette.Ok() ) return;
OnExit();
int exitcode = m_impl->GetExitCode();
- delete m_impl;
- m_impl = NULL;
+ wxDELETE(m_impl);
return exitcode;
}
virtual bool OnInit() { return true; }
virtual void OnExit()
{
- delete gs_fontDefault;
- gs_fontDefault = NULL;
+ wxDELETE(gs_fontDefault);
}
private:
wxAcceleratorRefData::~wxAcceleratorRefData()
{
- delete[] m_entries;
- m_entries = NULL;
+ wxDELETEA(m_entries);
m_count = 0;
}
{
wxAppBase::CleanUp();
- delete wxWidgetHashTable;
- wxWidgetHashTable = NULL;
+ wxDELETE(wxWidgetHashTable);
delete m_mainLoop;
// Now process all events in case they get sent to a destroyed dialog
wxFlushEvents( display );
- delete m_eventLoop;
- m_eventLoop = NULL;
+ wxDELETE(m_eventLoop);
// TODO: is it safe to call this, if the dialog may have been deleted
// by now? Probably only if we're using delayed deletion of dialogs.
OnExit();
int exitcode = m_impl->GetExitCode();
- delete m_impl;
- m_impl = NULL;
+ wxDELETE(m_impl);
return exitcode;
}
if (m_frameMenuBar)
{
m_frameMenuBar->DestroyMenuBar();
- delete m_frameMenuBar;
- m_frameMenuBar = NULL;
+ wxDELETE(m_frameMenuBar);
}
- if (m_frameStatusBar)
- {
- delete m_frameStatusBar;
- m_frameStatusBar = NULL;
- }
+ wxDELETE(m_frameStatusBar);
PreDestroy();
return;
wxArrowButton* btn = (wxArrowButton*)clientData;
- delete btn->m_timer;
- btn->m_timer = 0;
+ wxDELETE(btn->m_timer);
}
bool wxArrowButton::Create( wxSpinButton* parent,
wxToolBar::~wxToolBar()
{
- delete wxTheToolBarTimer;
- wxTheToolBarTimer = NULL;
+ wxDELETE(wxTheToolBarTimer);
}
bool wxToolBar::Realize()
}
}
- delete m_bitmapMask;
- m_bitmapMask = NULL;
+ wxDELETE(m_bitmapMask);
}
// ----------------------------------------------------------------------------
virtual void OnExit()
{
- delete gs_globalCursor;
- gs_globalCursor = NULL;
+ wxDELETE(gs_globalCursor);
}
};
m_hThread = 0;
}
- if ( m_data )
- {
- delete m_data;
- m_data = NULL;
- }
+ wxDELETE(m_data);
}
// ----------------------------------------------------------------------------
wxLogError(_("Failed to create the standard find/replace dialog (error code %d)"),
::CommDlgExtendedError());
- delete m_impl;
- m_impl = NULL;
+ wxDELETE(m_impl);
return false;
}
{
m_textCtrl->UnsubclassWin();
m_textCtrl->SetHWND(0);
- delete m_textCtrl;
- m_textCtrl = NULL;
+ wxDELETE(m_textCtrl);
}
}
if ( !hWnd )
{
// failed to start editing
- delete m_textCtrl;
- m_textCtrl = NULL;
+ wxDELETE(m_textCtrl);
return NULL;
}
if ( m_internalData[n] == data )
{
m_internalData.erase(m_internalData.begin() + n);
- delete data;
- data = NULL;
+ wxDELETE(data);
break;
}
}
free(argv[i]);
}
- delete [] argv;
- argv = NULL;
+ wxDELETEA(argv);
argc = 0;
}
}
#if wxUSE_ACCEL
- delete m_accelWindowMenu;
- m_accelWindowMenu = NULL;
+ wxDELETE(m_accelWindowMenu);
if ( menu && menu->HasAccels() )
m_accelWindowMenu = menu->CreateAccelTable();
//---------------------------------------------------------------------------
void wxAMMediaBackend::Clear()
{
- if (m_pTimer)
- {
- delete m_pTimer;
- m_pTimer = NULL;
- }
+ wxDELETE(m_pTimer);
}
//---------------------------------------------------------------------------
{
m_bPlaying = false;
- if (m_timer)
- {
- delete m_timer;
- m_timer = NULL;
- }
+ wxDELETE(m_timer);
m_lib.StopMovie(m_movie);
{
m_bPlaying = false;
- if (m_timer)
- {
- delete m_timer;
- m_timer = NULL;
- }
+ wxDELETE(m_timer);
m_lib.StopMovie(m_movie);
if (sm_abortWindow)
{
sm_abortWindow->Show(false);
- delete sm_abortWindow;
- sm_abortWindow = NULL;
+ wxDELETE(sm_abortWindow);
}
delete dc;
m_current = 0;
m_region = region;
- if (m_rects)
- {
- delete[] m_rects;
-
- m_rects = NULL;
- }
+ wxDELETEA(m_rects);
if (m_region.Empty())
m_numRects = 0;
void wxSystemSettingsModule::OnExit()
{
- delete gs_fontDefault;
- gs_fontDefault = NULL;
+ wxDELETE(gs_fontDefault);
}
// ----------------------------------------------------------------------------
void wxSound::Free()
{
- if ( m_data )
- {
- delete m_data;
- m_data = NULL;
- }
+ wxDELETE(m_data);
}
bool wxSound::CheckCreatedOk()
void wxStaticBitmap::Free()
{
- delete m_image;
-
- m_image = NULL;
+ wxDELETE(m_image);
}
wxSize wxStaticBitmap::DoGetBestSize() const
// delete existing tooltips
for (size_t i=0; i<m_tooltips.size(); i++)
{
- if (m_tooltips[i])
- {
- delete m_tooltips[i];
- m_tooltips[i] = NULL;
- }
+ wxDELETE(m_tooltips[i]);
}
wxDELETE(m_pDC);
// reset all current tooltips
for (size_t i=0; i<m_tooltips.size(); i++)
{
- if (m_tooltips[i])
- {
- delete m_tooltips[i];
- m_tooltips[i] = NULL;
- }
+ wxDELETE(m_tooltips[i]);
}
// shrink/expand the array:
else
{
// delete the tooltip associated with this pane; it's not needed anymore
- delete m_tooltips[nField];
- m_tooltips[nField] = NULL;
+ wxDELETE(m_tooltips[nField]);
}
}
else
wxLogLastError(wxT("TlsFree failed."));
}
- delete gs_critsectThreadDelete;
- gs_critsectThreadDelete = NULL;
+ wxDELETE(gs_critsectThreadDelete);
if ( gs_critsectGui )
{
gs_critsectGui->Leave();
- delete gs_critsectGui;
- gs_critsectGui = NULL;
+ wxDELETE(gs_critsectGui);
}
- delete gs_critsectWaitingForGui;
- gs_critsectWaitingForGui = NULL;
+ wxDELETE(gs_critsectWaitingForGui);
}
// ----------------------------------------------------------------------------
m_hBitmap = 0;
}
- if ( m_disabledImgList )
- {
- delete m_disabledImgList;
- m_disabledImgList = NULL;
- }
+ wxDELETE(m_disabledImgList);
Realize();
}
void wxToolBar::CreateDisabledImageList()
{
- if (m_disabledImgList != NULL)
- {
- delete m_disabledImgList;
- m_disabledImgList = NULL;
- }
+ wxDELETE(m_disabledImgList);
// as we can't use disabled image list with older versions of comctl32.dll,
// don't even bother creating it
m_textCtrl->UnsubclassWin();
m_textCtrl->SetHWND(0);
- delete m_textCtrl;
- m_textCtrl = NULL;
+ wxDELETE(m_textCtrl);
m_idEdited.Unset();
}
// returned false
if ( !hWnd )
{
- delete m_textCtrl;
- m_textCtrl = NULL;
+ wxDELETE(m_textCtrl);
return NULL;
}
if ( m_dragImage )
{
m_dragImage->EndDrag();
- delete m_dragImage;
- m_dragImage = NULL;
+ wxDELETE(m_dragImage);
// generate the drag end event
wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG,
if ( m_dragImage )
{
m_dragImage->EndDrag();
- delete m_dragImage;
- m_dragImage = NULL;
+ wxDELETE(m_dragImage);
// if we don't do it, the tree seems to think that 2 items
// are selected simultaneously which is quite weird
wxTopLevelWindowMSW::ButtonMenu::~ButtonMenu()
{
- if(m_menu)
- {
- delete m_menu;
- m_menu = NULL;
- };
+ wxDELETE(m_menu);
}
void wxTopLevelWindowMSW::SetLeftMenu(int id, const wxString& label, wxMenu *subMenu)
{
m_dropTarget->Revoke(m_hWnd);
- delete m_dropTarget;
- m_dropTarget = NULL;
+ wxDELETE(m_dropTarget);
}
#endif // wxUSE_DRAG_AND_DROP
//
void wxApp::CleanUp()
{
- delete[] wxBuffer;
- wxBuffer = NULL;
+ wxDELETEA(wxBuffer);
//
// PM-SPECIFIC CLEANUP
// TODO: ::DeleteObject( wxDisableButtonBrush );
}
- delete wxWinHandleHash;
- wxWinHandleHash = NULL;
+ wxDELETE(wxWinHandleHash);
// Delete Message queue
if (wxTheApp->m_hMq)
wxLogLastError(wxT("GpiDeleteBitmap(hbitmap)"));
}
}
- if (m_pBitmapMask)
- {
- delete m_pBitmapMask;
- m_pBitmapMask = NULL;
- }
+ wxDELETE(m_pBitmapMask);
} // end of wxBitmapRefData::Free
// ----------------------------------------------------------------------------
// and we will lose activation
m_modalData->ExitLoop();
#if 0
- if (m_pWindowDisabler)
- {
- delete m_pWindowDisabler;
- m_pWindowDisabler = NULL;
- }
+ wxDELETE(m_pWindowDisabler);
#endif
}
~CListItemInternalData()
{
- delete m_pAttr;
- m_pAttr = NULL;
+ wxDELETE(m_pAttr);
}
wxListItemAttr* m_pAttr;
{
m_pTextCtrl->SetHWND(0);
m_pTextCtrl->UnsubclassWin();
- delete m_pTextCtrl;
- m_pTextCtrl = NULL;
+ wxDELETE(m_pTextCtrl);
}
if (m_bOwnsImageListNormal)
{
sm_optionNames.Clear();
sm_optionValues.Clear();
- delete gs_fontDefault;
- gs_fontDefault = NULL;
+ wxDELETE(gs_fontDefault);
}
wxColour wxSystemSettingsNative::GetColour(
void wxStaticBitmap::Free()
{
- if (m_pImage)
- delete m_pImage;
- m_pImage = NULL;
+ wxDELETE(m_pImage);
} // end of wxStaticBitmap::Free
wxSize wxStaticBitmap::DoGetBestSize() const
wxToolBar::~wxToolBar()
{
- if (m_pToolTip)
- {
- delete m_pToolTip;
- m_pToolTip = NULL;
- }
+ wxDELETE(m_pToolTip);
} // end of wxToolBar::~wxToolBar
bool wxToolBar::Realize()
wxTreeItemInternalData() {}
~wxTreeItemInternalData()
{
- if(m_pAttr)
- {
- delete m_pAttr;
- m_pAttr = NULL;
- }
+ wxDELETE(m_pAttr);
}
wxTreeItemAttr* m_pAttr;
// Delete our drop target if we've got one
//
#if wxUSE_DRAG_AND_DROP
- if (m_dropTarget != NULL)
- {
- delete m_dropTarget;
- m_dropTarget = NULL;
- }
+ wxDELETE(m_dropTarget);
#endif // wxUSE_DRAG_AND_DROP
//
void wxClipboard::Clear()
{
- if (m_data != NULL)
- {
- delete m_data;
- m_data = NULL;
- }
+ wxDELETE(m_data);
OSStatus err = PasteboardClear( m_pasteboard );
if (err != noErr)
// Get rid of cached object.
// If this is not done, copying data from
// another application will only work once
- if (m_data)
- {
- delete m_data;
- m_data = NULL;
- }
+ wxDELETE(m_data);
}
bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
// delete the controls now, don't leave them alive even though they would
// still be eventually deleted by our parent - but it will be too late, the
// user code expects them to be gone now
- if (m_text != NULL)
- {
- delete m_text;
- m_text = NULL;
- }
-
- if (m_choice != NULL)
- {
- delete m_choice;
- m_choice = NULL;
- }
+ wxDELETE(m_text);
+ wxDELETE(m_choice);
}
// ----------------------------------------------------------------------------
{
m_text = new wxComboBoxText( this );
}
- else if ( ( m_text != NULL ) && !editable )
+ else if ( !editable )
{
- delete m_text;
- m_text = NULL;
+ wxDELETE(m_text);
}
int currentX, currentY;
{
m_text = new wxComboBoxText( this );
}
- else if ( ( m_text != NULL ) && !editable )
+ else if ( !editable )
{
- delete m_text;
- m_text = NULL;
+ wxDELETE(m_text);
}
int currentX, currentY;
dataObject->Add(textDataObject);
else
{
- delete textDataObject;
- textDataObject = NULL;
+ wxDELETE(textDataObject);
}
}
} /* block */
dataObject->Add(textDataObject);
else
{
- delete textDataObject;
- textDataObject = NULL;
+ wxDELETE(textDataObject);
}
}
else // overwrite data because the 'utxt' flavor has priority over the 'TEXT' flavor
wxScreenDCImpl::~wxScreenDCImpl()
{
- delete m_graphicContext;
- m_graphicContext = NULL;
+ wxDELETE(m_graphicContext);
#if wxOSX_USE_COCOA_OR_IPHONE
#else
DisposeWindow((WindowRef) m_overlayWindow );
wxDir::~wxDir()
{
- delete m_data;
- m_data = NULL;
+ wxDELETE(m_data);
}
// ----------------------------------------------------------------------------
void wxQTMediaBackend::Cleanup()
{
m_bPlaying = false;
- if (m_timer)
- {
- delete m_timer;
- m_timer = NULL;
- }
+ wxDELETE(m_timer);
// Stop the movie:
// Apple samples with CreateMovieControl typically
wxMetaFile *wxMetafileDCImpl::Close()
{
- delete m_graphicContext;
- m_graphicContext = NULL;
+ wxDELETE(m_graphicContext);
m_ok = false;
M_METAFILEREFDATA(*m_metaFile)->Close();
wxRegionIterator::~wxRegionIterator()
{
- if (m_rects)
- {
- delete [] m_rects;
- m_rects = NULL;
- }
+ wxDELETEA(m_rects);
}
wxRegionIterator::wxRegionIterator(const wxRegionIterator& iterator)
*/
void wxRegionIterator::SetRects(long numRects, wxRect *rects)
{
- if (m_rects)
- {
- delete [] m_rects;
- m_rects = NULL;
- }
+ wxDELETEA(m_rects);
if (rects && (numRects > 0))
{
m_current = 0;
m_region = region;
- if (m_rects)
- {
- delete [] m_rects;
- m_rects = NULL;
- }
+ wxDELETEA(m_rects);
if (m_region.IsEmpty())
{
//-----------------------------------------------------------------------------
bool wxDockTaskBarIcon::RemoveIcon()
{
- if (m_pMenu)
- {
- delete m_pMenu;
- m_pMenu = NULL;
- }
+ wxDELETE(m_pMenu);
// restore old icon to the dock
OSStatus err = RestoreApplicationDockTileImage();
}
gs_critsectGui->Leave();
- delete gs_critsectGui;
- gs_critsectGui = NULL;
+ wxDELETE(gs_critsectGui);
}
- delete gs_critsectWaitingForGui;
- gs_critsectWaitingForGui = NULL;
+ wxDELETE(gs_critsectWaitingForGui);
}
// ----------------------------------------------------------------------------
wxMacToolTip::~wxMacToolTip()
{
#if wxUSE_TIMER
- if ( m_timer )
- {
- delete m_timer ;
- m_timer = NULL;
- }
+ wxDELETE(m_timer);
#endif // wxUSE_TIMER
if ( m_backpict )
Clear() ;
{
m_mark++ ;
#if wxUSE_TIMER
- if ( m_timer )
- {
- delete m_timer ;
- m_timer = NULL ;
- }
+ wxDELETE(m_timer);
#endif // wxUSE_TIMER
if ( !m_shown )
return ;
m_hBitmap = NULL ;
}
- if (m_bitmapMask)
- {
- delete m_bitmapMask;
- m_bitmapMask = NULL;
- }
+ wxDELETE(m_bitmapMask);
}
wxBitmapRefData::~wxBitmapRefData()
if ( m_selected.Ok() )
{
m_selected.EndRawAccess() ;
- delete m_graphicContext ;
- m_graphicContext = NULL ;
+ wxDELETE(m_graphicContext);
}
}
if ( m_selected.Ok() )
{
m_selected.EndRawAccess() ;
- delete m_graphicContext ;
- m_graphicContext = NULL ;
+ wxDELETE(m_graphicContext);
}
m_selected = bitmap;
}
else
{
- delete m_hid;
- m_hid = NULL;
+ wxDELETE(m_hid);
}
}
if (sm_abortWindow)
{
sm_abortWindow->Show(false);
- delete sm_abortWindow;
- sm_abortWindow = NULL;
+ wxDELETE(sm_abortWindow);
}
wxEndBusyCursor();
m_blockEvents = false;
// make sure no native events get sent to a object in destruction
- delete m_peer;
- m_peer = NULL;
+ wxDELETE(m_peer);
if ( IsSorted() )
delete m_strings.sorted;
DestroyChildren();
- delete m_nowpeer;
- m_nowpeer = NULL;
+ wxDELETE(m_nowpeer);
// avoid dangling refs
if ( s_macDeactivateWindow == this )
wxMacPrintDialog::~wxMacPrintDialog()
{
- if (m_destroyDC && m_printerDC)
+ if (m_destroyDC)
{
- delete m_printerDC;
- m_printerDC = NULL;
+ wxDELETE(m_printerDC);
}
}
void wxSoundData::Stop()
{
DoStop();
- if ( m_pTimer )
- {
- delete m_pTimer;
- m_pTimer = NULL;
- }
+ wxDELETE(m_pTimer);
}
//Time between timer calls
// delete the controls now, don't leave them alive even though they would
// still be eventually deleted by our parent - but it will be too late, the
// user code expects them to be gone now
- delete m_text;
- m_text = NULL ;
- delete m_btn;
- m_btn = NULL ;
+ wxDELETE(m_text);
+ wxDELETE(m_btn);
}
// ----------------------------------------------------------------------------
// delete our drop target if we've got one
#if wxUSE_DRAG_AND_DROP
- if ( m_dropTarget != NULL )
- {
- delete m_dropTarget;
- m_dropTarget = NULL;
- }
+ wxDELETE(m_dropTarget);
#endif
delete m_peer ;
// unregister the classes now
UnregisterWindowClasses();
- delete wxWinHandleHash;
- wxWinHandleHash = NULL;
+ wxDELETE(wxWinHandleHash);
}
// ----------------------------------------------------------------------------
virtual void OnExit()
{
- delete ms_systemMenuFont;
- ms_systemMenuFont = NULL;
+ wxDELETE(ms_systemMenuFont);
}
static wxFont* ms_systemMenuFont;
wxFileProperty::OnSetValue();
// Delete old image
- if ( m_pImage )
- {
- delete m_pImage;
- m_pImage = NULL;
- }
- if ( m_pBitmap )
- {
- delete m_pBitmap;
- m_pBitmap = NULL;
- }
+ wxDELETE(m_pImage);
+ wxDELETE(m_pBitmap);
wxFileName filename = GetFileName();
{
m_pImage->Rescale( rect.width, rect.height );
m_pBitmap = new wxBitmap( *m_pImage );
- delete m_pImage;
- m_pImage = NULL;
+ wxDELETE(m_pImage);
}
dc.DrawBitmap( *m_pBitmap, rect.x, rect.y, false );
wxSimpleCheckBox::~wxSimpleCheckBox()
{
- delete ms_doubleBuffer;
- ms_doubleBuffer = NULL;
+ wxDELETE(ms_doubleBuffer);
}
wxBitmap* wxSimpleCheckBox::ms_doubleBuffer = NULL;
END_MOUSE_CAPTURE
//m_pPropGrid->ClearSelection();
- delete m_pPropGrid;
- m_pPropGrid = NULL;
+ wxDELETE(m_pPropGrid);
size_t i;
for ( i=0; i<m_arrPages.size(); i++ )
public:
wxPGGlobalVarsClassManager() {}
virtual bool OnInit() { wxPGGlobalVars = new wxPGGlobalVarsClass(); return true; }
- virtual void OnExit() { delete wxPGGlobalVars; wxPGGlobalVars = NULL; }
+ virtual void OnExit() { wxDELETE(wxPGGlobalVars); }
};
IMPLEMENT_DYNAMIC_CLASS(wxPGGlobalVarsClassManager, wxModule)
else
{
#if wxPG_DOUBLE_BUFFER
- delete m_doubleBuffer;
- m_doubleBuffer = NULL;
+ wxDELETE(m_doubleBuffer);
#endif
}
}
wxRichTextImageBlock::~wxRichTextImageBlock()
{
- if (m_data)
- {
- delete[] m_data;
- m_data = NULL;
- }
+ wxDELETEA(m_data);
}
void wxRichTextImageBlock::Init()
void wxRichTextImageBlock::Clear()
{
- delete[] m_data;
- m_data = NULL;
+ wxDELETEA(m_data);
m_dataSize = 0;
m_imageType = wxBITMAP_TYPE_INVALID;
}
void wxRichTextImageBlock::Copy(const wxRichTextImageBlock& block)
{
m_imageType = block.m_imageType;
- if (m_data)
- {
- delete[] m_data;
- m_data = NULL;
- }
+ wxDELETEA(m_data);
m_dataSize = block.m_dataSize;
if (m_dataSize == 0)
return;
bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf)
{
- delete m_richTextBuffer;
- m_richTextBuffer = NULL;
+ wxDELETE(m_richTextBuffer);
wxString bufXML((const char*) buf, wxConvUTF8);
{
wxLogError(wxT("Could not read the buffer from an XML stream.\nYou may have forgotten to add the XML file handler."));
- delete m_richTextBuffer;
- m_richTextBuffer = NULL;
+ wxDELETE(m_richTextBuffer);
return false;
}
customEncoding = new wxCSConv(GetEncoding());
if (!customEncoding->IsOk())
{
- delete customEncoding;
- customEncoding = NULL;
+ wxDELETE(customEncoding);
}
}
if (customEncoding)
Palette::~Palette() {
Release();
- delete [] entries;
- entries = 0;
+ wxDELETEA(entries);
}
void Palette::Release() {
}
ListBoxImpl::~ListBoxImpl() {
- if (imgList) {
- delete imgList;
- imgList = NULL;
- }
- if (imgTypeMap) {
- delete imgTypeMap;
- imgTypeMap = NULL;
- }
+ wxDELETE(imgList);
+ wxDELETE(imgTypeMap);
}
}
void ListBoxImpl::ClearRegisteredImages() {
- if (imgList) {
- delete imgList;
- imgList = NULL;
- }
- if (imgTypeMap) {
- delete imgTypeMap;
- imgTypeMap = NULL;
- }
+ wxDELETE(imgList);
+ wxDELETE(imgTypeMap);
if (wid)
GETLB(wid)->SetImageList(NULL, wxIMAGE_LIST_SMALL);
}
// if we had disabled other app windows, reenable them back now because
// if they stay disabled Windows will activate another window (one
// which is enabled, anyhow) and we will lose activation
- if ( m_windowDisabler )
- {
- delete m_windowDisabler;
- m_windowDisabler = NULL;
- }
+ wxDELETE(m_windowDisabler);
if ( IsModal() )
EndModal(wxID_CANCEL);
void wxMenu::InvalidateGeometryInfo()
{
- if ( m_geometry )
- {
- delete m_geometry;
- m_geometry = NULL;
- }
+ wxDELETE(m_geometry);
}
// ----------------------------------------------------------------------------
ms_evtLoopPopup = new wxEventLoop;
ms_evtLoopPopup->Run();
- delete ms_evtLoopPopup;
- ms_evtLoopPopup = NULL;
+ wxDELETE(ms_evtLoopPopup);
// remove the handler
PopEventHandler(true /* delete it */);
m_btnCapture = -1;
- if ( m_timerScroll )
- {
- delete m_timerScroll;
- m_timerScroll = NULL;
- }
+ wxDELETE(m_timerScroll);
// unpress the arrow and highlight the current element
Press(control, false);
m_DialPId = (int)wxExecute(cmd, false, m_DialProcess);
if(m_DialPId == 0)
{
- delete m_DialProcess;
- m_DialProcess = NULL;
+ wxDELETE(m_DialProcess);
return false;
}
else
bool rc = m_timer->Start(nSeconds*1000);
if(! rc)
{
- delete m_timer;
- m_timer = NULL;
+ wxDELETE(m_timer);
}
return rc;
}
if(m_timer != NULL)
{
m_timer->Stop();
- delete m_timer;
- m_timer = NULL;
+ wxDELETE(m_timer);
}
}
void wxFontModule::OnExit()
{
- delete g_fontHash;
-
- g_fontHash = NULL;
+ wxDELETE(g_fontHash);
}
#endif // GTK 2.0/1.x
wxCHECK_RET( IsOk(),
"Inotify not initialized or invalid inotify descriptor" );
- delete m_source;
- m_source = NULL;
+ wxDELETE(m_source);
if ( close(m_ifd) != 0 )
{
wxLogSysError(_("Error closing kqueue instance"));
}
- delete m_source;
- m_source = NULL;
+ wxDELETE(m_source);
}
virtual bool DoAdd(wxSharedPtr<wxFSWatchEntryKq> watch)
{
if (!Init())
{
- if (m_service)
- {
- delete m_service;
- m_service = NULL;
- }
+ wxDELETE(m_service);
return;
}
bool rc = m_timer->Start(nSeconds*1000);
if(! rc)
{
- delete m_timer;
- m_timer = NULL;
+ wxDELETE(m_timer);
}
return rc;
}
{
wxASSERT(m_timer != NULL);
m_timer->Stop();
- delete m_timer;
- m_timer = NULL;
+ wxDELETE(m_timer);
}
Stop();
- delete ms_backend;
- ms_backend = NULL;
+ wxDELETE(ms_backend);
#if wxUSE_LIBSDL && wxUSE_PLUGINS
delete ms_backendSDL;
#endif
void wxApp::CleanUp()
{
- delete wxWidgetHashTable;
- wxWidgetHashTable = NULL;
- delete wxClientWidgetHashTable;
- wxClientWidgetHashTable = NULL;
+ wxDELETE(wxWidgetHashTable);
+ wxDELETE(wxClientWidgetHashTable);
wxAppBase::CleanUp();
}
wxT("cannot set palette for bitmap of this depth"));
AllocExclusive();
- delete M_BMPDATA->m_palette;
- M_BMPDATA->m_palette = NULL;
+ wxDELETE(M_BMPDATA->m_palette);
if (!palette.Ok()) return;
{
wxLogTrace(TRACE_CLIPBOARD, wxT("wxClipboard will get cleared" ));
- delete wxTheClipboard->m_data;
- wxTheClipboard->m_data = NULL;
+ wxDELETE(wxTheClipboard->m_data);
}
}
}
#endif
- if (m_data)
- {
- delete m_data;
- m_data = NULL;
- }
+ wxDELETE(m_data);
#if wxUSE_THREADS
/* re-enable GUI threads */
OnExit();
int exitcode = m_impl->GetExitCode();
- delete m_impl;
- m_impl = NULL;
+ wxDELETE(m_impl);
return exitcode;
}
projects / wxWidgets.git / commitdiff
