X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/447a039fa338288a974de5e74242feae5755a1fb..876325579b10197de643289ccce5ea31e9e48a3b:/src/motif/frame.cpp diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index 82725c86d7..f0ddb991e0 100644 --- a/src/motif/frame.cpp +++ b/src/motif/frame.cpp @@ -65,12 +65,12 @@ static bool wxTopLevelUsed = FALSE; #if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxWindow) -EVT_SIZE(wxFrame::OnSize) -EVT_ACTIVATE(wxFrame::OnActivate) -EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) -EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) -EVT_IDLE(wxFrame::OnIdle) -EVT_CLOSE(wxFrame::OnCloseWindow) + EVT_SIZE(wxFrame::OnSize) + EVT_ACTIVATE(wxFrame::OnActivate) + EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) + EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) + EVT_IDLE(wxFrame::OnIdle) + EVT_CLOSE(wxFrame::OnCloseWindow) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) @@ -146,14 +146,16 @@ bool wxFrame::Create(wxWindow *parent, int x = pos.x, y = pos.y; int width = size.x, height = size.y; - - // Set reasonable values for position and size if defaults have - // been requested - // - // MB TODO: something better than these arbitrary values ? + + // Set reasonable values for position and size if defaults have been + // requested // - if ( width == -1 ) width = 400; - if ( height = -1 ) height = 400; + // MB TODO: something better than these arbitrary values ? + // VZ should use X resources for this... + if ( width == -1 ) + width = 400; + if ( height == -1 ) + height = 400; int displayW, displayH; wxDisplaySize( &displayW, &displayH ); @@ -166,9 +168,9 @@ bool wxFrame::Create(wxWindow *parent, if ( y == -1 ) { y = (displayH - height) / 2; - if (y < 10) y = 10; + if (y < 10) y = 10; } - + if (wxTopLevelUsed) { // Change suggested by Matthew Flatt @@ -323,7 +325,7 @@ bool wxFrame::Create(wxWindow *parent, wxFrame::~wxFrame() { m_isBeingDeleted = TRUE; - + if (m_clientArea) XtRemoveEventHandler((Widget) m_clientArea, ExposureMask, FALSE, wxUniversalRepaintProc, (XtPointer) this);