Wait() doesn't cancel the thread any longer

[wxWidgets.git] / src / motif / toplevel.cpp

diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index b0180f7a8bd23c1392c7bb939034eaf987cdf01c..9ce63d5fd62e94464337a4092f330885ade4129e 100644 (file)
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -25,7 +25,11 @@
 #include "wx/app.h"
 
 #ifdef __VMS__
 #include "wx/app.h"
 
 #ifdef __VMS__

-    #pragma message disable nosimpint
+#define XtDisplay XTDISPLAY
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN
+#define XtWindow XTWINDOW
+#pragma message disable nosimpint

 #endif
 
 #include <Xm/Xm.h>
 #endif
 
 #include <Xm/Xm.h>


@@ -60,10 +64,8 @@ static void wxTLWEventHandler( Widget wid,
 // wxTopLevelWindowMotif implementation
 // ===========================================================================
 
 // wxTopLevelWindowMotif implementation
 // ===========================================================================
 

-wxTopLevelWindowMotif::~wxTopLevelWindowMotif()
+void wxTopLevelWindowMotif::PreDestroy()

 {
 {

-    wxTopLevelWindows.DeleteObject(this);
-

     if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
         wxModelessWindows.DeleteObject(this);
 
     if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
         wxModelessWindows.DeleteObject(this);
 


@@ -81,21 +83,11 @@ wxTopLevelWindowMotif::~wxTopLevelWindowMotif()
                               wxTLWEventHandler,
                               (XtPointer)this );
     }
                               wxTLWEventHandler,
                               (XtPointer)this );
     }

+}

 
 

-    DoDestroy();
-
+wxTopLevelWindowMotif::~wxTopLevelWindowMotif()
+{

     SetMainWidget( (WXWidget)0 );
     SetMainWidget( (WXWidget)0 );

-
-    // If this is the last top-level window, exit.
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-    {
-        wxTheApp->SetTopWindow(NULL);
-
-        if (wxTheApp->GetExitOnFrameDelete())
-        {
-            wxTheApp->ExitMainLoop();
-        }
-    }

 }
 
 void wxTopLevelWindowMotif::Init()
 }
 
 void wxTopLevelWindowMotif::Init()


@@ -249,7 +241,7 @@ WXWidget wxTopLevelWindowMotif::GetShellWidget() const
 }
 
 bool wxTopLevelWindowMotif::ShowFullScreen( bool show,
 }
 
 bool wxTopLevelWindowMotif::ShowFullScreen( bool show,

-                                            long style = wxFULLSCREEN_ALL )
+                                            long style )

 {
     // TODO, see wxGTK
     return FALSE;
 {
     // TODO, see wxGTK
     return FALSE;


@@ -271,7 +263,7 @@ void wxTopLevelWindowMotif::Restore()
                        NULL );
 }
 
                        NULL );
 }
 

-void wxTopLevelWindowMotif::Iconize( bool iconize = TRUE )
+void wxTopLevelWindowMotif::Iconize( bool iconize )

 {
     Widget shell = GetShell( this );
     if( !shell ) return;
 {
     Widget shell = GetShell( this );
     if( !shell ) return;


@@ -299,7 +291,7 @@ bool wxTopLevelWindowMotif::IsIconized() const
     return iconic;
 }
 
     return iconic;
 }
 

-void wxTopLevelWindowMotif::Maximize( bool maximize = TRUE )
+void wxTopLevelWindowMotif::Maximize( bool maximize )

 {
     Show( TRUE );
 
 {
     Show( TRUE );
 


@@ -312,6 +304,32 @@ bool wxTopLevelWindowMotif::IsMaximized() const
     return FALSE;
 }
 
     return FALSE;
 }
 

+void wxTopLevelWindowMotif::SetSizeHints( int minW, int minH,
+                                          int maxW, int maxH,
+                                          int incW, int incH )
+{
+    wxTopLevelWindowBase::SetSizeHints( minW, minH, maxW, maxH, incW, incH );
+
+    int count = 0;
+    Arg args[6];
+
+    if( minW > -1 ) { XtSetArg( args[count], XmNminWidth,  minW ); ++count; }
+    if( minH > -1 ) { XtSetArg( args[count], XmNminHeight, minH ); ++count; }
+    if( maxW > -1 ) { XtSetArg( args[count], XmNmaxWidth,  maxW ); ++count; }
+    if( maxH > -1 ) { XtSetArg( args[count], XmNmaxHeight, maxH ); ++count; }
+    if( incW > -1 ) { XtSetArg( args[count], XmNwidthInc,  incW ); ++count; }
+    if( incH > -1 ) { XtSetArg( args[count], XmNheightInc, incH ); ++count; }
+
+    XtSetValues( (Widget)GetShellWidget(), args, count ); 
+}
+
+bool wxTopLevelWindowMotif::SetShape( const wxRegion& region )
+{
+    return wxDoSetShape( (Display*)GetXDisplay(),
+                         XtWindow( (Widget)GetShellWidget() ),
+                         region );
+}
+

 // ---------------------------------------------------------------------------
 // Callback definition
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Callback definition
 // ---------------------------------------------------------------------------