renamed wx/ptr_shrd.h to wx/sharedptr.h; split wx/ptr_scpd.h in wx/scopedptr.h and...

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

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 6870ed2bc2b527a88b50d453bc78594839dc7cae..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


@@ -182,7 +176,7 @@ bool wxFrame::Create(wxWindow *parent,
     wxSizeEvent sizeEvent(newSize, GetId());
     sizeEvent.SetEventObject(this);
 
     wxSizeEvent sizeEvent(newSize, GetId());
     sizeEvent.SetEventObject(this);
 

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

 
     return true;
 }
 
     return true;
 }


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

-    m_isBeingDeleted = true;
+    SendDestroyEvent();

 
     if (m_clientArea)
     {
 
     if (m_clientArea)
     {


@@ -384,7 +378,7 @@ 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);

 
 }
 
 
 }
 


@@ -452,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 );
 }
 


@@ -470,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 );


@@ -519,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)
     {


@@ -541,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


@@ -568,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,