assert if opening more than one find/replace dialog under the same parent -- this...

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

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 6d68a702d2f84df9d6a2e33016e8555c23409259..562720af2db5e8f472962b3b23813fa70a962588 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        motif/frame.cpp
+// Name:        src/motif/frame.cpp

 // Purpose:     wxFrame
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxFrame
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "frame.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"
 


@@ -111,13 +107,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 
 void wxFrame::Init()
 {
 
 void wxFrame::Init()
 {

-    m_iconized = FALSE;
+    m_iconized = false;

 
     //// Motif-specific
     m_frameShell = (WXWidget) NULL;
 
     //// Motif-specific
     m_frameShell = (WXWidget) NULL;

-    m_mainWidget = (WXWidget) NULL;;
-    m_workArea = (WXWidget) NULL;;
-    m_clientArea = (WXWidget) NULL;;
+    m_mainWidget = (WXWidget) NULL;
+    m_workArea = (WXWidget) NULL;
+    m_clientArea = (WXWidget) NULL;

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


@@ -130,9 +126,9 @@ bool wxFrame::Create(wxWindow *parent,
 {
     if( !wxTopLevelWindow::Create( parent, id, title, pos, size, style,
                                    name ) )
 {
     if( !wxTopLevelWindow::Create( parent, id, title, pos, size, style,
                                    name ) )

-        return FALSE;
+        return false;

 
 

-    m_backgroundColour = 
+    m_backgroundColour =

         wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
     m_foregroundColour = *wxBLACK;
     m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
         wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
     m_foregroundColour = *wxBLACK;
     m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);


@@ -170,7 +166,7 @@ bool wxFrame::Create(wxWindow *parent,
                "Created frame (0x%p) with work area 0x%p and client "
                "area 0x%p", m_mainWidget, m_workArea, m_clientArea);
 
                "Created frame (0x%p) with work area 0x%p and client "
                "area 0x%p", m_mainWidget, m_workArea, m_clientArea);
 

-    XtAddEventHandler((Widget) m_clientArea, ExposureMask,FALSE,
+    XtAddEventHandler((Widget) m_clientArea, ExposureMask,False,

         wxUniversalRepaintProc, (XtPointer) this);
 
     if (x > -1)
         wxUniversalRepaintProc, (XtPointer) this);
 
     if (x > -1)


@@ -182,26 +178,28 @@ bool wxFrame::Create(wxWindow *parent,
     if (height > -1)
         XtVaSetValues((Widget) m_frameShell, XmNheight, height, NULL);
 
     if (height > -1)
         XtVaSetValues((Widget) m_frameShell, XmNheight, height, NULL);
 

-    ChangeFont(FALSE);
+    ChangeFont(false);

 
     ChangeBackgroundColour();
 
     PreResize();
 
 
     ChangeBackgroundColour();
 
     PreResize();
 

-    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
+    wxSize newSize(width, height);
+    wxSizeEvent sizeEvent(newSize, GetId());

     sizeEvent.SetEventObject(this);
 
     GetEventHandler()->ProcessEvent(sizeEvent);
 
     sizeEvent.SetEventObject(this);
 
     GetEventHandler()->ProcessEvent(sizeEvent);
 

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxFrame::DoCreate( wxWindow* parent, wxWindowID id,
-                        const wxString& title,
-                        const wxPoint& pos,
-                        const wxSize& size,
-                        long style,
-                        const wxString& name )
+bool wxFrame::XmDoCreateTLW(wxWindow* WXUNUSED(parent),
+                            wxWindowID WXUNUSED(id),
+                            const wxString& WXUNUSED(title),
+                            const wxPoint& WXUNUSED(pos),
+                            const wxSize& WXUNUSED(size),
+                            long style,
+                            const wxString& name)

 {
     Widget frameShell;
 
 {
     Widget frameShell;
 


@@ -214,7 +212,7 @@ bool wxFrame::DoCreate( wxWindow* parent, wxWindowID id,
         XmNallowShellResize, True,
         XmNdeleteResponse, XmDO_NOTHING,
         XmNmappedWhenManaged, False,
         XmNallowShellResize, True,
         XmNdeleteResponse, XmDO_NOTHING,
         XmNmappedWhenManaged, False,

-        XmNiconic, (style & wxICONIZE) ? TRUE : FALSE,
+        XmNiconic, (style & wxICONIZE) ? True : False,

         NULL);
 
     m_frameShell = (WXWidget)frameShell;
         NULL);
 
     m_frameShell = (WXWidget)frameShell;


@@ -262,30 +260,25 @@ bool wxFrame::DoCreate( wxWindow* parent, wxWindowID id,
 
     wxModelessWindows.Append( this );
 
 
     wxModelessWindows.Append( this );
 

-    return TRUE;
+    return true;

 }
 
 wxFrame::~wxFrame()
 {
 }
 
 wxFrame::~wxFrame()
 {

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

 
     if (m_clientArea)
     {
 
     if (m_clientArea)
     {

-      XtRemoveEventHandler((Widget) m_clientArea, ExposureMask, FALSE,
+      XtRemoveEventHandler((Widget) m_clientArea, ExposureMask, False,

           wxUniversalRepaintProc, (XtPointer) this);
     }
 
     if (GetMainWidget())
           wxUniversalRepaintProc, (XtPointer) this);
     }
 
     if (GetMainWidget())

-        Show(FALSE);
+        Show(false);

 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->DestroyMenuBar();
 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->DestroyMenuBar();

-
-        // Hack to stop core dump on Ultrix, OSF, for some strange reason.
-#if MOTIF_MENUBAR_DELETE_FIX
-        GetMenuBar()->SetMainWidget((WXWidget) NULL);
-#endif

         delete m_frameMenuBar;
         m_frameMenuBar = NULL;
     }
         delete m_frameMenuBar;
         m_frameMenuBar = NULL;
     }


@@ -297,11 +290,7 @@ wxFrame::~wxFrame()
     }
 
     PreDestroy();
     }
 
     PreDestroy();

-    DoDestroy();
-}

 
 

-void wxFrame::DoDestroy()
-{

     Widget frameShell = (Widget)GetShellWidget();
 
     if( frameShell )
     Widget frameShell = (Widget)GetShellWidget();
 
     if( frameShell )


@@ -342,7 +331,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
     {
         int sbw, sbh;
         m_frameStatusBar->GetSize(& sbw, & sbh);
     {
         int sbw, sbh;
         m_frameStatusBar->GetSize(& sbw, & sbh);

-        yy -= sbh;
+        yy = (Dimension)(yy - sbh);

     }
 #if wxUSE_TOOLBAR
     if (m_frameToolBar)
     }
 #if wxUSE_TOOLBAR
     if (m_frameToolBar)


@@ -350,15 +339,15 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
         int tbw, tbh;
         m_frameToolBar->GetSize(& tbw, & tbh);
         if (m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL)
         int tbw, tbh;
         m_frameToolBar->GetSize(& tbw, & tbh);
         if (m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL)

-            xx -= tbw;
+            xx = (Dimension)(xx - tbw);

         else
         else

-            yy -= tbh;
+            yy = (Dimension)(yy - tbh);

     }
 #endif // wxUSE_TOOLBAR
 
 //CE found a call here with NULL y pointer
     if (x)
     }
 #endif // wxUSE_TOOLBAR
 
 //CE found a call here with NULL y pointer
     if (x)

-        *x = xx; 
+        *x = xx;

     if (y)
         *y = yy;
 }
     if (y)
         *y = yy;
 }


@@ -397,7 +386,8 @@ void wxFrame::DoSetClientSize(int width, int height)
     }
     PreResize();
 
     }
     PreResize();
 

-    wxSizeEvent sizeEvent(wxSize(width, height), GetId());
+    wxSize newSize(width, height);
+    wxSizeEvent sizeEvent(newSize, GetId());

     sizeEvent.SetEventObject(this);
 
     GetEventHandler()->ProcessEvent(sizeEvent);
     sizeEvent.SetEventObject(this);
 
     GetEventHandler()->ProcessEvent(sizeEvent);


@@ -645,7 +635,7 @@ bool wxFrame::PreResize()
     PositionStatusBar();
 #endif // wxUSE_STATUSBAR
 
     PositionStatusBar();
 #endif // wxUSE_STATUSBAR
 

-    return TRUE;
+    return true;

 }
 
 WXWidget wxFrame::GetClientWidget() const
 }
 
 WXWidget wxFrame::GetClientWidget() const