implemented Freeze/Thaw() (patch 922156)

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

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index d6fc8327db650d2bf2fd81509c26b2b04b2fbac4..22ec6184a32af87bc2785f70a58cd5a2fb01381c 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation "frame.h"
 #endif
 
     #pragma implementation "frame.h"
 #endif
 


@@ -88,10 +88,6 @@ static void wxFrameMapProc(Widget frameShell, XtPointer clientData,
 extern wxList wxModelessWindows;
 extern wxList wxPendingDelete;
 
 extern wxList wxModelessWindows;
 extern wxList wxPendingDelete;
 

-// TODO: this should be tidied so that any frame can be the
-// top frame
-// static bool wxTopLevelUsed = FALSE;
-

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------


@@ -101,7 +97,7 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -120,7 +116,6 @@ void wxFrame::Init()
     m_mainWidget = (WXWidget) NULL;;
     m_workArea = (WXWidget) NULL;;
     m_clientArea = (WXWidget) NULL;;
     m_mainWidget = (WXWidget) NULL;;
     m_workArea = (WXWidget) NULL;;
     m_clientArea = (WXWidget) NULL;;

-    // m_visibleStatus = TRUE;

 }
 
 bool wxFrame::Create(wxWindow *parent,
 }
 
 bool wxFrame::Create(wxWindow *parent,


@@ -206,25 +201,13 @@ bool wxFrame::DoCreate( wxWindow* parent, wxWindowID id,
                         long style,
                         const wxString& name )
 {
                         long style,
                         const wxString& name )
 {

-    static bool wxTopLevelUsed = FALSE; /* this is global */
-    WXWidget frameShell;
+    Widget frameShell;

 
 

-    if (wxTopLevelUsed)
-    {
-        // Change suggested by Matthew Flatt
-        frameShell = (WXWidget)XtAppCreateShell( name,
-                                                 wxTheApp->GetClassName(),
-                                                 topLevelShellWidgetClass,
-                                                 (Display*) wxGetDisplay(),
-                                                 NULL, 0 );
-    }
-    else
-    {
-        frameShell = wxTheApp->GetTopLevelWidget();
-        wxTopLevelUsed = TRUE;
-    }
+    frameShell = XtCreatePopupShell( name, topLevelShellWidgetClass,
+                                     (Widget)wxTheApp->GetTopLevelWidget(),
+                                     NULL, 0 );

 
 

-    XtVaSetValues((Widget) frameShell,
+    XtVaSetValues(frameShell,

         // Allows menu to resize
         XmNallowShellResize, True,
         XmNdeleteResponse, XmDO_NOTHING,
         // Allows menu to resize
         XmNallowShellResize, True,
         XmNdeleteResponse, XmDO_NOTHING,


@@ -232,10 +215,10 @@ bool wxFrame::DoCreate( wxWindow* parent, wxWindowID id,
         XmNiconic, (style & wxICONIZE) ? TRUE : FALSE,
         NULL);
 
         XmNiconic, (style & wxICONIZE) ? TRUE : FALSE,
         NULL);
 

-    m_frameShell = frameShell;
+    m_frameShell = (WXWidget)frameShell;

 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget("main_window",
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget("main_window",

-        xmMainWindowWidgetClass, (Widget) frameShell,
+        xmMainWindowWidgetClass, frameShell,

         XmNresizePolicy, XmRESIZE_NONE,
         NULL);
 
         XmNresizePolicy, XmRESIZE_NONE,
         NULL);
 


@@ -266,11 +249,11 @@ bool wxFrame::DoCreate( wxWindow* parent, wxWindowID id,
     XtFree( (char *)ptr );
 
     /* Part of show-&-hide fix */
     XtFree( (char *)ptr );
 
     /* Part of show-&-hide fix */

-    XtAddEventHandler( (Widget)frameShell, StructureNotifyMask,
+    XtAddEventHandler( frameShell, StructureNotifyMask,

                        False, (XtEventHandler)wxFrameMapProc,
                        (XtPointer)this );
 
                        False, (XtEventHandler)wxFrameMapProc,
                        (XtPointer)this );
 

-    XtRealizeWidget((Widget) frameShell);
+    XtRealizeWidget(frameShell);

 
     wxAddWindowToTable( (Widget)m_workArea, this);
     wxAddWindowToTable( (Widget)m_clientArea, this);
 
     wxAddWindowToTable( (Widget)m_workArea, this);
     wxAddWindowToTable( (Widget)m_clientArea, this);


@@ -421,28 +404,6 @@ void wxFrame::DoGetSize(int *width, int *height) const
     *width = xx; *height = yy;
 }
 
     *width = xx; *height = yy;
 }
 

-void wxFrame::DoGetPosition(int *x, int *y) const
-{
-    Window parent_window = XtWindow((Widget) m_frameShell),
-        next_parent   = XtWindow((Widget) m_frameShell),
-        root          = RootWindowOfScreen(XtScreen((Widget) m_frameShell));
-
-    // 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) m_frameShell), parent_window, &root,
-            &next_parent, &theChildren, &n);
-        XFree(theChildren); // not needed
-    }
-    int xx, yy; unsigned int dummy;
-    XGetGeometry(XtDisplay((Widget) m_frameShell), parent_window, &root,
-        &xx, &yy, &dummy, &dummy, &dummy, &dummy);
-    if (x) *x = xx;
-    if (y) *y = yy;
-}
-

 void wxFrame::DoSetSize(int x, int y, int width, int height, int WXUNUSED(sizeFlags))
 {
     if (x > -1)
 void wxFrame::DoSetSize(int x, int y, int width, int height, int WXUNUSED(sizeFlags))
 {
     if (x > -1)


@@ -598,7 +559,7 @@ void wxFrame::OnActivate(wxActivateEvent& event)
     if (!event.GetActive())
         return;
 
     if (!event.GetActive())
         return;
 

-    for(wxWindowList::Node *node = GetChildren().GetFirst(); node;
+    for(wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node;

         node = node->GetNext())
     {
         // Find a child that's a subwindow, but not a dialog box.
         node = node->GetNext())
     {
         // Find a child that's a subwindow, but not a dialog box.