X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66f8b9ace213e02e184460e0c1a212cacea27edd..550e6c014ca85140969ab48c22c684755b4e9dce:/src/motif/toplevel.cpp?ds=sidebyside diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp index 9968142e41..9ce63d5fd6 100644 --- a/src/motif/toplevel.cpp +++ b/src/motif/toplevel.cpp @@ -66,8 +66,6 @@ static void wxTLWEventHandler( Widget wid, void wxTopLevelWindowMotif::PreDestroy() { - wxTopLevelWindows.DeleteObject(this); - if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL ) wxModelessWindows.DeleteObject(this); @@ -90,17 +88,6 @@ void wxTopLevelWindowMotif::PreDestroy() wxTopLevelWindowMotif::~wxTopLevelWindowMotif() { SetMainWidget( (WXWidget)0 ); - - // If this is the last top-level window, exit. - if (wxTheApp && (wxTopLevelWindows.GetCount() == 0)) - { - wxTheApp->SetTopWindow(NULL); - - if (wxTheApp->GetExitOnFrameDelete()) - { - wxTheApp->ExitMainLoop(); - } - } } void wxTopLevelWindowMotif::Init() @@ -336,6 +323,13 @@ void wxTopLevelWindowMotif::SetSizeHints( int minW, int minH, XtSetValues( (Widget)GetShellWidget(), args, count ); } +bool wxTopLevelWindowMotif::SetShape( const wxRegion& region ) +{ + return wxDoSetShape( (Display*)GetXDisplay(), + XtWindow( (Widget)GetShellWidget() ), + region ); +} + // --------------------------------------------------------------------------- // Callback definition // ---------------------------------------------------------------------------