projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct the direction passed to wxDataObject in wxGTK clipboard code.
[wxWidgets.git]
/
src
/
motif
/
frame.cpp
diff --git
a/src/motif/frame.cpp
b/src/motif/frame.cpp
index bb28dc522380cd32f9b0527ca6eee2d28bdc31dc..c4c3d3c9521a7e235e3b13052a042cab06e31ed8 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
@@
-35,11
+29,10
@@
#include "wx/menu.h"
#include "wx/icon.h"
#include "wx/settings.h"
#include "wx/menu.h"
#include "wx/icon.h"
#include "wx/settings.h"
+ #include "wx/toolbar.h"
+ #include "wx/statusbr.h"
#endif
#endif
-#include "wx/statusbr.h"
-#include "wx/toolbar.h"
-
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#ifdef __VMS__
#pragma message disable nosimpint
#endif
@@
-88,7
+81,6
@@
static void wxFrameMapProc(Widget frameShell, XtPointer clientData,
// ----------------------------------------------------------------------------
extern wxList wxModelessWindows;
// ----------------------------------------------------------------------------
extern wxList wxModelessWindows;
-extern wxList wxPendingDelete;
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
// wxWin macros
@@
-99,8
+91,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
+122,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,17
+167,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()->Process
Event(sizeEvent);
+
HandleWindow
Event(sizeEvent);
return true;
}
return true;
}
@@
-269,7
+251,7
@@
bool wxFrame::XmDoCreateTLW(wxWindow* WXUNUSED(parent),
wxFrame::~wxFrame()
{
wxFrame::~wxFrame()
{
-
m_isBeingDeleted = true
;
+
SendDestroyEvent()
;
if (m_clientArea)
{
if (m_clientArea)
{
@@
-283,15
+265,10
@@
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();
@@
-394,12
+371,18
@@
void wxFrame::DoSetClientSize(int width, int height)
wxSizeEvent sizeEvent(newSize, GetId());
sizeEvent.SetEventObject(this);
wxSizeEvent sizeEvent(newSize, GetId());
sizeEvent.SetEventObject(this);
-
GetEventHandler()->Process
Event(sizeEvent);
+
HandleWindow
Event(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;
@@
-456,8
+439,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 );
}
@@
-466,7
+449,7
@@
void wxFrame::DoSetIcon(const wxIcon& icon)
if (!m_frameShell)
return;
if (!m_frameShell)
return;
- if (!icon.Ok() || !icon.GetDrawable())
+ if (!icon.
Is
Ok() || !icon.GetDrawable())
return;
XtVaSetValues((Widget) m_frameShell,
return;
XtVaSetValues((Widget) m_frameShell,
@@
-474,11
+457,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 );
@@
-523,7
+501,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)
{
@@
-545,7
+523,7
@@
void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
wxSysColourChangedEvent event2;
event2.SetEventObject( m_frameStatusBar );
{
wxSysColourChangedEvent event2;
event2.SetEventObject( m_frameStatusBar );
- m_frameStatusBar->
Process
Event(event2);
+ m_frameStatusBar->
HandleWindow
Event(event2);
}
// Propagate the event to the non-top-level children
}
// Propagate the event to the non-top-level children
@@
-572,13
+550,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,