fix for bug 1371386, with some minor mods and cleanup

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

diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index 40b9fc446bab1174a037e8141d1744a9a8beab58..bfa9a8a98213aef0c73df90af30cb1cc92e9c487 100644 (file)
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        motif/toplevel.cpp
+// Name:        src/motif/toplevel.cpp
 // Purpose:     wxTopLevelWindow Motif implementation
 // Author:      Mattia Barbon
 // Modified by:
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "toplevel.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -69,14 +65,7 @@ static void wxTLWEventHandler( Widget wid,
 
 void wxTopLevelWindowMotif::PreDestroy()
 {
-#ifdef __VMS
-#pragma message disable codcauunr
-#endif
-   if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-        wxModelessWindows.DeleteObject(this);
-#ifdef __VMS
-#pragma message enable codcauunr
-#endif
+    wxModelessWindows.DeleteObject(this);
 
     m_icons.m_icons.Empty();
 
@@ -88,7 +77,7 @@ void wxTopLevelWindowMotif::PreDestroy()
         XtRemoveEventHandler( (Widget)GetClientWidget(),
                               ButtonPressMask | ButtonReleaseMask |
                               PointerMotionMask | KeyPressMask,
-                              FALSE,
+                              False,
                               wxTLWEventHandler,
                               (XtPointer)this );
     }
@@ -101,7 +90,7 @@ wxTopLevelWindowMotif::~wxTopLevelWindowMotif()
 
 void wxTopLevelWindowMotif::Init()
 {
-    m_isShown = FALSE;
+    m_isShown = false;
 }
 
 bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
@@ -116,14 +105,14 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
 
     if ( parent )
         parent->AddChild(this);
-    
+
     wxTopLevelWindows.Append(this);
 
     m_windowId = ( id > -1 ) ? id : NewControlId();
 
-    bool retval = DoCreate( parent, id, title, pos, size, style, name );
+    bool retval = XmDoCreateTLW( parent, id, title, pos, size, style, name );
 
-    if( !retval ) return FALSE;
+    if( !retval ) return false;
 
     // Intercept CLOSE messages from the window manager
     Widget shell = (Widget)GetShellWidget();
@@ -140,7 +129,7 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
     // Modified Steve Hammes for Motif 2.0
 #if (XmREVISION > 1 || XmVERSION > 1)
     XmAddWMProtocolCallback( shell, WM_DELETE_WINDOW,
-                             (XtCallbackProc)wxCloseTLWCallback, 
+                             (XtCallbackProc)wxCloseTLWCallback,
                              (XtPointer)this );
 #elif XmREVISION == 1
     XmAddWMProtocolCallback( shell, WM_DELETE_WINDOW,
@@ -155,6 +144,8 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
     if( XmIsMotifWMRunning( shell ) )
     {
         int decor = 0 ;
+        if( !(m_windowStyle & wxNO_BORDER) )
+            decor |= MWM_DECOR_BORDER;
         if( m_windowStyle & wxRESIZE_BORDER )
             decor |= MWM_DECOR_RESIZEH;
         if( m_windowStyle & wxSYSTEM_MENU )
@@ -180,14 +171,14 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
         // no-decorations case.
         if( ( m_windowStyle & wxCAPTION ) != wxCAPTION )
             XtVaSetValues( shell,
-                           XmNoverrideRedirect, TRUE,
+                           XmNoverrideRedirect, True,
                            NULL );
     }
 
     XtAddEventHandler( (Widget)GetClientWidget(),
-                       ButtonPressMask | ButtonReleaseMask | 
+                       ButtonPressMask | ButtonReleaseMask |
                        PointerMotionMask | KeyPressMask,
-                       FALSE,
+                       False,
                        wxTLWEventHandler,
                        (XtPointer)this );
 
@@ -272,17 +263,17 @@ WXWidget wxTopLevelWindowMotif::GetShellWidget() const
     return (WXWidget) GetShell( this );
 }
 
-bool wxTopLevelWindowMotif::ShowFullScreen( bool show,
-                                            long style )
+bool wxTopLevelWindowMotif::ShowFullScreen( bool WXUNUSED(show),
+                                            long WXUNUSED(style) )
 {
     // TODO, see wxGTK
-    return FALSE;
+    return false;
 }
 
 bool wxTopLevelWindowMotif::IsFullScreen() const
 {
     // TODO, see wxGTK
-    return FALSE;
+    return false;
 }
 
 void wxTopLevelWindowMotif::Restore()
@@ -291,7 +282,7 @@ void wxTopLevelWindowMotif::Restore()
 
     if( shell )
         XtVaSetValues( shell,
-                       XmNiconic, FALSE,
+                       XmNiconic, False,
                        NULL );
 }
 
@@ -301,7 +292,7 @@ void wxTopLevelWindowMotif::Iconize( bool iconize )
     if( !shell ) return;
 
     if( !iconize )
-        Show( TRUE );
+        Show( true );
 
     XtVaSetValues( shell,
                    XmNiconic, (Boolean)iconize,
@@ -313,19 +304,19 @@ bool wxTopLevelWindowMotif::IsIconized() const
     Widget shell = GetShell( this );
 
     if( !shell )
-        return FALSE;
+        return false;
 
     Boolean iconic;
     XtVaGetValues( shell,
                    XmNiconic, &iconic,
                    NULL );
 
-    return iconic;
+    return (iconic == True);
 }
 
 void wxTopLevelWindowMotif::Maximize( bool maximize )
 {
-    Show( TRUE );
+    Show( true );
 
     if( maximize )
         Restore();
@@ -333,7 +324,7 @@ void wxTopLevelWindowMotif::Maximize( bool maximize )
 
 bool wxTopLevelWindowMotif::IsMaximized() const
 {
-    return FALSE;
+    return false;
 }
 
 void wxTopLevelWindowMotif::DoSetSizeHints( int minW, int minH,
@@ -352,7 +343,7 @@ void wxTopLevelWindowMotif::DoSetSizeHints( int minW, int minH,
     if( incW > -1 ) { XtSetArg( args[count], XmNwidthInc,  incW ); ++count; }
     if( incH > -1 ) { XtSetArg( args[count], XmNheightInc, incH ); ++count; }
 
-    XtSetValues( (Widget)GetShellWidget(), args, count ); 
+    XtSetValues( (Widget)GetShellWidget(), args, count );
 }
 
 bool wxTopLevelWindowMotif::SetShape( const wxRegion& region )
@@ -399,7 +390,7 @@ void wxTLWEventHandler( Widget wid,
         else
         {
             // An attempt to implement OnCharHook by calling OnCharHook first;
-            // if this returns TRUE, set continueToDispatch to False
+            // if this returns true, set continueToDispatch to False
             // (don't continue processing).
             // Otherwise set it to True and call OnChar.
             wxKeyEvent keyEvent( wxEVT_CHAR );