VC++-generated apparently harmless change

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

diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index 67ad48ed5d258bf561f7c31a46d6af68e638f5cf..419ba40ec3fbeeb3dcc3ac61626d26e23c3551b1 100644 (file)
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -17,15 +17,22 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "toplevel.h"
 #endif
 
     #pragma implementation "toplevel.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/toplevel.h"
 #include "wx/app.h"
 
 #ifdef __VMS__
 #include "wx/toplevel.h"
 #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,12 +67,16 @@ static void wxTLWEventHandler( Widget wid,
 // wxTopLevelWindowMotif implementation
 // ===========================================================================
 
 // wxTopLevelWindowMotif implementation
 // ===========================================================================
 

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

 {
 {

-    wxTopLevelWindows.DeleteObject(this);
-
-    if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
+#ifdef __VMS
+#pragma message disable codcauunr
+#endif
+   if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )

         wxModelessWindows.DeleteObject(this);
         wxModelessWindows.DeleteObject(this);

+#ifdef __VMS
+#pragma message enable codcauunr
+#endif

 
     m_icons.m_icons.Empty();
 
 
     m_icons.m_icons.Empty();
 


@@ -77,30 +88,20 @@ wxTopLevelWindowMotif::~wxTopLevelWindowMotif()
         XtRemoveEventHandler( (Widget)GetClientWidget(),
                               ButtonPressMask | ButtonReleaseMask |
                               PointerMotionMask | KeyPressMask,
         XtRemoveEventHandler( (Widget)GetClientWidget(),
                               ButtonPressMask | ButtonReleaseMask |
                               PointerMotionMask | KeyPressMask,

-                              FALSE,
+                              False,

                               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.GetCount() == 0))
-    {
-        wxTheApp->SetTopWindow(NULL);
-
-        if (wxTheApp->GetExitOnFrameDelete())
-        {
-            wxTheApp->ExitMainLoop();
-        }
-    }

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

-    m_isShown = FALSE;
+    m_isShown = false;

 }
 
 bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
 }
 
 bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,


@@ -122,7 +123,7 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
 
     bool retval = DoCreate( parent, id, title, pos, size, style, name );
 
 
     bool retval = DoCreate( 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();
 
     // Intercept CLOSE messages from the window manager
     Widget shell = (Widget)GetShellWidget();


@@ -179,20 +180,43 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
         // no-decorations case.
         if( ( m_windowStyle & wxCAPTION ) != wxCAPTION )
             XtVaSetValues( shell,
         // no-decorations case.
         if( ( m_windowStyle & wxCAPTION ) != wxCAPTION )
             XtVaSetValues( shell,

-                           XmNoverrideRedirect, TRUE,
+                           XmNoverrideRedirect, True,

                            NULL );
     }
 
     XtAddEventHandler( (Widget)GetClientWidget(),
                        ButtonPressMask | ButtonReleaseMask | 
                        PointerMotionMask | KeyPressMask,
                            NULL );
     }
 
     XtAddEventHandler( (Widget)GetClientWidget(),
                        ButtonPressMask | ButtonReleaseMask | 
                        PointerMotionMask | KeyPressMask,

-                       FALSE,
+                       False,

                        wxTLWEventHandler,
                        (XtPointer)this );
 
     return retval;
 }
 
                        wxTLWEventHandler,
                        (XtPointer)this );
 
     return retval;
 }
 

