= replaced with ==
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -146,14 +146,16 @@ bool wxFrame::Create(wxWindow *parent,
|
|||||||
|
|
||||||
int x = pos.x, y = pos.y;
|
int x = pos.x, y = pos.y;
|
||||||
int width = size.x, height = size.y;
|
int width = size.x, height = size.y;
|
||||||
|
|
||||||
// Set reasonable values for position and size if defaults have
|
// Set reasonable values for position and size if defaults have been
|
||||||
// been requested
|
// requested
|
||||||
//
|
|
||||||
// MB TODO: something better than these arbitrary values ?
|
|
||||||
//
|
//
|
||||||
if ( width == -1 ) width = 400;
|
// MB TODO: something better than these arbitrary values ?
|
||||||
if ( height = -1 ) height = 400;
|
// VZ should use X resources for this...
|
||||||
|
if ( width == -1 )
|
||||||
|
width = 400;
|
||||||
|
if ( height == -1 )
|
||||||
|
height = 400;
|
||||||
|
|
||||||
int displayW, displayH;
|
int displayW, displayH;
|
||||||
wxDisplaySize( &displayW, &displayH );
|
wxDisplaySize( &displayW, &displayH );
|
||||||
@@ -166,9 +168,9 @@ bool wxFrame::Create(wxWindow *parent,
|
|||||||
if ( y == -1 )
|
if ( y == -1 )
|
||||||
{
|
{
|
||||||
y = (displayH - height) / 2;
|
y = (displayH - height) / 2;
|
||||||
if (y < 10) y = 10;
|
if (y < 10) y = 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (wxTopLevelUsed)
|
if (wxTopLevelUsed)
|
||||||
{
|
{
|
||||||
// Change suggested by Matthew Flatt
|
// Change suggested by Matthew Flatt
|
||||||
@@ -323,7 +325,7 @@ bool wxFrame::Create(wxWindow *parent,
|
|||||||
wxFrame::~wxFrame()
|
wxFrame::~wxFrame()
|
||||||
{
|
{
|
||||||
m_isBeingDeleted = TRUE;
|
m_isBeingDeleted = TRUE;
|
||||||
|
|
||||||
if (m_clientArea)
|
if (m_clientArea)
|
||||||
XtRemoveEventHandler((Widget) m_clientArea, ExposureMask, FALSE,
|
XtRemoveEventHandler((Widget) m_clientArea, ExposureMask, FALSE,
|
||||||
wxUniversalRepaintProc, (XtPointer) this);
|
wxUniversalRepaintProc, (XtPointer) this);
|
||||||
|
Reference in New Issue
Block a user