many fixes to wxTextCrtl, wxTreeCrtl, wxListBox,
wxDialog, wxFrame two more samples work now, docview and treectrl git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,6 +17,10 @@
|
||||
#include "wx/app.h"
|
||||
#include "wx/gtk/win_gtk.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern wxList wxPendingDelete;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// delete
|
||||
|
||||
@@ -167,6 +171,14 @@ bool wxDialog::OnClose(void)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
bool wxDialog::Destroy(void)
|
||||
{
|
||||
if (!wxPendingDelete.Member(this))
|
||||
wxPendingDelete.Append(this);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void wxDialog::OnCloseWindow(wxCloseEvent& event)
|
||||
{
|
||||
if (GetEventHandler()->OnClose() || event.GetForce())
|
||||
@@ -204,8 +216,8 @@ int wxDialog::ShowModal(void)
|
||||
|
||||
void wxDialog::EndModal( int retCode )
|
||||
{
|
||||
gtk_main_quit();
|
||||
SetReturnCode( retCode );
|
||||
gtk_main_quit();
|
||||
};
|
||||
|
||||
void wxDialog::InitDialog(void)
|
||||
|
Reference in New Issue
Block a user