+void wxTopLevelWindowMotif::DoGetPosition(int *x, int *y) const
+{
+    Widget top = (Widget) GetTopWidget();
+    Window parent_window = XtWindow((Widget) top),
+        next_parent   = XtWindow((Widget) top),
+        root          = RootWindowOfScreen(XtScreen((Widget) top));
+
+    // search for the parent that is child of ROOT, because the WM may
+    // reparent twice and notify only the next parent (like FVWM)
+    while (next_parent != root) {
+        Window *theChildren; unsigned int n;
+        parent_window = next_parent;
+        XQueryTree(XtDisplay((Widget) top), parent_window, &root,
+            &next_parent, &theChildren, &n);
+        XFree(theChildren); // not needed
+    }
+    int xx, yy; unsigned int dummy;
+    XGetGeometry(XtDisplay((Widget) top), parent_window, &root,
+        &xx, &yy, &dummy, &dummy, &dummy, &dummy);
+    if (x) *x = xx;
+    if (y) *y = yy;
+}
+

 void wxTopLevelWindowMotif::Raise()
 {
     Widget top = (Widget) GetTopWidget();
 void wxTopLevelWindowMotif::Raise()
 {
     Widget top = (Widget) GetTopWidget();


@@ -252,13 +276,13 @@ bool wxTopLevelWindowMotif::ShowFullScreen( bool show,
                                             long style )
 {
     // TODO, see wxGTK
                                             long style )
 {
     // TODO, see wxGTK

-    return FALSE;
+    return false;

 }
 
 bool wxTopLevelWindowMotif::IsFullScreen() const
 {
     // TODO, see wxGTK
 }
 
 bool wxTopLevelWindowMotif::IsFullScreen() const
 {
     // TODO, see wxGTK

-    return FALSE;
+    return false;

 }
 
 void wxTopLevelWindowMotif::Restore()
 }
 
 void wxTopLevelWindowMotif::Restore()


@@ -267,7 +291,7 @@ void wxTopLevelWindowMotif::Restore()
 
     if( shell )
         XtVaSetValues( shell,
 
     if( shell )
         XtVaSetValues( shell,

-                       XmNiconic, FALSE,
+                       XmNiconic, False,

                        NULL );
 }
 
                        NULL );
 }
 


@@ -277,7 +301,7 @@ void wxTopLevelWindowMotif::Iconize( bool iconize )
     if( !shell ) return;
 
     if( !iconize )
     if( !shell ) return;
 
     if( !iconize )

-        Show( TRUE );
+        Show( true );

 
     XtVaSetValues( shell,
                    XmNiconic, (Boolean)iconize,
 
     XtVaSetValues( shell,
                    XmNiconic, (Boolean)iconize,


@@ -289,7 +313,7 @@ bool wxTopLevelWindowMotif::IsIconized() const
     Widget shell = GetShell( this );
 
     if( !shell )
     Widget shell = GetShell( this );
 
     if( !shell )

-        return FALSE;
+        return false;

 
     Boolean iconic;
     XtVaGetValues( shell,
 
     Boolean iconic;
     XtVaGetValues( shell,


@@ -301,7 +325,7 @@ bool wxTopLevelWindowMotif::IsIconized() const
 
 void wxTopLevelWindowMotif::Maximize( bool maximize )
 {
 
 void wxTopLevelWindowMotif::Maximize( bool maximize )
 {

-    Show( TRUE );
+    Show( true );

 
     if( maximize )
         Restore();
 
     if( maximize )
         Restore();


@@ -309,7 +333,33 @@ void wxTopLevelWindowMotif::Maximize( bool maximize )
 
 bool wxTopLevelWindowMotif::IsMaximized() const
 {
 
 bool wxTopLevelWindowMotif::IsMaximized() const
 {

-    return FALSE;
+    return false;
+}
+
+void wxTopLevelWindowMotif::DoSetSizeHints( int minW, int minH,
+                                            int maxW, int maxH,
+                                            int incW, int incH )
+{
+    wxTopLevelWindowBase::DoSetSizeHints( 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 );

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -349,7 +399,7 @@ void wxTLWEventHandler( Widget wid,
         else
         {
             // An attempt to implement OnCharHook by calling OnCharHook first;
         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 );
             // (don't continue processing).
             // Otherwise set it to True and call OnChar.
             wxKeyEvent keyEvent( wxEVT_CHAR );