Fix bug with using uninitialized flags in GetParentForModalDialog().

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

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 8de4757af2a4cc44a5a2e8c9e932e9d571e7c0a8..c32ec0a0f4c5bbdbe128a8381e4c166e20bb6a60 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -20,12 +20,6 @@
 // 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"
 
 #ifndef WX_PRECOMP
 #include "wx/frame.h"
 
 #ifndef WX_PRECOMP


@@ -130,11 +124,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;
 


@@ -180,17 +169,14 @@ 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();
 
     wxSize newSize(width, height);
     wxSizeEvent sizeEvent(newSize, GetId());
     sizeEvent.SetEventObject(this);
 
     PreResize();
 
     wxSize newSize(width, height);
     wxSizeEvent sizeEvent(newSize, GetId());
     sizeEvent.SetEventObject(this);
 

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

 
     return true;
 }
 
     return true;
 }


@@ -267,7 +253,7 @@ bool wxFrame::XmDoCreateTLW(wxWindow* WXUNUSED(parent),
 
 wxFrame::~wxFrame()
 {
 
 wxFrame::~wxFrame()
 {

-    m_isBeingDeleted = true;
+    SendDestroyEvent();

 
     if (m_clientArea)
     {
 
     if (m_clientArea)
     {


@@ -392,12 +378,18 @@ void wxFrame::DoSetClientSize(int width, int height)
     wxSizeEvent sizeEvent(newSize, GetId());
     sizeEvent.SetEventObject(this);
 
     wxSizeEvent sizeEvent(newSize, GetId());
     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;


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

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

                        NULL );
 }
 
                        NULL );
 }
 


@@ -472,11 +464,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 );


@@ -521,7 +508,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)
     {


@@ -543,7 +530,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


@@ -570,13 +557,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,