projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added missing include
[wxWidgets.git]
/
src
/
motif
/
frame.cpp
diff --git
a/src/motif/frame.cpp
b/src/motif/frame.cpp
index bf63528fbac234443623ec6a821bfa550eb2cd4b..c81a189d9781d978d6774c39040528ee65d239c7 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,10
+17,6
@@
// 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"
@@
-31,14
+27,17
@@
#endif
#include "wx/frame.h"
#endif
#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
+87,6
@@
static void wxFrameMapProc(Widget frameShell, XtPointer clientData,
// ----------------------------------------------------------------------------
extern wxList wxModelessWindows;
// ----------------------------------------------------------------------------
extern wxList wxModelessWindows;
-extern wxList wxPendingDelete;
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
// wxWin macros
@@
-132,11
+130,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,13
+175,11
@@
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);
GetEventHandler()->ProcessEvent(sizeEvent);
sizeEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(sizeEvent);
@@
-196,12
+187,13
@@
bool wxFrame::Create(wxWindow *parent,
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;
@@
-292,11
+284,7
@@
wxFrame::~wxFrame()
}
PreDestroy();
}
PreDestroy();
- DoDestroy();
-}
-void wxFrame::DoDestroy()
-{
Widget frameShell = (Widget)GetShellWidget();
if( frameShell )
Widget frameShell = (Widget)GetShellWidget();
if( frameShell )
@@
-337,7
+325,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
+333,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,7
+380,8
@@
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);
GetEventHandler()->ProcessEvent(sizeEvent);
sizeEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(sizeEvent);
@@
-401,6
+390,12
@@
void wxFrame::DoSetClientSize(int width, int height)
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
+452,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 );
}
@@
-475,11
+470,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 );
@@
-546,7
+536,7
@@
void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
wxSysColourChangedEvent event2;
event2.SetEventObject( m_frameStatusBar );
{
wxSysColourChangedEvent event2;
event2.SetEventObject( m_frameStatusBar );
- m_frameStatusBar->ProcessEvent(event2);
+ m_frameStatusBar->
GetEventHandler()->
ProcessEvent(event2);
}
// Propagate the event to the non-top-level children
}
// Propagate the event to the non-top-level children