Warning fix.

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

diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index a1df9f3b1058aa338faf7d50b8361ef4c49661a4..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:
 // Purpose:     wxTopLevelWindow Motif implementation
 // Author:      Mattia Barbon
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -69,14 +65,7 @@ static void wxTLWEventHandler( Widget wid,
 
 void wxTopLevelWindowMotif::PreDestroy()
 {
 
 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();
 
 
     m_icons.m_icons.Empty();
 


@@ -121,7 +110,7 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
 
     m_windowId = ( id > -1 ) ? id : NewControlId();
 
 
     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;
 


@@ -274,8 +263,8 @@ WXWidget wxTopLevelWindowMotif::GetShellWidget() const
     return (WXWidget) GetShell( this );
 }
 
     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;
 {
     // TODO, see wxGTK
     return false;


@@ -322,7 +311,7 @@ bool wxTopLevelWindowMotif::IsIconized() const
                    XmNiconic, &iconic,
                    NULL );
 
                    XmNiconic, &iconic,
                    NULL );
 

-    return iconic;
+    return (iconic == True);

 }
 
 void wxTopLevelWindowMotif::Maximize( bool maximize )
 }
 
 void wxTopLevelWindowMotif::Maximize( bool maximize )