projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check for vswscanf(), AIX 5.1 and HP-UX 11.11 don't have it
[wxWidgets.git]
/
src
/
motif
/
frame.cpp
diff --git
a/src/motif/frame.cpp
b/src/motif/frame.cpp
index b29231b5c75ab0eb52eb9adf31c41c26b1543e5b..355b54f48a4ab7273bc1b0ac58809fed127233f4 100644
(file)
--- a/
src/motif/frame.cpp
+++ b/
src/motif/frame.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: motif/frame.cpp
+// Name:
src/
motif/frame.cpp
// Purpose: wxFrame
// Author: Julian Smart
// Modified by:
// Purpose: wxFrame
// Author: Julian Smart
// Modified by:
@@
-17,28
+17,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
+81,6
@@
static void wxFrameMapProc(Widget frameShell, XtPointer clientData,
// ----------------------------------------------------------------------------
extern wxList wxModelessWindows;
// ----------------------------------------------------------------------------
extern wxList wxModelessWindows;
-extern wxList wxPendingDelete;
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
// wxWin macros
@@
-132,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;
@@
-182,25
+169,23
@@
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()->Process
Event(sizeEvent);
+
HandleWindow
Event(sizeEvent);
return true;
}
return true;
}
-bool wxFrame::
DoCreate(wxWindow* parent
,
- wxWindowID
id
,
- const wxString&
title
,
- const wxPoint&
pos
,
- const wxSize&
size
,
+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)
{
long style,
const wxString& name)
{
@@
-266,10
+251,6
@@
bool wxFrame::DoCreate(wxWindow* parent,
return true;
}
return true;
}
-void wxFrame::DoDestroy()
-{
-}
-
wxFrame::~wxFrame()
{
m_isBeingDeleted = true;
wxFrame::~wxFrame()
{
m_isBeingDeleted = true;
@@
-338,7
+319,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)
@@
-346,9
+327,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
@@
-393,15
+374,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()->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;
@@
-458,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.c
_str(),
- XmNiconName,
title.c
_str(),
+ XmNtitle,
(const char*)title.mb
_str(),
+ XmNiconName,
(const char*)title.mb
_str(),
NULL );
}
NULL );
}
@@
-476,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 );
@@
-547,7
+530,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