Fix assorted typos in comments and other non-code.

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

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index bf63528fbac234443623ec6a821bfa550eb2cd4b..be67bd55c9650eaa47bcec2a57d66c6b8076af7d 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxFrame
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // Purpose:     wxFrame
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,28 +16,21 @@
 // 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"
 

-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#define XtScreen XTSCREEN
-#endif
-

 #include "wx/frame.h"
 #include "wx/frame.h"

-#include "wx/statusbr.h"
-#include "wx/toolbar.h"
-#include "wx/menu.h"
-#include "wx/settings.h"
-#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/app.h"
-#include "wx/icon.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/menu.h"
+    #include "wx/icon.h"
+    #include "wx/settings.h"
+    #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
+#endif

 
 #ifdef __VMS__
     #pragma message disable nosimpint
 
 #ifdef __VMS__
     #pragma message disable nosimpint


@@ -88,7 +80,6 @@ static void wxFrameMapProc(Widget frameShell, XtPointer clientData,
 // ----------------------------------------------------------------------------
 
 extern wxList wxModelessWindows;
 // ----------------------------------------------------------------------------
 
 extern wxList wxModelessWindows;

-extern wxList wxPendingDelete;

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


@@ -99,8 +90,6 @@ 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, wxTopLevelWindow)
-

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


@@ -132,11 +121,6 @@ bool wxFrame::Create(wxWindow *parent,
                                    name ) )
         return false;
 
                                    name ) )
         return false;
 

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

     int x = pos.x, y = pos.y;
     int width = size.x, height = size.y;
 
     int x = pos.x, y = pos.y;
     int width = size.x, height = size.y;
 


@@ -182,26 +166,25 @@ 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);
-
-    ChangeBackgroundColour();
-
+    PostCreation();

     PreResize();
 
     PreResize();
 

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

     sizeEvent.SetEventObject(this);
 
     sizeEvent.SetEventObject(this);
 

-    GetEventHandler()->ProcessEvent(sizeEvent);
+    HandleWindowEvent(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;
 


@@ -267,7 +250,7 @@ bool wxFrame::DoCreate( wxWindow* parent, wxWindowID id,
 
 wxFrame::~wxFrame()
 {
 
 wxFrame::~wxFrame()
 {

-    m_isBeingDeleted = true;
+    SendDestroyEvent();

 
     if (m_clientArea)
     {
 
     if (m_clientArea)
     {


@@ -281,22 +264,13 @@ wxFrame::~wxFrame()
     if (m_frameMenuBar)
     {
         m_frameMenuBar->DestroyMenuBar();
     if (m_frameMenuBar)
     {
         m_frameMenuBar->DestroyMenuBar();

-        delete m_frameMenuBar;
-        m_frameMenuBar = NULL;
+        wxDELETE(m_frameMenuBar);

     }
 
     }
 

-    if (m_frameStatusBar)
-    {
-        delete m_frameStatusBar;
-        m_frameStatusBar = NULL;
-    }
+    wxDELETE(m_frameStatusBar);

 
     PreDestroy();
 
     PreDestroy();

-    DoDestroy();
-}

 
 

-void wxFrame::DoDestroy()
-{

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


@@ -337,7 +311,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)


@@ -345,9 +319,9 @@ 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
 
     }
 #endif // wxUSE_TOOLBAR
 


@@ -392,15 +366,22 @@ 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);
 
     sizeEvent.SetEventObject(this);
 

-    GetEventHandler()->ProcessEvent(sizeEvent);
+    HandleWindowEvent(sizeEvent);

 
 }
 
 void wxFrame::DoGetSize(int *width, int *height) const
 {
 
 }
 
 void wxFrame::DoGetSize(int *width, int *height) const
 {

+    if (!m_frameShell)
+    {
+        *width = -1; *height = -1;
+        return;
+    }
+

     Dimension xx, yy;
     XtVaGetValues((Widget) m_frameShell, XmNwidth, &xx, XmNheight, &yy, NULL);
     *width = xx; *height = yy;
     Dimension xx, yy;
     XtVaGetValues((Widget) m_frameShell, XmNwidth, &xx, XmNheight, &yy, NULL);
     *width = xx; *height = yy;


@@ -457,8 +438,8 @@ void wxFrame::SetTitle(const wxString& title)
 
     if( !title.empty() )
         XtVaSetValues( (Widget)m_frameShell,
 
     if( !title.empty() )
         XtVaSetValues( (Widget)m_frameShell,

-                       XmNtitle, title.c_str(),
-                       XmNiconName, title.c_str(),
+                       XmNtitle, (const char*)title.mb_str(),
+                       XmNiconName, (const char*)title.mb_str(),

                        NULL );
 }
 
                        NULL );
 }
 


@@ -467,7 +448,7 @@ void wxFrame::DoSetIcon(const wxIcon& icon)
     if (!m_frameShell)
         return;
 
     if (!m_frameShell)
         return;
 

-    if (!icon.Ok() || !icon.GetDrawable())
+    if (!icon.IsOk() || !icon.GetDrawable())

         return;
 
     XtVaSetValues((Widget) m_frameShell,
         return;
 
     XtVaSetValues((Widget) m_frameShell,


@@ -475,11 +456,6 @@ void wxFrame::DoSetIcon(const wxIcon& icon)
                   NULL);
 }
 
                   NULL);
 }
 

-void wxFrame::SetIcon(const wxIcon& icon)
-{
-    SetIcons( wxIconBundle( icon ) );
-}
-

 void wxFrame::SetIcons(const wxIconBundle& icons)
 {
     wxFrameBase::SetIcons( icons );
 void wxFrame::SetIcons(const wxIconBundle& icons)
 {
     wxFrameBase::SetIcons( icons );


@@ -524,7 +500,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menuBar)
     }
 
     // Currently can't set it twice
     }
 
     // Currently can't set it twice

-    //    wxASSERT_MSG( (m_frameMenuBar == (wxMenuBar*) NULL), "Cannot set the menubar more than once");
+    //    wxASSERT_MSG( (m_frameMenuBar == NULL), "Cannot set the menubar more than once");

 
     if (m_frameMenuBar)
     {
 
     if (m_frameMenuBar)
     {


@@ -546,7 +522,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );

-        m_frameStatusBar->ProcessEvent(event2);
+        m_frameStatusBar->HandleWindowEvent(event2);

     }
 
     // Propagate the event to the non-top-level children
     }
 
     // Propagate the event to the non-top-level children


@@ -573,13 +549,6 @@ void wxFrame::OnActivate(wxActivateEvent& event)
     }
 }
 
     }
 }
 

-void wxFrame::SendSizeEvent()
-{
-    wxSizeEvent event(GetSize(), GetId());
-    event.SetEventObject(this);
-    GetEventHandler()->AddPendingEvent(event);
-}
-

 #if wxUSE_TOOLBAR
 
 wxToolBar* wxFrame::CreateToolBar(long style,
 #if wxUSE_TOOLBAR
 
 wxToolBar* wxFrame::CreateToolBar(long style,